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

Bug#1060769: marked as done (foo2zjs: mitigate empty directory loss for usrmerge (DEP17 P6))

Your message dated Sat, 27 Apr 2024 09:20:28 +0000
with message-id <E1s0eEO-00BF5p-BM@fasolo.debian.org>
and subject line Bug#1060769: fixed in foo2zjs 20200505dfsg0-3
has caused the Debian Bug report #1060769,
regarding foo2zjs: mitigate empty directory loss for usrmerge (DEP17 P6)
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.)


-- 
1060769: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060769
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: foo2zjs
Version: 20200505dfsg0-2
Severity: normal
Tags: patch
User: helmutg@debian.org
Usertags: dep17p6

For the currently ongoing UsrMerge effort [1], paths installed into
/lib should move to /usr/lib.

printer-driver-foo2zjs installs the empty directory
/lib/firmware/hp. On a naive move to /usr, this directory would be
lost on upgrades (the "DEP17 P6" problem).

Please find a patch attached to install the relevant paths into /usr,
and a mitigation for the lost directory. I've chosen the postinst
way, as your package already had a postinst dealing with this path.

Note: this should not be backported to bookworm. If you intend to
backport, please revert the entire patch for the backport.

If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].

Chris

[1] https://wiki.debian.org/UsrMerge

diff -Nru foo2zjs-20200505dfsg0/debian/changelog foo2zjs-20200505dfsg0/debian/changelog
--- foo2zjs-20200505dfsg0/debian/changelog	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/changelog	2024-01-13 23:36:22.000000000 +0100
@@ -1,3 +1,12 @@
+foo2zjs (20200505dfsg0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install into UsrMerged-layout (udev files, firmware directory).
+    Restore /usr/lib/firmware/hp as an empty directory in postinst if it
+    is lost on upgrades. (DEP17 P6) (Closes: #-1)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Sat, 13 Jan 2024 23:36:22 +0100
+
 foo2zjs (20200505dfsg0-2) unstable; urgency=medium
 
   * Remove myself from Uploaders
diff -Nru foo2zjs-20200505dfsg0/debian/NEWS foo2zjs-20200505dfsg0/debian/NEWS
--- foo2zjs-20200505dfsg0/debian/NEWS	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/NEWS	2024-01-13 23:36:22.000000000 +0100
@@ -1,7 +1,7 @@
 foo2zjs (20090908dfsg-2) unstable; urgency=low
 
   Starting with this version all HP firmwares are looked for into
-  /lib/firmware/hp/ instead of upstream /usr/share/foo2zjs/firmware/
+  /usr/lib/firmware/hp/ instead of upstream /usr/share/foo2zjs/firmware/
   (thus solving bug #517957).
 
   The upstream /usr/bin/getweb and /lib/udev/hplj1000 scripts have
diff -Nru foo2zjs-20200505dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch foo2zjs-20200505dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch
--- foo2zjs-20200505dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch	2024-01-13 23:36:22.000000000 +0100
@@ -2,6 +2,8 @@
 Date: Tue, 4 Oct 2016 11:43:55 +0200
 Subject: Use the same firmware folder for all HP LJ printers
 
+[zeha@d.o 2024-01-13: changed to /usr/ for UsrMerge layout]
+
 ---
  hplj1000      |  6 ------
  hplj10xx.conf | 10 +++++-----
@@ -58,7 +60,7 @@
      match "vendor" "0x03f0";
      match "product" "0x3d17";
 -    action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name";
-+    action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name";
++    action "cat /usr/lib/firmware/hp/sihpP1005.dl > /dev/$device-name";
  };
  
  # Firmware download HP LaserJet P1006 printer
@@ -66,7 +68,7 @@
      match "vendor" "0x03f0";
      match "product" "0x3e17";
 -    action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name";
-+    action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name";
++    action "cat /usr/lib/firmware/hp/sihpP1006.dl > /dev/$device-name";
  };
  
  # Firmware download HP LaserJet P1007 printer
@@ -74,7 +76,7 @@
      match "vendor" "0x03f0";
      match "product" "0x4817";
 -    action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name";
-+    action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name";
++    action "cat /usr/lib/firmware/hp/sihpP1005.dl > /dev/$device-name";
  };
  
  # Firmware download HP LaserJet P1008 printer
@@ -82,7 +84,7 @@
      match "vendor" "0x03f0";
      match "product" "0x4917";
 -    action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name";
-+    action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name";
++    action "cat /usr/lib/firmware/hp/sihpP1006.dl > /dev/$device-name";
  };
  
  # Firmware download HP LaserJet P1505 printer
@@ -90,7 +92,7 @@
      match "vendor" "0x03f0";
      match "product" "0x3f17";
 -    action "cat /usr/share/foo2xqx/firmware/sihpP1505.dl > /dev/$device-name";
-+    action "cat /lib/firmware/hp/sihpP1505.dl > /dev/$device-name";
++    action "cat /usr/lib/firmware/hp/sihpP1505.dl > /dev/$device-name";
  };
  
  # Firmware download HP LaserJet 1000 printer
diff -Nru foo2zjs-20200505dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch foo2zjs-20200505dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch
--- foo2zjs-20200505dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch	2024-01-13 23:36:22.000000000 +0100
@@ -1,6 +1,8 @@
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 4 Oct 2016 11:43:56 +0200
-Subject: Firmware directory is /lib/firmware/hp/ (Closes: #517957)
+Subject: Firmware directory is /usr/lib/firmware/hp/ (Closes: #517957)
+
+[zeha@d.o 2024-01-13: changed to /usr/ for UsrMerge layout]
 
 ---
  arm2hpdl.1in      | 2 +-
@@ -18,7 +20,7 @@
  .SH FILES
  .BR /usr/bin/arm2hpdl,
 -.BR /usr/share/foo2*/firmware/
-+.BR /lib/firmware/hp/*
++.BR /usr/lib/firmware/hp/*
  .SH SEE ALSO
  .BR foo2zjs (1)
  .SH "AUTHOR"
@@ -31,7 +33,7 @@
      inputname=$1
      outputname=$2
 -    $ARM2HPDL $inputname > /usr/share/foo2zjs/firmware/$outputname
-+    $ARM2HPDL $inputname > /lib/firmware/hp/$outputname
++    $ARM2HPDL $inputname > /usr/lib/firmware/hp/$outputname
      rm $inputname
  }
  
@@ -44,7 +46,7 @@
  # Directory to find downloadable HP firmware files sihpMMMM.dl
  #
 -FWDIR=/usr/share/foo2zjs/firmware
-+FWDIR=/lib/firmware/hp
++FWDIR=/usr/lib/firmware/hp
  
  #
  # Program used to determine USB printer id information
@@ -57,7 +59,7 @@
  DES:HP LaserJet 1020;
  
 -# cp /usr/share/foo2zjs/firmware/sihp1020.dl /dev/usb/lp0
-+# cp /lib/firmware/hp/sihp1020.dl /dev/usb/lp0
++# cp /usr/lib/firmware/hp/sihp1020.dl /dev/usb/lp0
  
  # usb_printerid /dev/usb/lp0
  GET_DEVICE_ID string:
@@ -66,7 +68,7 @@
  .SH FILES
  .BR /usr/bin/usb_printerid,
 -.BR /usr/share/foo2*/firmware/*
-+.BR /lib/firmware/hp/*
++.BR /usr/lib/firmware/hp/*
  .SH SEE ALSO
  .BR arm2hpdl (1)
  .SH "AUTHOR"
diff -Nru foo2zjs-20200505dfsg0/debian/patches/0028-Install-udev-rules-into-usrmerged-layout.patch foo2zjs-20200505dfsg0/debian/patches/0028-Install-udev-rules-into-usrmerged-layout.patch
--- foo2zjs-20200505dfsg0/debian/patches/0028-Install-udev-rules-into-usrmerged-layout.patch	1970-01-01 01:00:00.000000000 +0100
+++ foo2zjs-20200505dfsg0/debian/patches/0028-Install-udev-rules-into-usrmerged-layout.patch	2024-01-13 23:36:22.000000000 +0100
@@ -0,0 +1,16 @@
+From: Chris Hofstaedtler <zeha@debian.org>
+Date: Sat, 13 Jan 2024 23:45:13 +0100
+Subject: Install udev rules into usrmerged layout
+
+diff -u a/Makefile b/Makefile
+--- foo2zjs-20200505dfsg0.orig/Makefile
++++ foo2zjs-20200505dfsg0/Makefile
+@@ -943,7 +943,7 @@ install-gui:
+ 
+ USBDIR=/etc/hotplug/usb
+ UDEVDIR=/etc/udev/rules.d
+-LIBUDEVDIR=/lib/udev/rules.d
++LIBUDEVDIR=/usr/lib/udev/rules.d
+ RULES=hplj10xx.rules
+ #UDEVD=/sbin/udevd
+ # For FreeBSD 8.0
diff -Nru foo2zjs-20200505dfsg0/debian/patches/series foo2zjs-20200505dfsg0/debian/patches/series
--- foo2zjs-20200505dfsg0/debian/patches/series	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/patches/series	2024-01-13 23:36:22.000000000 +0100
@@ -25,3 +25,4 @@
 0025-Re-enable-manual-duplex-printing-for-Samsung-CLP-300.patch
 0026-Specify-FOOMATICDB-when-calling-foomatic-ppfile.patch
 0027-getweb-use-quirinux.org-mirror-as-the-original-site-.patch
+0028-Install-udev-rules-into-usrmerged-layout.patch
diff -Nru foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs-common.install foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs-common.install
--- foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs-common.install	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs-common.install	2024-01-13 23:36:22.000000000 +0100
@@ -1,7 +1,7 @@
 PPD/* usr/share/ppd/foo2zjs/
 debian/printer-driver-foo2zjs-common.ppd-updater /usr/share/cups/ppd-updaters/
 getweb usr/sbin
-hplj1000 lib/udev
+hplj1000 usr/lib/udev
 hplj1020.desktop usr/share/applications/
 hplj1020_icon.png usr/share/pixmaps
 usr/bin/foo2ddst-wrapper
diff -Nru foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.dirs foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.dirs
--- foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.dirs	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.dirs	2024-01-13 23:36:22.000000000 +0100
@@ -1 +1 @@
-/lib/firmware/hp/
+/usr/lib/firmware/hp/
diff -Nru foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.links foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.links
--- foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.links	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.links	2024-01-13 23:36:22.000000000 +0100
@@ -1,10 +1,10 @@
-lib/udev/hplj1000 lib/udev/hplj1005
-lib/udev/hplj1000 lib/udev/hplj1018
-lib/udev/hplj1000 lib/udev/hplj1020
-lib/udev/hplj1000 lib/udev/hpljP1005
-lib/udev/hplj1000 lib/udev/hpljP1006
-lib/udev/hplj1000 lib/udev/hpljP1007
-lib/udev/hplj1000 lib/udev/hpljP1008
-lib/udev/hplj1000 lib/udev/hpljP1505
-lib/udev/hplj1000 lib/udev/hpljP1505n
+usr/lib/udev/hplj1000 usr/lib/udev/hplj1005
+usr/lib/udev/hplj1000 usr/lib/udev/hplj1018
+usr/lib/udev/hplj1000 usr/lib/udev/hplj1020
+usr/lib/udev/hplj1000 usr/lib/udev/hpljP1005
+usr/lib/udev/hplj1000 usr/lib/udev/hpljP1006
+usr/lib/udev/hplj1000 usr/lib/udev/hpljP1007
+usr/lib/udev/hplj1000 usr/lib/udev/hpljP1008
+usr/lib/udev/hplj1000 usr/lib/udev/hpljP1505
+usr/lib/udev/hplj1000 usr/lib/udev/hpljP1505n
 usr/bin/psicc usr/bin/foo2zjs-icc2ps
diff -Nru foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.lintian-overrides foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.lintian-overrides
--- foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.lintian-overrides	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.lintian-overrides	2024-01-13 23:36:22.000000000 +0100
@@ -1,5 +1,5 @@
 # That's on purpose, getweb can go fetch these from the web
-package-contains-empty-directory lib/firmware/hp/
+package-contains-empty-directory usr/lib/firmware/hp/
 
 # Manpages are shipped in printer-driver-foo2zjs-common
 no-manual-page usr/bin/arm2hpdl
diff -Nru foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.postinst foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.postinst
--- foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.postinst	2021-09-02 14:45:45.000000000 +0200
+++ foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.postinst	2024-01-13 23:36:22.000000000 +0100
@@ -3,9 +3,15 @@
 set -e
 
 if [ "$1" = configure ]; then
+    # Empty directory can be lost on upgrades from bookworm or earlier. (DEP17 P6)
+    if ! test -e /usr/lib/firmware/hp ; then
+        mkdir -p /usr/lib/firmware/hp
+    fi
+    # End
+
     # Move user-downloaded firmware files
     if ls /usr/share/foo2zjs/firmware/*.dl >/dev/null 2>/dev/null; then
-	mv /usr/share/foo2zjs/firmware/*.dl /lib/firmware/hp/ 2>/dev/null
+	mv /usr/share/foo2zjs/firmware/*.dl /usr/lib/firmware/hp/ 2>/dev/null
     fi
 fi

--- End Message ---
--- Begin Message --- 
Source: foo2zjs
Source-Version: 20200505dfsg0-3
Done: Thorsten Alteholz <debian@alteholz.de>

We believe that the bug you reported is fixed in the latest version of
foo2zjs, 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 1060769@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 foo2zjs 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, 27 Apr 2024 09:32:30 +0200
Source: foo2zjs
Architecture: source
Version: 20200505dfsg0-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
Changed-By: Thorsten Alteholz <debian@alteholz.de>
Closes: 1060769
Changes:
 foo2zjs (20200505dfsg0-3) unstable; urgency=medium
 .
   [ Thorsten Alteholz ]
   * debian/control: add myself as Uploader:
   * debian/control: bump standard to 4.7.0 (no changes)
   * debian/gbp.conf: latest pristine-tar is missing, so don't use it
 .
   [ Helmut Grohne, Chris Hofstaedtler ]
   * DEP17: Move all aliased files to /usr. (Closes: #1060769)
     Thanks a lot for preparing the patch
Checksums-Sha1:
 7e25fd9737af0aaebdce08530824b6b9e455d78b 2415 foo2zjs_20200505dfsg0-3.dsc
 33bd4610e360cf8cb0e626a6e990e3e062c65fc5 39824 foo2zjs_20200505dfsg0-3.debian.tar.xz
 da9c656286a120011b9e0c2808b6f96fb45e4530 10325 foo2zjs_20200505dfsg0-3_amd64.buildinfo
Checksums-Sha256:
 36286c93c5939bc27360f86198a66061e37f9e30ef7c03ceca507aef0173a2c6 2415 foo2zjs_20200505dfsg0-3.dsc
 dcf7cd9c1c31d3066e8d68ba9d84cc9758032e8d7694b6730ff7748e837c5c24 39824 foo2zjs_20200505dfsg0-3.debian.tar.xz
 8ce2601f5163e190ab70d13e8b0b99a3a2033c5cbb2ceaa9f675a8c886408eed 10325 foo2zjs_20200505dfsg0-3_amd64.buildinfo
Files:
 88b9373f3bb691d7fd911a4549fed1b7 2415 text optional foo2zjs_20200505dfsg0-3.dsc
 d63255e503f7fa89d9c9fdace643c44c 39824 text optional foo2zjs_20200505dfsg0-3.debian.tar.xz
 977dc4ef7b5c594d6dd9816f3340d880 10325 text optional foo2zjs_20200505dfsg0-3_amd64.buildinfo

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

iQKnBAEBCgCRFiEEYgH7/9u94Hgi6ruWlvysDTh7WEcFAmYsvFZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDYy
MDFGQkZGREJCREUwNzgyMkVBQkI5Njk2RkNBQzBEMzg3QjU4NDcTHGRlYmlhbkBh
bHRlaG9sei5kZQAKCRCW/KwNOHtYRzikD/sGDbyNOy7ih7OkfuuOCyi356jdyLuY
nWJFGasZkWKWgsWmHvmB8qYKc/V6YHQm0hqrn80kF/3lmknf96fdlHBwZAlBOMe5
oQqWJntaVyxcsK5siRbu/3MmTg+SKJLWVrXIpjkkzi91VTopaO7N5pAp0FLfoF/W
btp840ceJolUFG9mRRteaPVq8Al38gOtawvFeJb83jdMchtRrsEk7iVAGcQ9h2qk
93LZC7OXnYnPAZqvrVEdxLudR67myUB8YmQxpsk7970AecedWJ05DzqF/M7o9SzE
D9Qt5/RiwgvJdWtSFZu/oNKahUrGgCtS6VQf1F32B97k+8lrxSGJ0znHdTRorksH
nhcq59Y9Zc9v+AOJw1XuE0UlFsAjyfLUgPCZ3wcfG9DgguOGQpb8HWhHRXItZTo/
zMEZII43kPYrPv/qteEnSXiygLx8b/LuPGqktqiybQlaKtDZlZ+pwALrtJDbBKoO
5CHOf1arivSZSUv/NAZrNa8tpsbl06ym51DUzacg+WyNe6YKcZb1i8eH7iiU0eI7
/vdFRocPDvuqvCYXkYNeh+rGUntOMnXoBlOOlMXbUEC0Z0xcJk8n4XybidEFSw27
auB6Hl0nyR/bupMnld3BKha7H60ZY1vNnXJWiNE8B7ewBM8xHALPeR6JC/E5U34g
JcXsrefgigO2uA==
=ykzD
-----END PGP SIGNATURE-----

Attachment: pgpBnPOCHmdvy.pgp
Description: PGP signature


--- End Message ---
Reply to: