Bug#1057793: ipp-usb: diff for NMU version 0.9.23-1.1
Control: tags 1057793 + pending
Dear maintainer,
I've prepared an NMU for ipp-usb (versioned as 0.9.23-1.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.
Regards.
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 2024-05-30 17:30:20.000000000 +0200
@@ -1,3 +1,11 @@
+ipp-usb (0.9.23-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Delegate placement of udev/systemd files to pkg-config data
+ (Closes: #1057793)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Thu, 30 May 2024 17:30:20 +0200
+
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 2024-05-30 17:30:19.000000000 +0200
@@ -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 2024-05-30 17:30:19.000000000 +0200
@@ -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 2024-05-30 17:30:19.000000000 +0200
@@ -1 +1,2 @@
0001-Revert-make-install-made-dependent-on-make-all.patch
+0002-Use-pkg-config-for-systemd-dev-paths.patch
Reply to: