Source: pam-pgsql
Version: 0.7.3.2-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-pgsql 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 1: this change includes moving the .so into a multiarch path which
is recommended on Debian nowadays.

Note 2: 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-pgsql-0.7.3.2/debian/changelog pam-pgsql-0.7.3.2/debian/changelog
--- pam-pgsql-0.7.3.2/debian/changelog  2014-10-06 22:51:38.000000000 +0200
+++ pam-pgsql-0.7.3.2/debian/changelog  2024-02-16 11:46:48.000000000 +0100
@@ -1,3 +1,10 @@
+pam-pgsql (0.7.3.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into multiarch path in /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org>  Fri, 16 Feb 2024 11:46:48 +0100
+
 pam-pgsql (0.7.3.2-1) unstable; urgency=medium
 
   * New upstream version
diff -Nru pam-pgsql-0.7.3.2/debian/rules pam-pgsql-0.7.3.2/debian/rules
--- pam-pgsql-0.7.3.2/debian/rules      2014-10-06 22:51:38.000000000 +0200
+++ pam-pgsql-0.7.3.2/debian/rules      2024-02-16 11:46:45.000000000 +0100
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -- Rules to build libpam-pgsql package
 
+include /usr/share/dpkg/architecture.mk
+
 ## globals
 PACKAGE=    libpam-pgsql
 DESTDIR=    $(CURDIR)/debian/${PACKAGE}
@@ -8,7 +10,7 @@
 override_dh_auto_configure:
        autoreconf -vfi
        # Build the module
-       ./configure $(shell dpkg-buildflags --export=configure) 
--docdir=/usr/share/doc/libpam-pgsql --libdir=/lib \
+       ./configure $(shell dpkg-buildflags --export=configure) 
--docdir=/usr/share/doc/libpam-pgsql --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
         --enable-shared
 
 override_dh_auto_install:
@@ -16,7 +18,7 @@
        $(MAKE) DESTDIR=${DESTDIR} install
        rm -f ${DESTDIR}/usr/share/doc/libpam-pgsql/CHANGELOG \
         ${DESTDIR}/usr/share/doc/libpam-pgsql/sample.sql \
-        ${DESTDIR}/lib/security/pam_pgsql.la
+        ${DESTDIR}/usr/lib/$(DEB_HOST_MULTIARCH)/security/pam_pgsql.la
 
 override_dh_makeshlibs:
        dh_makeshlibs --noscripts

Reply via email to