fixing #1060769

Author: alteholz

debian/printer-driver-foo2zjs-common.install

@@ -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

debian/printer-driver-foo2zjs.dirs

@@ -1 +1 @@
-/lib/firmware/hp/
+/usr/lib/firmware/hp/

debian/printer-driver-foo2zjs.links

@@ -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

debian/printer-driver-foo2zjs.lintian-overrides

@@ -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

debian/printer-driver-foo2zjs.postinst

@@ -3,9 +3,13 @@
 set -e
 
 if [ "$1" = configure ]; then
+    # begin-remove-after: released:trixie
+    # Mitigate empty directory loss in upgrade DEP17 P6.
+    mkdir -p /usr/lib/firmware/hp
+    # end-remove-after
     # 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
 

debian/rules

@@ -39,7 +39,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 	install -D -m 644 usb_printerid $(CURDIR)/debian/printer-driver-foo2zjs/usr/bin/usb_printerid
 	install -D -m 644 usb_printerid.1 $(CURDIR)/debian/printer-driver-foo2zjs-common/usr/share/man/man1/usb_printerid.1
 	# Use a policy-numbered name for the Linux-specific udev rules file
-	install -D -m 644 hplj10xx.rules $(CURDIR)/debian/printer-driver-foo2zjs/lib/udev/rules.d/85-hplj10xx.rules
+	install -D -m 644 hplj10xx.rules $(CURDIR)/debian/printer-driver-foo2zjs/usr/lib/udev/rules.d/85-hplj10xx.rules
 endif
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 	# /etc/devd/hplj10xx.conf is kFreeBSD-specific