Source: libpam-x2go Version: 0.0.2.0-3 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-x2go 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-x2go-0.0.2.0/debian/changelog libpam-x2go-0.0.2.0/debian/changelog --- libpam-x2go-0.0.2.0/debian/changelog 2019-12-04 08:14:10.000000000 +0100 +++ libpam-x2go-0.0.2.0/debian/changelog 2024-02-17 13:32:37.000000000 +0100 @@ -1,3 +1,10 @@ +libpam-x2go (0.0.2.0-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install PAM module into /usr. (Closes: #-1) + + -- Michael Biebl <bi...@debian.org> Sat, 17 Feb 2024 13:32:37 +0100 + libpam-x2go (0.0.2.0-3) unstable; urgency=medium [ Mike Gabriel ] diff -Nru libpam-x2go-0.0.2.0/debian/libpam-x2go.install libpam-x2go-0.0.2.0/debian/libpam-x2go.install --- libpam-x2go-0.0.2.0/debian/libpam-x2go.install 2018-05-07 15:16:11.000000000 +0200 +++ libpam-x2go-0.0.2.0/debian/libpam-x2go.install 2024-02-17 13:32:35.000000000 +0100 @@ -1,2 +1 @@ -lib/ usr/lib/ diff -Nru libpam-x2go-0.0.2.0/debian/patches/pammoddir.patch libpam-x2go-0.0.2.0/debian/patches/pammoddir.patch --- libpam-x2go-0.0.2.0/debian/patches/pammoddir.patch 1970-01-01 01:00:00.000000000 +0100 +++ libpam-x2go-0.0.2.0/debian/patches/pammoddir.patch 2024-02-17 13:32:37.000000000 +0100 @@ -0,0 +1,13 @@ +Index: libpam-x2go-0.0.2.0/configure.ac +=================================================================== +--- libpam-x2go-0.0.2.0.orig/configure.ac 2018-05-07 15:10:42.000000000 +0200 ++++ libpam-x2go-0.0.2.0/configure.ac 2024-02-17 13:32:14.447579799 +0100 +@@ -32,7 +32,7 @@ + # PAM Module dir + ########################### + +-PAMMODULEDIR="/lib/security" ++PAMMODULEDIR="/usr/lib/security" + AC_SUBST(PAMMODULEDIR) + + ########################### diff -Nru libpam-x2go-0.0.2.0/debian/patches/series libpam-x2go-0.0.2.0/debian/patches/series --- libpam-x2go-0.0.2.0/debian/patches/series 2019-12-04 08:09:11.000000000 +0100 +++ libpam-x2go-0.0.2.0/debian/patches/series 2024-02-17 13:32:02.000000000 +0100 @@ -1 +1,2 @@ 1001_dont_abuse_AC_CHECK_FILES.patch +pammoddir.patch diff -Nru libpam-x2go-0.0.2.0/debian/rules libpam-x2go-0.0.2.0/debian/rules --- libpam-x2go-0.0.2.0/debian/rules 2018-05-09 00:12:37.000000000 +0200 +++ libpam-x2go-0.0.2.0/debian/rules 2024-02-17 13:32:30.000000000 +0100 @@ -17,9 +17,9 @@ cleanbuilddir:: rm -f README -# Remove .a and .la files from /lib/security +# Remove .a and .la files from /usr/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 '{}' +