Package: zlib1g Version: 1:1.2.13.dfsg-3 Severity: normal Tags: patch User: [email protected] Usertags: dep17m2
We want to finalize the /usr-merge transition via DEP17. For zlib, this means moving libz.so.* from /lib/<multiarch> to the corresponding location below /usr. Until recently, this was prohibited by the file move moratorium, but that has now been delegated to https://wiki.debian.org/UsrMerge. We still must be careful and https://subdivi.de/~helmut/dep17.html has a template of possible problems to watch out. Most of these problems do not apply here for various reasons. Notably the original file loss scenario that resulted in the file move moratorium (P1), would apply if zlib1g were part of the 2038 transition and were to be renamed to zlib1gt64, but https://wiki.debian.org/ReleaseGoals/64bit-time lists it as not-affected fortunately. We do not break the debian-installer (P10), because even unmerged chroots have /usr/lib/<multiarch> on their library search paths. I locally verified that we do not break debootstrap (P8) and since the affected filename is architecture-dependent, the multi-arch file loss scenario (P7) also does not apply. Hence, I think we are good to move ahead. When uploading this, please bear two things in mind: This change should not be uploaded to bookworm-backports. If you end up renaming packages (such as 2038) within the trixie cycle, do upload to experimental first and wait three days. I'm attaching a patch. Helmut
diff --minimal -Nru zlib-1.2.13.dfsg/debian/changelog zlib-1.2.13.dfsg/debian/changelog --- zlib-1.2.13.dfsg/debian/changelog 2023-08-15 15:35:28.000000000 +0200 +++ zlib-1.2.13.dfsg/debian/changelog 2023-11-14 11:14:25.000000000 +0100 @@ -1,3 +1,10 @@ +zlib (1:1.2.13.dfsg-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move libz.so.* to /usr. (closes: #-1) + + -- Helmut Grohne <[email protected]> Tue, 14 Nov 2023 11:14:25 +0100 + zlib (1:1.2.13.dfsg-3) unstable; urgency=low * Further fixes to the minizip integration, don't install the minizip diff --minimal -Nru zlib-1.2.13.dfsg/debian/rules zlib-1.2.13.dfsg/debian/rules --- zlib-1.2.13.dfsg/debian/rules 2023-08-15 01:27:48.000000000 +0200 +++ zlib-1.2.13.dfsg/debian/rules 2023-11-14 11:14:25.000000000 +0100 @@ -179,10 +179,6 @@ $(MAKE) -C contrib/minizip prefix=$(CURDIR)/debian/tmp/usr install - install -d debian/tmp/lib/$(DEB_HOST_MULTIARCH) - mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so.* debian/tmp/lib/$(DEB_HOST_MULTIARCH) - ln -sf /lib/$(DEB_HOST_MULTIARCH)/$$(readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so - install64: install build64-stamp $(MAKE) -C debian/64 prefix=$(CURDIR)/debian/tmp install diff --minimal -Nru zlib-1.2.13.dfsg/debian/zlib1g-udeb.install zlib-1.2.13.dfsg/debian/zlib1g-udeb.install --- zlib-1.2.13.dfsg/debian/zlib1g-udeb.install 2022-11-05 13:24:24.000000000 +0100 +++ zlib-1.2.13.dfsg/debian/zlib1g-udeb.install 2023-11-14 11:14:25.000000000 +0100 @@ -1 +1 @@ -lib/*/lib*.so.* usr/lib +usr/lib/*/libz*.so.* usr/lib diff --minimal -Nru zlib-1.2.13.dfsg/debian/zlib1g.install zlib-1.2.13.dfsg/debian/zlib1g.install --- zlib-1.2.13.dfsg/debian/zlib1g.install 2022-11-05 13:24:24.000000000 +0100 +++ zlib-1.2.13.dfsg/debian/zlib1g.install 2023-11-14 11:14:25.000000000 +0100 @@ -1 +1 @@ -lib/*/lib*.so.* +usr/lib/*/libz*.so.*
