Source: ipp-usb Version: 0.9.23-1 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. Note: this patch does NOT move /sbin/ipp-usb. At the time of writing unstable is not ready for such a change. Depending on when you merge this, moving /sbin/ipp-usb to /usr/sbin might also be appropriate. 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 ipp-usb-0.9.23/debian/changelog ipp-usb-0.9.23/debian/changelog --- ipp-usb-0.9.23/debian/changelog 2022-12-07 12:26:08.000000000 +0100 +++ ipp-usb-0.9.23/debian/changelog 2023-12-08 16:09:18.000000000 +0100 @@ -1,3 +1,10 @@ +ipp-usb (0.9.23-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Delegate placement of udev/systemd files to pkg-config data + + -- Chris Hofstaedtler <z...@debian.org> Fri, 08 Dec 2023 16:09:18 +0100 + ipp-usb (0.9.23-1) unstable; urgency=medium * Update to new upstream version 0.9.23. diff -Nru ipp-usb-0.9.23/debian/control ipp-usb-0.9.23/debian/control --- ipp-usb-0.9.23/debian/control 2022-12-07 12:25:07.000000000 +0100 +++ ipp-usb-0.9.23/debian/control 2023-12-08 16:09:18.000000000 +0100 @@ -13,6 +13,7 @@ libusb-1.0-0-dev, pkg-config, ronn, + systemd-dev, Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: https://github.com/OpenPrinting/ipp-usb diff -Nru ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch --- ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch 1970-01-01 01:00:00.000000000 +0100 +++ ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch 2023-12-08 16:09:05.000000000 +0100 @@ -0,0 +1,24 @@ +Index: ipp-usb-0.9.23/Makefile +=================================================================== +--- ipp-usb-0.9.23.orig/Makefile ++++ ipp-usb-0.9.23/Makefile +@@ -1,6 +1,8 @@ + MANDIR = /usr/share/man/ + QUIRKSDIR = /usr/share/ipp-usb/quirks + MANPAGE = ipp-usb.8 ++SYSTEMDSYSTEMUNITDIR = $(shell pkg-config --variable=systemdsystemunitdir systemd) ++UDEVDIR = $(shell pkg-config --variable=udevdir udev) + + # Merge DESTDIR and PREFIX + PREFIX := $(abspath $(DESTDIR)/$(PREFIX)) +@@ -19,8 +21,8 @@ $(MANPAGE): $(MANPAGE).md + + install: + install -s -D -t $(PREFIX)/sbin ipp-usb +- install -m 644 -D -t $(PREFIX)/lib/udev/rules.d systemd-udev/*.rules +- install -m 644 -D -t $(PREFIX)/lib/systemd/system systemd-udev/*.service ++ install -m 644 -D -t $(PREFIX)$(UDEVDIR)/rules.d systemd-udev/*.rules ++ install -m 644 -D -t $(PREFIX)$(SYSTEMDSYSTEMUNITDIR) systemd-udev/*.service + install -m 644 -D -t $(PREFIX)/etc/ipp-usb ipp-usb.conf + mkdir -p $(PREFIX)/$(MANDIR)/man8 + gzip <$(MANPAGE) > $(PREFIX)$(MANDIR)/man8/$(MANPAGE).gz diff -Nru ipp-usb-0.9.23/debian/patches/series ipp-usb-0.9.23/debian/patches/series --- ipp-usb-0.9.23/debian/patches/series 2022-12-07 12:26:08.000000000 +0100 +++ ipp-usb-0.9.23/debian/patches/series 2023-12-08 16:06:30.000000000 +0100 @@ -1 +1,2 @@ 0001-Revert-make-install-made-dependent-on-make-all.patch +0002-Use-pkg-config-for-systemd-dev-paths.patch
