Source: oddjob Version: 0.34.7-2 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. oddjob 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 oddjob-0.34.7/debian/changelog oddjob-0.34.7/debian/changelog --- oddjob-0.34.7/debian/changelog 2023-11-16 12:29:36.000000000 +0100 +++ oddjob-0.34.7/debian/changelog 2024-01-29 22:36:03.000000000 +0100 @@ -1,3 +1,10 @@ +oddjob (0.34.7-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install PAM module into /usr. (Closes: #-1) + + -- Michael Biebl <bi...@debian.org> Mon, 29 Jan 2024 22:36:03 +0100 + oddjob (0.34.7-2) unstable; urgency=medium [ Debian Janitor ] diff -Nru oddjob-0.34.7/debian/oddjob-mkhomedir.install oddjob-0.34.7/debian/oddjob-mkhomedir.install --- oddjob-0.34.7/debian/oddjob-mkhomedir.install 2021-01-07 07:56:06.000000000 +0100 +++ oddjob-0.34.7/debian/oddjob-mkhomedir.install 2024-01-29 22:36:03.000000000 +0100 @@ -1,6 +1,6 @@ etc/dbus-1/system.d/oddjob-mkhomedir.conf etc/oddjobd.conf.d/oddjobd-mkhomedir.conf -lib/*/security/pam_oddjob_mkhomedir.so +usr/lib/*/security/pam_oddjob_mkhomedir.so usr/libexec/oddjob/mkhomedir usr/share/man/man5/oddjob-mkhomedir.conf.5 usr/share/man/man5/oddjobd-mkhomedir.conf.5 diff -Nru oddjob-0.34.7/debian/rules oddjob-0.34.7/debian/rules --- oddjob-0.34.7/debian/rules 2023-11-16 12:29:36.000000000 +0100 +++ oddjob-0.34.7/debian/rules 2024-01-29 22:35:55.000000000 +0100 @@ -25,9 +25,5 @@ override_dh_install: # purge .la files find $(CURDIR)/debian/tmp -name "*.la" -type f -exec rm -f "{}" \; - # move pam module to correct location - mkdir -p $(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH} - mv $(CURDIR)/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/security \ - $(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}/ dh_install