From: Didier Raboud <odyx@debian.org>
Date: Tue, 4 Oct 2016 11:43:55 +0200
Subject: Use the same firmware folder for all HP LJ printers

---
 hplj1000      |  6 ------
 hplj10xx.conf | 10 +++++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/hplj1000 b/hplj1000
index bb87a79..2f22631 100755
--- a/hplj1000
+++ b/hplj1000
@@ -90,37 +90,31 @@ case "$0" in
     MODEL=P1005; FWMODEL=$MODEL
     USB1=0x03f0	#Vendor
     USB2=0x3d17	#Model
-    FWDIR=/usr/share/foo2xqx/firmware
     ;;
 *P1006)
     MODEL=P1006; FWMODEL=$MODEL
     USB1=0x03f0	#Vendor
     USB2=0x3e17	#Model
-    FWDIR=/usr/share/foo2xqx/firmware
     ;;
 *P1007)
     MODEL=P1007; FWMODEL=P1005		# Alias
     USB1=0x03f0	#Vendor
     USB2=0x4817	#Model
-    FWDIR=/usr/share/foo2xqx/firmware
     ;;
 *P1008)
     MODEL=P1008; FWMODEL=P1006		# Alias
     USB1=0x03f0	#Vendor
     USB2=0x4917	#Model
-    FWDIR=/usr/share/foo2xqx/firmware
     ;;
 *P1505)
     MODEL=P1505; FWMODEL=$MODEL
     USB1=0x03f0	#Vendor
     USB2=0x3f17	#Model
-    FWDIR=/usr/share/foo2xqx/firmware
     ;;
 *P1505n)
     MODEL=P1505n; FWMODEL=$MODEL
     USB1=0x03f0	#Vendor
     USB2=0x4017	#Model
-    FWDIR=/usr/share/foo2xqx/firmware
     ;;
 *1000)
     MODEL=1000; FWMODEL=$MODEL
diff --git a/hplj10xx.conf b/hplj10xx.conf
index a2083bb..fe32eea 100644
--- a/hplj10xx.conf
+++ b/hplj10xx.conf
@@ -15,35 +15,35 @@
 attach 100 {
     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";
 };
 
 # Firmware download HP LaserJet P1006 printer
 attach 100 {
     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";
 };
 
 # Firmware download HP LaserJet P1007 printer
 attach 100 {
     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";
 };
 
 # Firmware download HP LaserJet P1008 printer
 attach 100 {
     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";
 };
 
 # Firmware download HP LaserJet P1505 printer
 attach 100 {
     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";
 };
 
 # Firmware download HP LaserJet 1000 printer