Control: block -1 by 763766 Hi,
On Mon, 21 Apr 2014 18:46:44 +0200 Helmut Grohne <[email protected]> wrote: > I stumbled into this issue as well and forgot to look into the bts for a > patch, so I invented another one. Interestingly it is entirely > different, which is why I am posting it here. the syntax for the Build-Profiles field was changed during the bootstrap sprint in paris [1,2]. Please see attached patch for a fix of the issue. While dpkg already understands the new syntax, debhelper is required in this case as well, so setting it as blocking. cheers, josch [1] https://wiki.debian.org/Sprints/2014/BootstrapSprint [2] https://wiki.debian.org/BuildProfileSpec
diff -Nru zlib-1.2.8.dfsg/debian/changelog zlib-1.2.8.dfsg/debian/changelog --- zlib-1.2.8.dfsg/debian/changelog 2014-08-16 23:48:57.000000000 +0200 +++ zlib-1.2.8.dfsg/debian/changelog 2014-10-07 07:53:36.000000000 +0200 @@ -1,3 +1,10 @@ +zlib (1:1.2.8.dfsg-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Support nobiarch build profile (Closes: #-1). + + -- Johannes Schauer <[email protected]> Tue, 07 Oct 2014 07:52:55 +0200 + zlib (1:1.2.8.dfsg-2) unstable; urgency=low * Drop zlib-bin package as minizip has now been packaged separately, diff -Nru zlib-1.2.8.dfsg/debian/control zlib-1.2.8.dfsg/debian/control --- zlib-1.2.8.dfsg/debian/control 2014-08-16 16:13:26.000000000 +0200 +++ zlib-1.2.8.dfsg/debian/control 2014-10-07 07:58:07.000000000 +0200 @@ -4,7 +4,7 @@ Maintainer: Mark Brown <[email protected]> Standards-Version: 3.9.4 Homepage: http://zlib.net/ -Build-Depends: debhelper (>= 8.1.3~), binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc s390x], dpkg-dev (>= 1.16.1) +Build-Depends: debhelper (>= 8.1.3~), binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc s390x] <!nobiarch>, dpkg-dev (>= 1.16.1) Package: zlib1g Architecture: any @@ -56,6 +56,7 @@ Architecture: sparc s390 i386 powerpc mips mipsel Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: amd64-libs (<< 1.4) +Build-Profiles: <!nobiarch> Description: compression library - 64 bit runtime zlib is a library implementing the deflate compression method found in gzip and PKZIP. This package includes a 64 bit version of the @@ -67,6 +68,7 @@ Depends: lib64z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib64c-dev, ${misc:Depends} Replaces: amd64-libs-dev (<< 1.4) Provides: lib64z-dev +Build-Profiles: <!nobiarch> Description: compression library - 64 bit development zlib is a library implementing the deflate compression method found in gzip and PKZIP. This package includes the development support @@ -77,6 +79,7 @@ Conflicts: libc6-i386 (<= 2.9-18) Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: ia32-libs (<< 1.5) +Build-Profiles: <!nobiarch> Description: compression library - 32 bit runtime zlib is a library implementing the deflate compression method found in gzip and PKZIP. This package includes a 32 bit version of the @@ -89,6 +92,7 @@ Depends: lib32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib32c-dev, ${misc:Depends} Provides: lib32z-dev Replaces: ia32-libs-dev (<< 1.5) +Build-Profiles: <!nobiarch> Description: compression library - 32 bit development zlib is a library implementing the deflate compression method found in gzip and PKZIP. This package includes the development support @@ -97,6 +101,7 @@ Package: libn32z1 Architecture: mips mipsel Depends: ${shlibs:Depends}, ${misc:Depends} +Build-Profiles: <!nobiarch> Description: compression library - n32 runtime zlib is a library implementing the deflate compression method found in gzip and PKZIP. This package includes a n32 version of the shared @@ -107,6 +112,7 @@ Architecture: mips mipsel Depends: libn32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), libn32c-dev, ${misc:Depends} Provides: libn32z-dev +Build-Profiles: <!nobiarch> Description: compression library - n32 development zlib is a library implementing the deflate compression method found in gzip and PKZIP. This package includes the development support diff -Nru zlib-1.2.8.dfsg/debian/rules zlib-1.2.8.dfsg/debian/rules --- zlib-1.2.8.dfsg/debian/rules 2014-08-16 16:13:56.000000000 +0200 +++ zlib-1.2.8.dfsg/debian/rules 2014-10-07 07:51:40.000000000 +0200 @@ -69,6 +69,11 @@ mn32=-mabi=n32 endif +ifneq (,$(findstring nobiarch,$(DEB_BUILD_PROFILES))) +override EXTRA_BUILD= +override EXTRA_INSTALL= +endif + UNALIGNED_ARCHS=i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 lpia ifneq (,$(findstring $(DEB_HOST_ARCH), $(UNALIGNED_ARCHS))) CFLAGS+=-DUNALIGNED_OK
