Bug#1061702: malcontent: install PAM module into /usr

[Michael Biebl]

Source: malcontent
Version: 0.11.1-1
Severity: normal
Tags: patch
User: helmutg at debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. malcontent 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
-------------- next part --------------
diff -Nru malcontent-0.11.1/debian/changelog malcontent-0.11.1/debian/changelog
--- malcontent-0.11.1/debian/changelog	2023-09-19 19:48:15.000000000 +0200
+++ malcontent-0.11.1/debian/changelog	2024-01-28 20:45:36.000000000 +0100
@@ -1,3 +1,10 @@
+malcontent (0.11.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into /usr. (Closes: #-1)
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 28 Jan 2024 20:45:36 +0100
+
 malcontent (0.11.1-1) unstable; urgency=medium
 
   * Team upload
diff -Nru malcontent-0.11.1/debian/libpam-malcontent.install malcontent-0.11.1/debian/libpam-malcontent.install
--- malcontent-0.11.1/debian/libpam-malcontent.install	2023-09-19 19:48:15.000000000 +0200
+++ malcontent-0.11.1/debian/libpam-malcontent.install	2024-01-28 20:45:23.000000000 +0100
@@ -1,2 +1,2 @@
 debian/local/pam-configs/malcontent usr/share/pam-configs/
-lib/*/security/pam_malcontent.so
+usr/lib/*/security/pam_malcontent.so
diff -Nru malcontent-0.11.1/debian/rules malcontent-0.11.1/debian/rules
--- malcontent-0.11.1/debian/rules	2023-09-19 19:48:15.000000000 +0200
+++ malcontent-0.11.1/debian/rules	2024-01-28 20:45:06.000000000 +0100
@@ -10,7 +10,7 @@
 %:
 	dh $@
 
-meson_options := -Dpamlibdir=/lib/$(DEB_HOST_MULTIARCH)/security
+meson_options := -Dpamlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/security
 
 ifneq ($(filter libmalcontent-ui-%,$(binaries)),)
 meson_options += -Dui=enabled