Source: libpam-krb5
Version: 4.11-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. libpam-krb5 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 libpam-krb5-4.11/debian/changelog libpam-krb5-4.11/debian/changelog
--- libpam-krb5-4.11/debian/changelog   2021-10-18 00:49:06.000000000 +0200
+++ libpam-krb5-4.11/debian/changelog   2024-01-22 23:45:18.000000000 +0100
@@ -1,3 +1,10 @@
+libpam-krb5 (4.11-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM modules into /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org>  Mon, 22 Jan 2024 23:45:18 +0100
+
 libpam-krb5 (4.11-1) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru libpam-krb5-4.11/debian/rules libpam-krb5-4.11/debian/rules
--- libpam-krb5-4.11/debian/rules       2021-10-18 00:49:06.000000000 +0200
+++ libpam-krb5-4.11/debian/rules       2024-01-22 23:43:54.000000000 +0100
@@ -17,13 +17,13 @@
 override_dh_auto_configure:
        mkdir build-mit build-heimdal
        dh_auto_configure -Bbuild-mit --                                   \
-           --enable-reduced-depends --libdir=/lib/$(DEB_HOST_MULTIARCH)   \
+           --enable-reduced-depends --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)   \
            --with-krb5-include=/usr/include/mit-krb5                      \
            --with-krb5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5        \
            --with-kadm-client-include=/usr/include/mit-krb5               \
            --with-kadm-client-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5
        dh_auto_configure -Bbuild-heimdal --                              \
-           --enable-reduced-depends --libdir=/lib/$(DEB_HOST_MULTIARCH)  \
+           --enable-reduced-depends --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)  \
            --with-krb5-include=/usr/include/heimdal                      \
            --with-krb5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal        \
            --with-kadm-client-include=/usr/include/heimdal               \
@@ -40,8 +40,8 @@
 override_dh_auto_install:
        dh_auto_install -Bbuild-mit --destdir=debian/libpam-krb5
        dh_auto_install -Bbuild-heimdal --destdir=debian/libpam-heimdal
-       rm debian/libpam-*/lib/*/security/*.la
-       chmod 644 debian/libpam-*/lib/*/security/*.so
+       rm debian/libpam-*/usr/lib/*/security/*.la
+       chmod 644 debian/libpam-*/usr/lib/*/security/*.so
        install -d debian/libpam-krb5/usr/share/pam-configs
        install -d debian/libpam-heimdal/usr/share/pam-configs
        install -m 644 debian/pam-auth-update \

Reply via email to