[pkg-gnupg-maint] Bug#1055939: libgpg-error: move libgpg-error.so.* to /usr

[Helmut Grohne]

Source: libgpg-error
Version: 1.47-2
Severity: normal
Tags: patch
User: helmutg at debian.org
Usertags: dep17m2

We want to finalize the /usr-merge transition by moving files from / to
/usr. Until recently, this was prohibited by the file move moratorium.
It has now been delegated to https://wiki.debian.org/UsrMerge and we
actually can move albeit carefully.
https://subdivi.de/~helmut/dep17.html is a template of possible problems
to check for and that's what I did.

A very relevant scenario is the 2038 transition
https://wiki.debian.org/ReleaseGoals/64bit-time which renames libraries
with a t64 suffix. Fortunately, libgpg-errror is listed as not-affected.
Such renaming would cause the file loss scenario that the moratorium was
meant to prevent (DEP17 P1). If this happens, please upload to
experimental and wait at least three days. Multiarch (P7) is not an
issue, because the library is installed to an architecture-dependent
path. I locally verified that filesystem bootstrap (P8) continues wotk.
The debian-installer copes with libraries installed to
/usr/lib/<multiarch> (P10).

So I think, we're good to move ahead. I don't think it makes sense to
backport libgpg-error. If you consider doing that, don't use this patch
and use dh_movetousr instead. And remember to upload restructuring
changes during the trixie cycle to experimental first.

Helmut
-------------- next part --------------
diff --minimal -Nru libgpg-error-1.47/debian/changelog libgpg-error-1.47/debian/changelog
--- libgpg-error-1.47/debian/changelog	2023-08-15 11:02:07.000000000 +0200
+++ libgpg-error-1.47/debian/changelog	2023-11-14 13:57:18.000000000 +0100
@@ -1,3 +1,10 @@
+libgpg-error (1.47-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move libgpg-error.so.* to /usr. Closes: #-1
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 14 Nov 2023 13:57:18 +0100
+
 libgpg-error (1.47-2) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru libgpg-error-1.47/debian/libgpg-error0-udeb.install libgpg-error-1.47/debian/libgpg-error0-udeb.install
--- libgpg-error-1.47/debian/libgpg-error0-udeb.install	2023-07-30 13:52:55.000000000 +0200
+++ libgpg-error-1.47/debian/libgpg-error0-udeb.install	2023-11-14 13:56:57.000000000 +0100
@@ -1 +1 @@
-usr/lib/*/libgpg-error.so.* lib
+usr/lib/*/libgpg-error.so.*
diff --minimal -Nru libgpg-error-1.47/debian/libgpg-error0.install libgpg-error-1.47/debian/libgpg-error0.install
--- libgpg-error-1.47/debian/libgpg-error0.install	2023-07-30 13:52:55.000000000 +0200
+++ libgpg-error-1.47/debian/libgpg-error0.install	2023-11-14 13:57:10.000000000 +0100
@@ -1 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libgpg-error.so.* lib/${DEB_HOST_MULTIARCH}/
+usr/lib/${DEB_HOST_MULTIARCH}/libgpg-error.so.*
diff --minimal -Nru libgpg-error-1.47/debian/rules libgpg-error-1.47/debian/rules
--- libgpg-error-1.47/debian/rules	2023-08-06 10:38:02.000000000 +0200
+++ libgpg-error-1.47/debian/rules	2023-11-14 13:56:43.000000000 +0100
@@ -31,9 +31,6 @@
 override_dh_installdocs:
 	dh_installdocs -A README
 
-override_dh_link:
-	dh_link -plibgpg-error-dev lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so.0 usr/lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so
-
 ### "arch-independent" Windows builds: ###
 
 WIN_FLAGS=LDFLAGS="-Xlinker --no-insert-timestamp" CFLAGS="-g -Os -fdebug-prefix-map=$(shell pwd)=." CPPFLAGS=