[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1061699: kwallet-pam: install PAM module into /usr



Source: kwallet-pam
Version: 5.27.10-1
Severity: normal
Tags: patch
User: helmutg@debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. kwallet-pam 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 kwallet-pam-5.27.10/debian/changelog kwallet-pam-5.27.10/debian/changelog
--- kwallet-pam-5.27.10/debian/changelog	2024-01-11 23:16:19.000000000 +0100
+++ kwallet-pam-5.27.10/debian/changelog	2024-01-28 20:35:31.000000000 +0100
@@ -1,3 +1,10 @@
+kwallet-pam (5.27.10-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into /usr. (Closes: #-1)
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 28 Jan 2024 20:35:31 +0100
+
 kwallet-pam (5.27.10-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff -Nru kwallet-pam-5.27.10/debian/libpam-kwallet5.install kwallet-pam-5.27.10/debian/libpam-kwallet5.install
--- kwallet-pam-5.27.10/debian/libpam-kwallet5.install	2022-06-21 21:23:53.000000000 +0200
+++ kwallet-pam-5.27.10/debian/libpam-kwallet5.install	2024-01-28 20:35:23.000000000 +0100
@@ -1 +1 @@
-lib/*/security/pam_kwallet5.so
+usr/lib/*/security/pam_kwallet5.so
diff -Nru kwallet-pam-5.27.10/debian/rules kwallet-pam-5.27.10/debian/rules
--- kwallet-pam-5.27.10/debian/rules	2022-06-21 21:23:53.000000000 +0200
+++ kwallet-pam-5.27.10/debian/rules	2024-01-28 20:35:15.000000000 +0100
@@ -9,5 +9,5 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	    -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}" \
+	    -DCMAKE_INSTALL_LIBDIR="/usr/lib/${DEB_HOST_MULTIARCH}" \
 	    -DKDE_INSTALL_LIBEXECDIR="/usr/share/libpam-kwallet-common"

Reply to: