Source: libtirpc
Version: 1.3.4+ds-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
X-Debbugs-Cc: vor...@debian.org
We want to finalize the /usr-merge transition via DEP17 by moving all
aliased files to /usr. Until recently, doing so was prohibited by the
file move moratorium. It has since been delegated to
https://wiki.debian.org/UsrMerge. Files can now be moved albeit
carefully. https://subdivi.de/~helmut/dep17.html gives details on what
could go wrong.
Most importantly, the 2038 transition
https://wiki.debian.org/ReleaseGoals/64bit-time may rename the library
package to libtirpc3t64. In a bookworm -> trixie upgrade, the library is
thus moved from / to /usr and from libtirpc3 to libtirpc3t64. This is
exactly the situation that the moratorium was meant to prevent. We
probably cannot employ Conflicts (DEP17 M7) here, because libtirpc3 is
too central and have to resort to protective diversions (DEP17 M8)
instead. When this happens, please upload to experimental first and wait
at least three days. It is unaffected by most of the other problems. In
particular, the multiarch-related file loss is not applicable, because
all affected filenames are architecture-specific. It also does not break
the debian-installer, because /usr/lib/<triplet> is on the default
library search path even on unmerged systems. I locally verified that
filesystem bootstrap continues to work with this change.
Hence, I think we are good to move ahead. I assume that backporting
libtirpc will not happen. As such, I am attaching a patch that also does
cleanup and forces the new location. It should not be uploaded to
bookworm-backports. If you want to handle backports, please use
dh_movetousr instead as that will turn itself into a no-op in backports.
Also remember to upload restructuring changes (e.g. libtirpc3t64) to
experimental within the trixie release cycle.
Helmut
diff --minimal -Nru libtirpc-1.3.4+ds/debian/changelog
libtirpc-1.3.4+ds/debian/changelog
--- libtirpc-1.3.4+ds/debian/changelog 2023-11-13 00:45:44.000000000 +0100
+++ libtirpc-1.3.4+ds/debian/changelog 2023-11-14 19:58:09.000000000 +0100
@@ -1,3 +1,10 @@
+libtirpc (1.3.4+ds-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move library to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 14 Nov 2023 19:58:09 +0100
+
libtirpc (1.3.4+ds-1) unstable; urgency=medium
[ Debian Janitor ]
diff --minimal -Nru libtirpc-1.3.4+ds/debian/libtirpc3.install
libtirpc-1.3.4+ds/debian/libtirpc3.install
--- libtirpc-1.3.4+ds/debian/libtirpc3.install 2023-11-13 00:45:44.000000000
+0100
+++ libtirpc-1.3.4+ds/debian/libtirpc3.install 2023-11-14 19:57:56.000000000
+0100
@@ -1 +1 @@
-lib/*/lib*.so.*
+usr/lib/*/lib*.so.*
diff --minimal -Nru libtirpc-1.3.4+ds/debian/rules
libtirpc-1.3.4+ds/debian/rules
--- libtirpc-1.3.4+ds/debian/rules 2023-11-13 00:45:44.000000000 +0100
+++ libtirpc-1.3.4+ds/debian/rules 2023-11-14 19:57:47.000000000 +0100
@@ -23,14 +23,6 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
override_dh_install:
- # Move libtirpc.so.* to /lib
- mkdir -p debian/tmp/lib/$(DEB_HOST_MULTIARCH)
- mv debian/tmp/usr/lib/*/libtirpc.so.*
debian/tmp/lib/$(DEB_HOST_MULTIARCH)
-
- # Fix up the -dev symlink
- LINKTARGET=`readlink
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtirpc.so`; \
- ln -sf /lib/$(DEB_HOST_MULTIARCH)/$$LINKTARGET
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtirpc.so
-
dh_install -Nlibtirpc3-udeb
dh_install -plibtirpc3-udeb --sourcedir=debian/tmp-udeb
