Source: ipp-usb
Version: 0.9.23-1.1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
As Michael Biebl pointed out in #1057793, ipp-usb installs a binary
into /sbin. For the UsrMerge transition [1], this needs to move into
/usr/sbin, and needs to happen before the trixie transition freeze.
Attached is a patch to do that. An alternate option is to use
dh-sequence-movetousr.
The patch also swaps out Build-Depends: pkg-config with
Build-Depends: pkgconf, as the latter is a transitional package.
Please either upload yourself, or let me know if you want an NMU.
Chris
diff -Nru ipp-usb-0.9.23/debian/changelog ipp-usb-0.9.23/debian/changelog
--- ipp-usb-0.9.23/debian/changelog 2024-05-30 17:30:20.000000000 +0200
+++ ipp-usb-0.9.23/debian/changelog 2024-06-13 23:08:37.000000000 +0200
@@ -1,3 +1,11 @@
+ipp-usb (0.9.23-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install files into UsrMerged layout (DEP17 M2). (Closes: #-1)
+ * Replace obsolete Build-Depends: pkg-config with pkgconf.
+
+ -- Chris Hofstaedtler <z...@debian.org> Thu, 13 Jun 2024 23:08:37 +0200
+
ipp-usb (0.9.23-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru ipp-usb-0.9.23/debian/control ipp-usb-0.9.23/debian/control
--- ipp-usb-0.9.23/debian/control 2024-05-30 17:30:19.000000000 +0200
+++ ipp-usb-0.9.23/debian/control 2024-06-13 23:08:37.000000000 +0200
@@ -11,7 +11,7 @@
libavahi-client-dev,
libavahi-common-dev,
libusb-1.0-0-dev,
- pkg-config,
+ pkgconf,
ronn,
systemd-dev,
Standards-Version: 4.6.0
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
2024-05-30 17:30:19.000000000 +0200
+++
ipp-usb-0.9.23/debian/patches/0002-Use-pkg-config-for-systemd-dev-paths.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-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/0002-UsrMerged-install-layout.patch
ipp-usb-0.9.23/debian/patches/0002-UsrMerged-install-layout.patch
--- ipp-usb-0.9.23/debian/patches/0002-UsrMerged-install-layout.patch
1970-01-01 01:00:00.000000000 +0100
+++ ipp-usb-0.9.23/debian/patches/0002-UsrMerged-install-layout.patch
2024-06-13 23:08:37.000000000 +0200
@@ -0,0 +1,36 @@
+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))
+@@ -18,9 +20,9 @@ $(MANPAGE): $(MANPAGE).md
+ ronn --roff --manual=$@ $<
+
+ 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 -s -D -t $(PREFIX)/usr/sbin ipp-usb
++ 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
+Index: ipp-usb-0.9.23/systemd-udev/ipp-usb.service
+===================================================================
+--- ipp-usb-0.9.23.orig/systemd-udev/ipp-usb.service
++++ ipp-usb-0.9.23/systemd-udev/ipp-usb.service
+@@ -6,4 +6,4 @@ Wants=avahi-daemon.service
+
+ [Service]
+ Type=simple
+-ExecStart=/sbin/ipp-usb udev
++ExecStart=/usr/sbin/ipp-usb udev
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 2024-05-30 17:30:19.000000000
+0200
+++ ipp-usb-0.9.23/debian/patches/series 2024-06-13 23:08:37.000000000
+0200
@@ -1,2 +1,2 @@
0001-Revert-make-install-made-dependent-on-make-all.patch
-0002-Use-pkg-config-for-systemd-dev-paths.patch
+0002-UsrMerged-install-layout.patch
