Source: pam-u2f
Version: 1.1.0-1.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-u2f 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-u2f-1.1.0/debian/changelog pam-u2f-1.1.0/debian/changelog
--- pam-u2f-1.1.0/debian/changelog      2021-06-05 15:04:24.000000000 +0200
+++ pam-u2f-1.1.0/debian/changelog      2024-01-29 22:27:22.000000000 +0100
@@ -1,3 +1,10 @@
+pam-u2f (1.1.0-1.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org>  Mon, 29 Jan 2024 22:27:22 +0100
+
 pam-u2f (1.1.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru pam-u2f-1.1.0/debian/libpam-u2f.install 
pam-u2f-1.1.0/debian/libpam-u2f.install
--- pam-u2f-1.1.0/debian/libpam-u2f.install     2021-06-05 15:04:24.000000000 
+0200
+++ pam-u2f-1.1.0/debian/libpam-u2f.install     2024-01-29 22:27:05.000000000 
+0100
@@ -1 +1 @@
-lib/*/security/pam_u2f.so
+usr/lib/*/security/pam_u2f.so
diff -Nru pam-u2f-1.1.0/debian/rules pam-u2f-1.1.0/debian/rules
--- pam-u2f-1.1.0/debian/rules  2021-06-05 15:04:24.000000000 +0200
+++ pam-u2f-1.1.0/debian/rules  2024-01-29 22:27:15.000000000 +0100
@@ -8,7 +8,7 @@
 override_dh_auto_configure:
        dh_auto_configure -- \
                --disable-silent-rules \
-               --with-pam-dir=$(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/security
+               --with-pam-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/security
 
 override_dh_installchangelogs:
        dh_installchangelogs NEWS

Reply via email to