Bug#1064122: libpam-freerdp2: install PAM module into /usr
Source: libpam-freerdp2
Version: 2.0.0-3
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. libpam-freerdp2 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.
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-freerdp2-2.0.0/debian/changelog libpam-freerdp2-2.0.0/debian/changelog
--- libpam-freerdp2-2.0.0/debian/changelog 2019-12-04 08:45:58.000000000 +0100
+++ libpam-freerdp2-2.0.0/debian/changelog 2024-02-17 13:27:25.000000000 +0100
@@ -1,3 +1,10 @@
+libpam-freerdp2 (2.0.0-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install PAM module into /usr. (Closes: #-1)
+
+ -- Michael Biebl <biebl@debian.org> Sat, 17 Feb 2024 13:27:25 +0100
+
libpam-freerdp2 (2.0.0-3) unstable; urgency=medium
[ Mike Gabriel ]
diff -Nru libpam-freerdp2-2.0.0/debian/libpam-freerdp2.install libpam-freerdp2-2.0.0/debian/libpam-freerdp2.install
--- libpam-freerdp2-2.0.0/debian/libpam-freerdp2.install 2018-05-08 13:06:56.000000000 +0200
+++ libpam-freerdp2-2.0.0/debian/libpam-freerdp2.install 2024-02-17 13:27:25.000000000 +0100
@@ -1,2 +1 @@
-lib/
usr/lib/
diff -Nru libpam-freerdp2-2.0.0/debian/patches/pammoddir.patch libpam-freerdp2-2.0.0/debian/patches/pammoddir.patch
--- libpam-freerdp2-2.0.0/debian/patches/pammoddir.patch 1970-01-01 01:00:00.000000000 +0100
+++ libpam-freerdp2-2.0.0/debian/patches/pammoddir.patch 2024-02-17 13:27:05.000000000 +0100
@@ -0,0 +1,13 @@
+Index: libpam-freerdp2-2.0.0/configure.ac
+===================================================================
+--- libpam-freerdp2-2.0.0.orig/configure.ac 2018-05-07 15:46:46.000000000 +0200
++++ libpam-freerdp2-2.0.0/configure.ac 2024-02-17 13:27:01.065645905 +0100
+@@ -33,7 +33,7 @@
+ # PAM Module dir
+ ###########################
+
+-PAMMODULEDIR="/lib/security"
++PAMMODULEDIR="/usr/lib/security"
+ AC_SUBST(PAMMODULEDIR)
+
+ ###########################
diff -Nru libpam-freerdp2-2.0.0/debian/patches/series libpam-freerdp2-2.0.0/debian/patches/series
--- libpam-freerdp2-2.0.0/debian/patches/series 2019-12-04 08:09:11.000000000 +0100
+++ libpam-freerdp2-2.0.0/debian/patches/series 2024-02-17 13:26:44.000000000 +0100
@@ -1 +1,2 @@
1001_dont_abuse_AC_CHECK_FILES.patch
+pammoddir.patch
diff -Nru libpam-freerdp2-2.0.0/debian/rules libpam-freerdp2-2.0.0/debian/rules
--- libpam-freerdp2-2.0.0/debian/rules 2018-05-08 13:06:56.000000000 +0200
+++ libpam-freerdp2-2.0.0/debian/rules 2024-02-17 13:27:23.000000000 +0100
@@ -17,9 +17,9 @@
cleanbuilddir::
rm -f README
-# Remove .a and .la files from /lib/security
+# Remove .a and .la files from /us/lib/security
remove-cruft::
- find $(DEB_DESTDIR)/lib/security -type f \
+ find $(DEB_DESTDIR)/usr/lib/security -type f \
\( -name '*.a' -o -name '*.la' \) \
-exec rm '{}' +
Reply to: