Source: pam-pkcs11
Version: 0.6.12-1
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. pam-kcs11 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 pam-pkcs11-0.6.12/debian/changelog pam-pkcs11-0.6.12/debian/changelog
--- pam-pkcs11-0.6.12/debian/changelog  2023-02-04 22:30:23.000000000 +0100
+++ pam-pkcs11-0.6.12/debian/changelog  2024-01-29 21:54:00.000000000 +0100
@@ -1,3 +1,10 @@
+pam-pkcs11 (0.6.12-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org>  Mon, 29 Jan 2024 21:54:00 +0100
+
 pam-pkcs11 (0.6.12-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru pam-pkcs11-0.6.12/debian/rules pam-pkcs11-0.6.12/debian/rules
--- pam-pkcs11-0.6.12/debian/rules      2023-02-04 22:30:23.000000000 +0100
+++ pam-pkcs11-0.6.12/debian/rules      2024-01-29 21:53:56.000000000 +0100
@@ -10,13 +10,13 @@
        dh $@
 
 override_dh_auto_configure:
-       dh_auto_configure -- --libdir=/lib/$(DEB_HOST_MULTIARCH) --with-curl
+       dh_auto_configure -- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --with-curl
 
 override_dh_auto_install:
        dh_auto_install
 
        # remove .la files
-       rm debian/libpam-pkcs11/lib/$(DEB_HOST_MULTIARCH)/security/*.la
-       rm debian/libpam-pkcs11/lib/$(DEB_HOST_MULTIARCH)/pam_pkcs11/*.la
+       rm debian/libpam-pkcs11/usr/lib/$(DEB_HOST_MULTIARCH)/security/*.la
+       rm debian/libpam-pkcs11/usr/lib/$(DEB_HOST_MULTIARCH)/pam_pkcs11/*.la
 
        rm -r debian/libpam-pkcs11/usr/share/doc/pam_pkcs11

Reply via email to