Source: xz-utils
Version: 5.4.4-0.1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

We want to finalize the /usr-merge transition by moving aliased files
from / to /usr. Until recently, this was prohibited by the file move
moratorium. It has since been delegated to
https://wiki.debian.org/UsrMerge and we can actually move files albeit
carefully. https://subdivi.de/~helmut/dep17.html is a collection of
problems we may encounter when doing so and I checked the list. The
biggest issue probably is the 2038 transition
https://wiki.debian.org/ReleaseGoals/64bit-time as it threatens to
rename the library package to liblzma5t64, but fortunately liblzma-dev
is listed as not-affected. If that becomes real, we'll have to work
around it using protective diversions (M8) as we cannot employ conflicts
(M7) for essential packages. Most of the other problems are irrelevant.
In particular, multiarch (P7) is not an issue, because all affected
filenames are architecture-dependent. I locally verified that filesystem
bootstrap continues to work in the presence of this change.

So I think we can move forward with this. I'm assuming that you do not
intend to upload xz-utils to bookworm backports and therefore clean up
the file movement. Do not upload the attached patch to
bookworm-backports and use dh_movetousr instead if that's important to
you. Also remember to upload restructuring changes (such as liblzma5t64)
to experimental during the trixie cycle.

Helmut
diff --minimal -Nru xz-utils-5.4.4/debian/changelog 
xz-utils-5.4.4/debian/changelog
--- xz-utils-5.4.4/debian/changelog     2023-08-30 20:38:53.000000000 +0200
+++ xz-utils-5.4.4/debian/changelog     2023-11-14 15:04:46.000000000 +0100
@@ -1,3 +1,10 @@
+xz-utils (5.4.4-0.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move liblzma.so.* to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 14 Nov 2023 15:04:46 +0100
+
 xz-utils (5.4.4-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru xz-utils-5.4.4/debian/liblzma5.install 
xz-utils-5.4.4/debian/liblzma5.install
--- xz-utils-5.4.4/debian/liblzma5.install      2023-02-11 21:42:11.000000000 
+0100
+++ xz-utils-5.4.4/debian/liblzma5.install      2023-11-14 15:04:31.000000000 
+0100
@@ -1 +1 @@
-lib/*/liblzma.so.*
+usr/lib/*/liblzma.so.*
diff --minimal -Nru xz-utils-5.4.4/debian/rules xz-utils-5.4.4/debian/rules
--- xz-utils-5.4.4/debian/rules 2023-08-30 14:22:22.000000000 +0200
+++ xz-utils-5.4.4/debian/rules 2023-11-14 15:04:24.000000000 +0100
@@ -16,11 +16,6 @@
        dh_auto_install --builddirectory debian/xzdec-build
        dh_auto_install --builddirectory debian/normal-build
        dh_auto_install --builddirectory debian/static-build
-       set -e; arch=$$(dpkg-architecture -qDEB_HOST_MULTIARCH); \
-       install -d debian/tmp/lib/$$arch; \
-       mv debian/tmp/usr/lib/$$arch/liblzma.so.* debian/tmp/lib/$$arch/; \
-       dso=$$(basename $$(readlink debian/tmp/usr/lib/$$arch/liblzma.so)); \
-       ln -s -f /lib/$$arch/$$dso debian/tmp/usr/lib/$$arch/liblzma.so
 
 override_dh_installchangelogs:
        dh_installchangelogs ChangeLog

Reply via email to