[pkg-lxc-devel] Bug#1061490: lxc: install PAM module into /usr

[Michael Biebl]

Source: lxc
Version: 1:5.0.3-2
Severity: normal
Tags: patch
User: helmutg at debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. lxc installs files into /lib; these should be moved into the
respective canonical locations in /usr/.

Please find a patch attached. It has been build-tested.

I removed the Build-Depends on dh-exec, as it is no longer necessary.
You may to run "chmod -x debian/libpam-cgfs.install" accordingly.

Note: this should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.

If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].

Michael

[1] https://wiki.debian.org/UsrMerge
-------------- next part --------------
diff -Nru lxc-5.0.3/debian/changelog lxc-5.0.3/debian/changelog
--- lxc-5.0.3/debian/changelog	2023-11-30 02:04:13.000000000 +0100
+++ lxc-5.0.3/debian/changelog	2024-01-25 14:31:25.000000000 +0100
@@ -1,3 +1,11 @@
+lxc (1:5.0.3-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM modules into /usr. (Closes: #-1)
+  * Drop Build-Depends on dh-exec, no longer necessary.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 25 Jan 2024 14:31:25 +0100
+
 lxc (1:5.0.3-2) unstable; urgency=medium
 
   * Switch default branch to debian/sid
diff -Nru lxc-5.0.3/debian/control lxc-5.0.3/debian/control
--- lxc-5.0.3/debian/control	2023-11-23 21:52:39.000000000 +0100
+++ lxc-5.0.3/debian/control	2024-01-25 14:30:34.000000000 +0100
@@ -9,7 +9,6 @@
 Build-Depends: bash-completion,
                debhelper-compat (= 13),
                dh-apparmor,
-               dh-exec,
                docbook2x,
                doxygen,
                graphviz,
diff -Nru lxc-5.0.3/debian/libpam-cgfs.install lxc-5.0.3/debian/libpam-cgfs.install
--- lxc-5.0.3/debian/libpam-cgfs.install	2023-08-04 00:55:49.000000000 +0200
+++ lxc-5.0.3/debian/libpam-cgfs.install	2024-01-25 14:31:00.000000000 +0100
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec --with-scripts=subst-multiarch
-usr/lib/${DEB_HOST_MULTIARCH}/security/pam_cgfs.so /lib/${DEB_HOST_MULTIARCH}/security
+usr/lib/*/security/pam_cgfs.so