[Fingerforce-devel] Bug#1061580: fprintd: install PAM module and systemd units into /usr

[Michael Biebl]

Source: fprintd
Version: 1.94.2-3
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. fprintd 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 fprintd-1.94.2/debian/changelog fprintd-1.94.2/debian/changelog
--- fprintd-1.94.2/debian/changelog	2023-12-23 04:28:38.000000000 +0100
+++ fprintd-1.94.2/debian/changelog	2024-01-26 21:15:56.000000000 +0100
@@ -1,3 +1,10 @@
+fprintd (1.94.2-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module and systemd units into /usr. (Closes: #-1)
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 26 Jan 2024 21:15:56 +0100
+
 fprintd (1.94.2-3) unstable; urgency=medium
 
   * debian/control: depend on polkitd instead of policykit-1
diff -Nru fprintd-1.94.2/debian/fprintd.install fprintd-1.94.2/debian/fprintd.install
--- fprintd-1.94.2/debian/fprintd.install	2023-12-23 04:28:38.000000000 +0100
+++ fprintd-1.94.2/debian/fprintd.install	2024-01-26 21:12:33.000000000 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/dh-exec
 
 etc/fprintd.conf
-[linux-any] lib/systemd/system/fprintd.service
+[linux-any] usr/lib/systemd/system/fprintd.service
 usr/bin/fprintd-delete
 usr/bin/fprintd-enroll
 usr/bin/fprintd-list
diff -Nru fprintd-1.94.2/debian/libpam-fprintd.install fprintd-1.94.2/debian/libpam-fprintd.install
--- fprintd-1.94.2/debian/libpam-fprintd.install	2023-12-23 04:28:38.000000000 +0100
+++ fprintd-1.94.2/debian/libpam-fprintd.install	2024-01-26 21:12:18.000000000 +0100
@@ -1,3 +1,3 @@
 debian/pam-configs/* usr/share/pam-configs/
-lib/*/security/pam_fprintd.so
+usr/lib/*/security/pam_fprintd.so
 usr/share/man/man8/pam_fprintd.8
diff -Nru fprintd-1.94.2/debian/rules fprintd-1.94.2/debian/rules
--- fprintd-1.94.2/debian/rules	2023-12-23 04:28:38.000000000 +0100
+++ fprintd-1.94.2/debian/rules	2024-01-26 21:15:54.000000000 +0100
@@ -1,16 +1,16 @@
 #!/usr/bin/make -f
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/default.mk
 
 %:
 	dh $@
 
 # Configuration arguments
-CONFIG_ARGS = -Dpam=true
+CONFIG_ARGS = -Dpam=true -Dpam_modules_dir=/usr/lib/$(DEB_HOST_MULTIARCH)/security
 BUILDDIR = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	CONFIG_ARGS += -Dsystemd_system_unit_dir=/lib/systemd/system
+	CONFIG_ARGS += -Dsystemd_system_unit_dir=/usr/lib/systemd/system
 else
 	CONFIG_ARGS += -Dsystemd=false
 endif