Source: dlm Version: 4.2.0-3 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2
Dear Maintainer, your package installs files related to systemd and udev, into /lib. These files need to be moved to /usr/lib as part of Debian's usr-merge effort [1]. Attached you will find a patch to delegate the exact placement to systemd.pc/udev.pc (using pkg-config). This should work today in unstable and, if necessary, for bookworm. Once udev.pc in unstable points to /usr/lib your package will benefit automatically after a binNMU or any other upload. systemd.pc in unstable already points to /usr/lib. Later during the trixie cycle I expect this bug class to raise in priority. Per the wiki, it is advisable to upload to experimental first, and wait a few days for the dumat tool to check your package. The same is advisable when any structural changes are done in the trixie cycle. Thank you for considering, Chris [1] https://wiki.debian.org/UsrMerge
diff -Nru dlm-4.2.0/debian/changelog dlm-4.2.0/debian/changelog --- dlm-4.2.0/debian/changelog 2023-07-27 21:05:33.000000000 +0200 +++ dlm-4.2.0/debian/changelog 2023-12-08 00:06:33.000000000 +0100 @@ -1,3 +1,10 @@ +dlm (4.2.0-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Delegate placement of udev files to pkg-config data + + -- Chris Hofstaedtler <z...@debian.org> Fri, 08 Dec 2023 00:06:33 +0100 + dlm (4.2.0-3) unstable; urgency=medium * [d012be6] Update Standards-Version to 4.6.2 (no changes required) diff -Nru dlm-4.2.0/debian/control dlm-4.2.0/debian/control --- dlm-4.2.0/debian/control 2023-07-27 21:03:02.000000000 +0200 +++ dlm-4.2.0/debian/control 2023-12-08 00:06:31.000000000 +0100 @@ -16,6 +16,7 @@ libxml2-dev, pacemaker-dev, pkg-config, + systemd-dev, uuid-dev, Homepage: https://pagure.io/dlm Vcs-Browser: https://salsa.debian.org/ha-team/dlm diff -Nru dlm-4.2.0/debian/dlm-controld.install dlm-4.2.0/debian/dlm-controld.install --- dlm-4.2.0/debian/dlm-controld.install 2022-11-15 23:30:59.000000000 +0100 +++ dlm-4.2.0/debian/dlm-controld.install 2023-12-08 00:06:33.000000000 +0100 @@ -1,5 +1,5 @@ debian/configfs.conf usr/lib/modules-load.d -usr/lib/udev/rules.d/51-dlm.rules lib/udev/rules.d +usr/lib/udev/rules.d/51-dlm.rules ${env:deb_udevdir}/rules.d usr/sbin usr/share/man/man5 usr/share/man/man8 diff -Nru dlm-4.2.0/debian/rules dlm-4.2.0/debian/rules --- dlm-4.2.0/debian/rules 2022-11-16 00:03:38.000000000 +0100 +++ dlm-4.2.0/debian/rules 2023-12-08 00:06:33.000000000 +0100 @@ -11,6 +11,9 @@ DPKG_EXPORT_BUILDTOOLS=1 include /usr/share/dpkg/buildtools.mk +export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,) +export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,) + %: dh $@ @@ -18,7 +21,7 @@ dh_auto_install -- LIBNUM=/lib/$(DEB_HOST_MULTIARCH) DEFDIR=debian/dlm-controld/etc/default -SDDIR= debian/dlm-controld/lib/systemd/system +SDDIR=debian/dlm-controld/$(deb_systemdsystemunitdir) override_dh_install: dh_install mkdir -p "$(DEFDIR)" "$(SDDIR)"
