Hi Mark,
On Tue, Nov 14, 2023 at 11:45:36AM +0100, Helmut Grohne wrote:
> 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.
And I still managed to get one bit wrong. While my patch moves the
libraries, it keeps the empty /lib directory. Its existence does not
cause harm right now, but when base-files ships symlinks there and dpkg
is not equipped in dealing with symlink vs directory conflicts, bad
things happen. So here goes my updated patch. Sorry for the extra noise.
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 19:37:29.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: #1055938)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 14 Nov 2023 19:37:29 +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 19:36:53.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.dirs
zlib-1.2.13.dfsg/debian/zlib1g-udeb.dirs
--- zlib-1.2.13.dfsg/debian/zlib1g-udeb.dirs 2022-11-05 13:24:24.000000000
+0100
+++ zlib-1.2.13.dfsg/debian/zlib1g-udeb.dirs 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-lib
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 19:36:53.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.dirs
zlib-1.2.13.dfsg/debian/zlib1g.dirs
--- zlib-1.2.13.dfsg/debian/zlib1g.dirs 2022-11-05 13:24:24.000000000 +0100
+++ zlib-1.2.13.dfsg/debian/zlib1g.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-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 19:36:53.000000000
+0100
@@ -1 +1 @@
-lib/*/lib*.so.*
+usr/lib/*/libz*.so.*
