Source: libpam-ssh
Version: 2.3+ds-6
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. libpam-ssh 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.

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
diff -Nru libpam-ssh-2.3+ds/debian/changelog libpam-ssh-2.3+ds/debian/changelog
--- libpam-ssh-2.3+ds/debian/changelog  2022-01-13 20:58:56.000000000 +0100
+++ libpam-ssh-2.3+ds/debian/changelog  2024-01-29 22:23:25.000000000 +0100
@@ -1,3 +1,10 @@
+libpam-ssh (2.3+ds-6.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org>  Mon, 29 Jan 2024 22:23:25 +0100
+
 libpam-ssh (2.3+ds-6) unstable; urgency=medium
 
   * RC bug fix release (Closes: #1003617), correct d/pam-configs/ssh-*.
diff -Nru libpam-ssh-2.3+ds/debian/libpam-ssh.install 
libpam-ssh-2.3+ds/debian/libpam-ssh.install
--- libpam-ssh-2.3+ds/debian/libpam-ssh.install 2022-01-01 21:33:31.000000000 
+0100
+++ libpam-ssh-2.3+ds/debian/libpam-ssh.install 2024-01-29 22:23:18.000000000 
+0100
@@ -1,2 +1,2 @@
 debian/pam-configs/ssh-* usr/share/pam-configs
-lib/*/security/pam_ssh.so
+usr/lib/*/security/pam_ssh.so
diff -Nru libpam-ssh-2.3+ds/debian/rules libpam-ssh-2.3+ds/debian/rules
--- libpam-ssh-2.3+ds/debian/rules      2021-12-12 13:18:35.000000000 +0100
+++ libpam-ssh-2.3+ds/debian/rules      2024-01-29 22:23:06.000000000 +0100
@@ -11,7 +11,7 @@
        dh $@
 
 override_dh_auto_configure:
-       dh_auto_configure -- --with-ssh-agent-group=ssh 
--with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security
+       dh_auto_configure -- --with-ssh-agent-group=ssh 
--with-pam-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/security
 
 override_dh_auto_install:
        dh_auto_install --destdir debian/tmp/

Reply via email to