[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1073172: marked as done (ipp-usb: install into UsrMerged layout (DEP17 M2))

Your message dated Sat, 17 Aug 2024 09:49:16 +0000
with message-id <E1sfG3g-008iYq-50@fasolo.debian.org>
and subject line Bug#1073172: fixed in ipp-usb 0.9.23-2
has caused the Debian Bug report #1073172,
regarding ipp-usb: install into UsrMerged layout (DEP17 M2)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1073172: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1073172
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: ipp-usb
Version: 0.9.23-1.1
Severity: normal
Tags: patch
User: helmutg@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 <zeha@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

--- End Message ---
--- Begin Message --- 
Source: ipp-usb
Source-Version: 0.9.23-2
Done: Thorsten Alteholz <debian@alteholz.de>

We believe that the bug you reported is fixed in the latest version of
ipp-usb, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1073172@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Thorsten Alteholz <debian@alteholz.de> (supplier of updated ipp-usb package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sat, 17 Aug 2024 10:26:08 +0200
Source: ipp-usb
Architecture: source
Version: 0.9.23-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
Changed-By: Thorsten Alteholz <debian@alteholz.de>
Closes: 1073172
Changes:
 ipp-usb (0.9.23-2) unstable; urgency=medium
 .
   [ Chris Hofstaedtler ]
   * Install files into UsrMerged layout (DEP17 M2). (Closes: #1073172)
   * Replace obsolete Build-Depends: pkg-config with pkgconf.
Checksums-Sha1:
 c15d71901760ce314eda409ac1080b234b8c7491 2287 ipp-usb_0.9.23-2.dsc
 f90d7435deae0969f556e75119180deb7d48d159 4568 ipp-usb_0.9.23-2.debian.tar.xz
 5855704b8f54c43163c39241e00d335c1ce1c7b7 7809 ipp-usb_0.9.23-2_amd64.buildinfo
Checksums-Sha256:
 a6efe48dfc5f9e9e57494602de9da0b26445e42bb332003488038b8cfc02b215 2287 ipp-usb_0.9.23-2.dsc
 7e6a8f772f7f5dbb89f85f8669d835401eaada6b65261126fe5e7d0e5aa69b1a 4568 ipp-usb_0.9.23-2.debian.tar.xz
 0a202179b57ac2af3762fc9fc4a86ffb70b1ff2a944c8c1634fb49f163cb8f2b 7809 ipp-usb_0.9.23-2_amd64.buildinfo
Files:
 212eb913a20db73d8ca012c9ef53235a 2287 comm optional ipp-usb_0.9.23-2.dsc
 365a89c1e193efdb2dc7dc1b549cd48a 4568 comm optional ipp-usb_0.9.23-2.debian.tar.xz
 d26391c31117c24028028b58817ee8e1 7809 comm optional ipp-usb_0.9.23-2_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQKnBAEBCgCRFiEEYgH7/9u94Hgi6ruWlvysDTh7WEcFAmbAb2JfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDYy
MDFGQkZGREJCREUwNzgyMkVBQkI5Njk2RkNBQzBEMzg3QjU4NDcTHGRlYmlhbkBh
bHRlaG9sei5kZQAKCRCW/KwNOHtYRzwdEACrwWJJ1RULknQXD0Nu27gAS+lEL+Kc
zU05wI543jxbFduKrKDNRP4C3ptEBMXX8WeM9JcsTxezkjjwcHR57L41HLTEmfY8
VFZptmkKsXMvCC0eX9PW79zwTCugGluq8dw7Q1703NWYsFt5nbAyfkZuIOsXjpmG
b+uLQBCuwhWFZJUdvT5FmrDGYqRpxgjkOG1GmAIl9toa9wSr566Cy1hBVUMuMV1N
28ZRRYKvoLW5LM5LvTrKqbYRXqRYUUIj5OIxWbeeTDNXnglm3HmiFN3Zy5TCXt8L
56Yb9dR2024hxz06v29eXsJboCPWtulcPAWHWmFfee95wu7vZV3K2aoXE0fPjL42
yE2SVQyhLaogB8GuYY4Xn2XPHeVEC866fr2VELS55ZaNT4ltz/6xqJq3GxskTGb4
+jFDgBNQOBUedeRULn+a7hldmYopfiBJRPcbLkohJeDTuuurNwPLOJEbiJCTjLAn
Yl4qwdzuGkZIbH+6A0z0IVvalB6akAGhkNc5cqQur22c1lHaFtRbcXqdwrjsPAGW
6XiEaRCY/rma+tTNTnyEwyBexcsxrBOsMs8EG2ezuLpQT56hewgXekQMhXlDcC3r
t1tEZifh1Z9FsyRL/8CnL+Ub8GhQMEvVlJllVpHMHfd+GaBoK+R0LWFUtVaX6HaG
SRYXRdAz9CerRA==
=N//0
-----END PGP SIGNATURE-----

Attachment: pgpMrRwadqZpN.pgp
Description: PGP signature


--- End Message ---
Reply to: