diff -Nru npth-1.2/debian/changelog npth-1.2/debian/changelog --- npth-1.2/debian/changelog 2015-12-23 02:04:11.000000000 +0000 +++ npth-1.2/debian/changelog 2016-02-20 17:34:00.000000000 +0000 @@ -1,3 +1,16 @@ +npth (1.2-3) unstable; urgency=medium + + * debian/control: Convert Homepage and Vcs-* to https. + * debian/rules, debian/clean: Build out of tree for cleanliness. Thanks + Daniel Kahn Gillmor. + * debian/libnpth-mingw-w64-dev.install, + debian/libnpth-mingw-w64-dev.lintian-overrides, debian/rules, + debian/control, debian/clean: Add libnpth-mingw-w64-dev for + cross-building Windows artifacts. Thanks Daniel Kahn Gillmor. (Closes: + #814872) + + -- Eric Dorland Sat, 20 Feb 2016 12:30:29 -0500 + npth (1.2-2) unstable; urgency=medium * debian/control: Fix grammer mistake in description. Thanks Marius diff -Nru npth-1.2/debian/clean npth-1.2/debian/clean --- npth-1.2/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ npth-1.2/debian/clean 2016-02-20 17:34:00.000000000 +0000 @@ -0,0 +1,3 @@ +build/ +build-i686-w64-mingw32/ +build-x86_64-w64-mingw32/ diff -Nru npth-1.2/debian/control npth-1.2/debian/control --- npth-1.2/debian/control 2015-12-23 02:04:11.000000000 +0000 +++ npth-1.2/debian/control 2016-02-20 17:34:00.000000000 +0000 @@ -3,10 +3,11 @@ Priority: optional Maintainer: Eric Dorland Build-Depends: debhelper (>= 9.20151219), dh-autoreconf +Build-Depends-Indep: mingw-w64 Standards-Version: 3.9.6.1 -Homepage: http://www.gnupg.org/ -Vcs-Git: git://anonscm.debian.org/users/eric/npth.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/eric/npth.git +Homepage: https://www.gnupg.org/ +Vcs-Git: https://anonscm.debian.org/git/users/eric/npth.git +Vcs-Browser: https://anonscm.debian.org/cgit/users/eric/npth.git Package: libnpth0-dev Architecture: any @@ -37,3 +38,20 @@ implementation. Thus nPth allows the use of libraries which are not compatible to GNU Pth. +Package: libnpth-mingw-w64-dev +Architecture: all +Priority: extra +Section: libdevel +Suggests: mingw-w64 +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: replacement for GNU Pth using system threads (Windows dev) + nPth is a non-preemptive threads implementation using an API very + similar to the one known from GNU Pth. It has been designed as a + replacement of GNU Pth for non-ancient operating systems. In + contrast to GNU Pth it is based on the system's standard threads + implementation. Thus nPth allows the use of libraries which are not + compatible to GNU Pth. + . + This is a Windows version of nPth. It's meant to be used when + cross-building software that targets the Windows platform, e.g. the + win32-loader component of Debian-Installer. diff -Nru npth-1.2/debian/libnpth-mingw-w64-dev.install npth-1.2/debian/libnpth-mingw-w64-dev.install --- npth-1.2/debian/libnpth-mingw-w64-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ npth-1.2/debian/libnpth-mingw-w64-dev.install 2016-02-20 17:34:00.000000000 +0000 @@ -0,0 +1,6 @@ +usr/i686-w64-mingw32/bin/* +usr/i686-w64-mingw32/lib/* +usr/i686-w64-mingw32/include/* +usr/x86_64-w64-mingw32/bin/* +usr/x86_64-w64-mingw32/lib/* +usr/x86_64-w64-mingw32/include/* diff -Nru npth-1.2/debian/libnpth-mingw-w64-dev.lintian-overrides npth-1.2/debian/libnpth-mingw-w64-dev.lintian-overrides --- npth-1.2/debian/libnpth-mingw-w64-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ npth-1.2/debian/libnpth-mingw-w64-dev.lintian-overrides 2016-02-20 17:34:00.000000000 +0000 @@ -0,0 +1,13 @@ +# libnpth-mingw-w64-dev is "arch-independent" from debian's perspective, +# since it ships binaries that are only used during cross-building +# windows software. +libnpth-mingw-w64-dev: arch-independent-package-contains-binary-or-object + +# The location of these cross-building tools is the result of +# discussion with mingw maintainers: +# https://lists.alioth.debian.org/pipermail/pkg-gnupg-maint/2016-February/003281.html +libnpth-mingw-w64-dev: file-in-unusual-dir +libnpth-mingw-w64-dev: non-standard-dir-in-usr + +# DLLs exported via Samba need to be executable (see #796224) +libnpth-mingw-w64-dev: executable-not-elf-or-script diff -Nru npth-1.2/debian/rules npth-1.2/debian/rules --- npth-1.2/debian/rules 2015-12-23 02:04:11.000000000 +0000 +++ npth-1.2/debian/rules 2016-02-20 17:34:00.000000000 +0000 @@ -4,10 +4,42 @@ dh $@ --parallel --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --enable-static + dh_auto_configure --builddirectory=build -- --enable-static + +override_dh_auto_build-arch: + dh_auto_build --builddirectory=build + +override_dh_auto_install-arch: + dh_auto_install --builddirectory=build override_dh_makeshlibs: dh_makeshlibs -V override_dh_strip: dh_strip --ddeb-migration='libnpth0-dbg (<< 1.2-2~)' + +### "arch-independent" Windows builds: ### + +WIN_FLAGS=LDFLAGS="-Xlinker --no-insert-timestamp" CFLAGS="-g -Os" CPPFLAGS= + +override_dh_auto_build-indep: + for cpu in i686 x86_64; do \ + mkdir -p build-$$cpu-w64-mingw32 && \ + cd build-$$cpu-w64-mingw32 && $(WIN_FLAGS) ../configure \ + --prefix=/usr/$$cpu-w64-mingw32 \ + --with-prefix=/usr/$$cpu-w64-mingw32 \ + --with-libgpg-error-prefix=/usr/$$cpu-w64-mingw32 \ + --enable-static \ + --host $$cpu-w64-mingw32 && \ + $(WIN_FLAGS) $(MAKE) \ + || exit 1 ; \ + cd .. ; \ + done + +override_dh_auto_install-indep: + for cpu in i686 x86_64; do \ + cd build-$$cpu-w64-mingw32 && \ + $(MAKE) install DESTDIR=$(shell pwd)/debian/tmp \ + || exit 1 ; \ + cd .. ; \ + done