Source: zlib Version: 1:1.2.8.dfsg-5 Severity: minor Tags: patch User: helm...@debian.org Usertags: rebootstrap
zlib uses the profile "stage1" for disabling multilib packages and thus easing architecture bootstrap. We noticed that "stage1" is a bad profile name, because it says nothing. It says "this is connected to bootstrapping somehow", but nothing more. Thus we started getting rid of "stage*" profiles and want to use descriptive profile names. What happens here is that multilib packages are disabled and that has a name (originally coined in the gcc packaging) "nobiarch". The "nobiarch" profile is already used by glibc and ncurses. It also is documented[1]. (The only other packages building multilibby stuff are blcr and readline.) Thus it would add consistency if zlib was using the same profile. Please consider applying the attached patch. Helmut [1] https://wiki.debian.org/BuildProfileSpec
diff --minimal -Nru zlib-1.2.8.dfsg/debian/changelog zlib-1.2.8.dfsg/debian/changelog --- zlib-1.2.8.dfsg/debian/changelog 2017-01-29 18:22:23.000000000 +0100 +++ zlib-1.2.8.dfsg/debian/changelog 2018-03-12 18:37:53.000000000 +0100 @@ -1,3 +1,10 @@ +zlib (1:1.2.8.dfsg-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Rename profile stage1 to nobiarch. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Mon, 12 Mar 2018 18:37:53 +0100 + zlib (1:1.2.8.dfsg-5) unstable; urgency=low * Add loud warnings to the descriptions of all the multilib packages diff --minimal -Nru zlib-1.2.8.dfsg/debian/control zlib-1.2.8.dfsg/debian/control --- zlib-1.2.8.dfsg/debian/control 2017-01-29 18:22:23.000000000 +0100 +++ zlib-1.2.8.dfsg/debian/control 2018-03-12 18:37:51.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Mark Brown <broo...@debian.org> Standards-Version: 3.9.8 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] <!stage1>, 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 @@ -54,7 +54,7 @@ Package: lib64z1 Architecture: sparc s390 i386 powerpc mips mipsel -Build-Profiles: <!stage1> +Build-Profiles: <!nobiarch> Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: amd64-libs (<< 1.4) Description: compression library - 64 bit runtime @@ -65,7 +65,7 @@ Package: lib64z1-dev Section: libdevel Architecture: sparc s390 i386 powerpc mips mipsel -Build-Profiles: <!stage1> +Build-Profiles: <!nobiarch> Depends: lib64z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib64c-dev, ${misc:Depends} Replaces: amd64-libs-dev (<< 1.4) Provides: lib64z-dev @@ -80,7 +80,7 @@ Package: lib32z1 Architecture: amd64 ppc64 kfreebsd-amd64 s390x -Build-Profiles: <!stage1> +Build-Profiles: <!nobiarch> Conflicts: libc6-i386 (<= 2.9-18) Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: ia32-libs (<< 1.5) @@ -92,7 +92,7 @@ Package: lib32z1-dev Section: libdevel Architecture: amd64 ppc64 kfreebsd-amd64 s390x -Build-Profiles: <!stage1> +Build-Profiles: <!nobiarch> Conflicts: libc6-i386 (<= 2.9-18) Depends: lib32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), lib32c-dev, ${misc:Depends} Provides: lib32z-dev @@ -108,7 +108,7 @@ Package: libn32z1 Architecture: mips mipsel -Build-Profiles: <!stage1> +Build-Profiles: <!nobiarch> Depends: ${shlibs:Depends}, ${misc:Depends} Description: compression library - n32 runtime zlib is a library implementing the deflate compression method found @@ -118,7 +118,7 @@ Package: libn32z1-dev Section: libdevel Architecture: mips mipsel -Build-Profiles: <!stage1> +Build-Profiles: <!nobiarch> Depends: libn32z1 (= ${binary:Version}), zlib1g-dev (= ${binary:Version}), libn32c-dev, ${misc:Depends} Provides: libn32z-dev Description: compression library - n32 - DO NOT USE EXCEPT FOR PACKAGING diff --minimal -Nru zlib-1.2.8.dfsg/debian/rules zlib-1.2.8.dfsg/debian/rules --- zlib-1.2.8.dfsg/debian/rules 2017-01-29 18:22:17.000000000 +0100 +++ zlib-1.2.8.dfsg/debian/rules 2018-03-12 18:37:49.000000000 +0100 @@ -34,7 +34,7 @@ CFLAGS += -O3 endif -ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) +ifeq (,$(filter nobiarch,$(DEB_BUILD_PROFILES))) 32-ARCHS=amd64 ppc64 kfreebsd-amd64 s390x 64-ARCHS=s390 sparc i386 powerpc mips mipsel @@ -71,7 +71,7 @@ mn32=-mabi=n32 endif -endif # !stage1 +endif # !nobiarch UNALIGNED_ARCHS=i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 lpia ifneq (,$(findstring $(DEB_HOST_ARCH), $(UNALIGNED_ARCHS))) @@ -198,7 +198,7 @@ dh_compress -s dh_fixperms -s dh_makeshlibs -pzlib1g -V"zlib1g (>= 1:1.2.3.3.dfsg-1)" --add-udeb=zlib1g-udeb -ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) +ifeq (,$(filter nobiarch,$(DEB_BUILD_PROFILES))) ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS))) dh_makeshlibs -plib32z1 -V"lib32z1 (>= 1:1.2.3.3.dfsg-1)" endif
