From b77fb66d568d2beb930147d87e74caed93ed3e85 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 11 Dec 2017 11:59:49 +0100 Subject: [PATCH] 3.17.11 --- .gitignore | 1 + hplip-3.17.10.tar.gz.asc | 7 - hplip-check-cups.patch | 30 +- hplip-deviceIDs-drv.patch | 717 +++++++++++++++++++------------------- hplip-snmp-quirks.patch | 14 +- hplip-udev-rules.patch | 10 +- hplip.spec | 12 +- sources | 2 +- 8 files changed, 398 insertions(+), 395 deletions(-) delete mode 100644 hplip-3.17.10.tar.gz.asc diff --git a/.gitignore b/.gitignore index 95192d3..60ef22e 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ hplip-3.10.6.tar.gz /hplip-3.17.6.tar.gz /hplip-3.17.9.tar.gz /hplip-3.17.10.tar.gz +/hplip-3.17.11.tar.gz diff --git a/hplip-3.17.10.tar.gz.asc b/hplip-3.17.10.tar.gz.asc deleted file mode 100644 index 3793ddd..0000000 --- a/hplip-3.17.10.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlngfKAACgkQc9dwzaWQR7lKcgCfVITI7iQwJocWMsBZAAY5zAjo -mBYAn3RoLAk6hxma7BFBAbnBGgPPZGRM -=Wol9 ------END PGP SIGNATURE----- diff --git a/hplip-check-cups.patch b/hplip-check-cups.patch index d688dbd..053eb50 100644 --- a/hplip-check-cups.patch +++ b/hplip-check-cups.patch @@ -1,14 +1,16 @@ -diff -up hplip-3.17.4/installer/core_install.py.check-cups hplip-3.17.4/installer/core_install.py ---- hplip-3.17.4/installer/core_install.py.check-cups 2017-05-29 16:39:41.172572873 +0200 -+++ hplip-3.17.4/installer/core_install.py 2017-05-29 16:42:12.199386100 +0200 -@@ -338,9 +338,8 @@ class CoreInstall(object): - # Required base packages - 'libjpeg': (True, ['base'], JPEG_STR, self.check_libjpeg, DEPENDENCY_RUN_AND_COMPILE_TIME,'-',None, GENERALDEP), - 'libtool': (True, ['base'], LIBTOOL_STR, self.check_libtool, DEPENDENCY_COMPILE_TIME,'-','libtool --version',COMPILEDEP), -- 'cups' : (True, ['base'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME,'1.1','cups-config --version', EXTERNALDEP), -+ 'cups' : (True, ['base'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME,'1.1','rpm -qa cups', EXTERNALDEP), - 'cups-devel': (True, ['base'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME,'-','cups-config --version', GENERALDEP), -- 'cups-image': (True, ['base'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME,'-','cups-config --version', GENERALDEP), - 'gcc' : (True, ['base'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-','gcc --version',COMPILEDEP), - 'make' : (True, ['base'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME,'3.0','make --version',COMPILEDEP), - 'libpthread' : (True, ['base'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','FUNC#get_libpthread_version', GENERALDEP), +diff -up hplip-3.17.11/installer/core_install.py.check-cups hplip-3.17.11/installer/core_install.py +--- hplip-3.17.11/installer/core_install.py.check-cups 2017-12-07 15:34:24.855761874 +0100 ++++ hplip-3.17.11/installer/core_install.py 2017-12-07 15:38:44.749568860 +0100 +@@ -349,9 +349,9 @@ class CoreInstall(object): + 'automake': (True, ['prnt'], AUTOMAKE_STR, self.check_automake, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', None, GENERALDEP), + 'libjpeg': (True, ['base', 'prnt'], JPEG_STR, self.check_libjpeg, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', None, GENERALDEP), + 'libtool': (True, ['base', 'prnt'], LIBTOOL_STR, self.check_libtool, DEPENDENCY_COMPILE_TIME, '-', 'libtool --version', COMPILEDEP), +- 'cups': (True, ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '1.1', 'cups-config --version', EXTERNALDEP), +- 'cups-devel': (True, ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP), +- 'cups-image': (True, ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP), ++ 'cups': (True, ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '1.1', 'lpstat -r', EXTERNALDEP), ++ 'cups-devel': (True, ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'lpstat -r', GENERALDEP), ++ 'cups-image': (True, ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'lpstat -r', GENERALDEP), + 'gcc': (True, ['base', 'prnt'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-', 'gcc --version', COMPILEDEP), + 'make': (True, ['base', 'prnt'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME, '3.0', 'make --version', COMPILEDEP), + 'libpthread': (True, ['base', 'prnt'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#get_libpthread_version', GENERALDEP), diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index dc975b5..363c59d 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,767 +1,768 @@ -diff -up hplip-3.15.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.15.2/prnt/drv/hpcups.drv.in ---- hplip-3.15.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2015-01-29 13:21:00.000000000 +0100 -+++ hplip-3.15.2/prnt/drv/hpcups.drv.in 2015-02-04 14:20:39.756550038 +0100 -@@ -465,7 +465,7 @@ Manufacturer "HP" - ModelName "HP Photosmart p1000" - Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version" - Attribute "ShortNickName" "" "HP Photosmart p1000" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;" - PCFileName "hp-photosmart_p1000.ppd" - Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" - Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -474,7 +474,7 @@ Manufacturer "HP" - ModelName "HP Photosmart p1100" - Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version" - Attribute "ShortNickName" "" "HP Photosmart p1100" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;" - PCFileName "hp-photosmart_p1100.ppd" - Attribute "Product" "" "(HP Photosmart p1100 Printer)" - Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -516,7 +516,7 @@ Manufacturer "HP" +diff -up hplip-3.17.11/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.17.11/prnt/drv/hpcups.drv.in +--- hplip-3.17.11/prnt/drv/hpcups.drv.in.deviceIDs-drv 2017-12-07 09:31:48.721626277 +0100 ++++ hplip-3.17.11/prnt/drv/hpcups.drv.in 2017-12-07 13:40:30.703164179 +0100 +@@ -487,7 +487,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 3820" + Attribute "ShortNickName" "" "HP Deskjet 3820 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3820;DES:deskjet 3820;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;" PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -542,7 +542,7 @@ Manufacturer "HP" - ModelName "HP Officejet v40xi" - Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet v40xi" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" - PCFileName "hp-officejet_v40xi.ppd" - Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" - } -@@ -550,7 +550,7 @@ Manufacturer "HP" - ModelName "HP Officejet v40" - Attribute "NickName" "" "HP Officejet v40, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet v40" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" - PCFileName "hp-officejet_v40.ppd" - Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -579,7 +579,7 @@ Manufacturer "HP" - ModelName "HP Officejet 5105" - Attribute "NickName" "" "HP Officejet 5105, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 5105" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;" - PCFileName "hp-officejet_5105.ppd" - Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" - } -@@ -587,7 +587,7 @@ Manufacturer "HP" - ModelName "HP Officejet 5110v" - Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 5110v" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;" - PCFileName "hp-officejet_5110v.ppd" - Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" - } -@@ -604,7 +604,7 @@ Manufacturer "HP" - ModelName "HP Officejet g55" - Attribute "NickName" "" "HP Officejet g55, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet g55" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" - PCFileName "hp-officejet_g55.ppd" - Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" - } -@@ -644,7 +644,7 @@ Manufacturer "HP" - ModelName "HP PSC 750xi" - Attribute "NickName" "" "HP PSC 750xi, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 750xi" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" - PCFileName "hp-psc_750xi.ppd" - Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" - } -@@ -652,7 +652,7 @@ Manufacturer "HP" - ModelName "HP PSC 750" - Attribute "NickName" "" "HP PSC 750, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 750" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" - PCFileName "hp-psc_750.ppd" - Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" - } -@@ -700,7 +700,7 @@ Manufacturer "HP" - ModelName "HP Officejet g85" - Attribute "NickName" "" "HP Officejet g85, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet g85" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" - PCFileName "hp-officejet_g85.ppd" - Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" - } -@@ -716,7 +716,7 @@ Manufacturer "HP" - ModelName "HP PSC 900 Series" - Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 900 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" - PCFileName "hp-psc_900_series.ppd" - Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" - } -@@ -732,7 +732,7 @@ Manufacturer "HP" +@@ -521,7 +521,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 920c" + Attribute "ShortNickName" "" "HP Deskjet 920c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 920c;DES:deskjet 920c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;" PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -751,7 +751,7 @@ Manufacturer "HP" +@@ -532,7 +532,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 930c" + Attribute "ShortNickName" "" "HP Deskjet 930c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 930c;DES:deskjet 930c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;" PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -792,7 +792,7 @@ Manufacturer "HP" +@@ -573,7 +573,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 940c" + Attribute "ShortNickName" "" "HP Deskjet 940c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 940c;DES:deskjet 940c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;" PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -811,7 +811,7 @@ Manufacturer "HP" - ModelName "HP Officejet g95" - Attribute "NickName" "" "HP Officejet g95, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet g95" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" - PCFileName "hp-officejet_g95.ppd" - Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" - } -@@ -843,7 +843,7 @@ Manufacturer "HP" +@@ -592,7 +592,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 950c" + Attribute "ShortNickName" "" "HP Deskjet 950c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -876,7 +876,7 @@ Manufacturer "HP" +@@ -625,7 +625,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" Attribute "NickName" "" "HP Deskjet 959c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 959c" + Attribute "ShortNickName" "" "HP Deskjet 959c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 959c;DES:deskjet 959c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" PCFileName "hp-deskjet_959c.ppd" Attribute "Product" "" "(HP Deskjet 959c Printer)" } -@@ -884,7 +884,7 @@ Manufacturer "HP" +@@ -633,7 +633,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 970c" + Attribute "ShortNickName" "" "HP Deskjet 970c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 970c;DES:deskjet 970c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;" PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -938,7 +938,7 @@ Manufacturer "HP" +@@ -665,7 +665,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5105" + Attribute "NickName" "" "HP Officejet 5105, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 5105 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;" + PCFileName "hp-officejet_5105.ppd" + Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" + } +@@ -682,7 +682,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5110v" + Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 5110v hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;" + PCFileName "hp-officejet_5110v.ppd" + Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" + } +@@ -690,7 +690,7 @@ Manufacturer "HP" + ModelName "HP Officejet g55" + Attribute "NickName" "" "HP Officejet g55, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g55 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g55.ppd" + Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" + } +@@ -706,7 +706,7 @@ Manufacturer "HP" + ModelName "HP Officejet g85" + Attribute "NickName" "" "HP Officejet g85, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g85 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g85.ppd" + Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" + } +@@ -722,7 +722,7 @@ Manufacturer "HP" + ModelName "HP Officejet g95" + Attribute "NickName" "" "HP Officejet g95, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g95 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g95.ppd" + Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" + } +@@ -770,7 +770,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40" + Attribute "NickName" "" "HP Officejet v40, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet v40 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40.ppd" + Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" +@@ -779,7 +779,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40xi" + Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet v40xi hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40xi.ppd" + Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" + } +@@ -795,7 +795,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1000" + Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version" + Attribute "ShortNickName" "" "HP Photosmart p1000 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;" + PCFileName "hp-photosmart_p1000.ppd" + Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" + Attribute "Product" "" "(HP Photosmart p1000xi Printer)" +@@ -804,7 +804,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1100" + Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version" + Attribute "ShortNickName" "" "HP Photosmart p1100 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;" + PCFileName "hp-photosmart_p1100.ppd" + Attribute "Product" "" "(HP Photosmart p1100 Printer)" + Attribute "Product" "" "(HP Photosmart p1100xi Printer)" +@@ -821,7 +821,7 @@ Manufacturer "HP" + ModelName "HP PSC 750" + Attribute "NickName" "" "HP PSC 750, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 750 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750.ppd" + Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" + } +@@ -829,7 +829,7 @@ Manufacturer "HP" + ModelName "HP PSC 750xi" + Attribute "NickName" "" "HP PSC 750xi, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 750xi hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750xi.ppd" + Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" + } +@@ -861,7 +861,7 @@ Manufacturer "HP" + ModelName "HP PSC 900 Series" + Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 900 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" + PCFileName "hp-psc_900_series.ppd" + Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" + } +@@ -935,7 +935,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 1220c" + Attribute "ShortNickName" "" "HP Deskjet 1220c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1220c;DES:deskjet 1220c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;" PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1134,7 +1134,7 @@ Manufacturer "HP" +@@ -1125,7 +1125,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, hpcups $Version" - Attribute "ShortNickName" "" "HP 2000c" + Attribute "ShortNickName" "" "HP 2000c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp 2000c;DES:hp 2000c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP 2000C;DES:hp 2000c;" PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1609,7 +1609,7 @@ Manufacturer "HP" +@@ -1589,7 +1589,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 960c" + Attribute "ShortNickName" "" "HP Deskjet 960c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 960c;DES:deskjet 960c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;" PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1619,7 +1619,7 @@ Manufacturer "HP" +@@ -1599,7 +1599,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 980c" + Attribute "ShortNickName" "" "HP Deskjet 980c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 980c;DES:deskjet 980c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;" PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1628,7 +1628,7 @@ Manufacturer "HP" +@@ -1608,7 +1608,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 990c" + Attribute "ShortNickName" "" "HP Deskjet 990c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 990c;DES:deskjet 990c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;" PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1658,7 +1658,7 @@ Manufacturer "HP" +@@ -1638,7 +1638,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, hpcups $Version" - Attribute "ShortNickName" "" "HP Color Inkjet cp1700" + Attribute "ShortNickName" "" "HP Color Inkjet cp1700 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1666,7 +1666,7 @@ Manufacturer "HP" +@@ -1646,7 +1646,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 7100 Series" + Attribute "ShortNickName" "" "HP Officejet 7100 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7100 series;DES:officejet 7100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7100 series;DES:officejet 7100 series;" PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1681,7 +1681,7 @@ Manufacturer "HP" +@@ -1661,7 +1661,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet D Series" + Attribute "ShortNickName" "" "HP Officejet D Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet d series;DES:officejet d series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet d series;DES:officejet d series;" PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1728,7 +1728,7 @@ Manufacturer "HP" +@@ -1708,7 +1708,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2100 Series" + Attribute "ShortNickName" "" "HP PSC 2100 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2100 series;DES:psc 2100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2100 Series;DES:psc 2100 series;" PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1741,7 +1741,7 @@ Manufacturer "HP" +@@ -1721,7 +1721,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2150 Series" + Attribute "ShortNickName" "" "HP PSC 2150 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2150 series;DES:psc 2150 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2150 Series;DES:psc 2150 series;" PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1749,7 +1749,7 @@ Manufacturer "HP" +@@ -1729,7 +1729,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2170 Series" + Attribute "ShortNickName" "" "HP PSC 2170 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2170 series;DES:psc 2170 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2170 Series;DES:psc 2170 series;" PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1977,7 +1977,7 @@ Manufacturer "HP" +@@ -1951,7 +1951,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version" - Attribute "ShortNickName" "" "HP Business Inkjet 2200" + Attribute "ShortNickName" "" "HP Business Inkjet 2200 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2200;DES:hp business inkjet 2200;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;" PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1987,7 +1987,7 @@ Manufacturer "HP" +@@ -1961,7 +1961,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, hpcups $Version" - Attribute "ShortNickName" "" "HP Business Inkjet 2230" + Attribute "ShortNickName" "" "HP Business Inkjet 2230 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2230;DES:hp business inkjet 2230;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;" PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1995,7 +1995,7 @@ Manufacturer "HP" +@@ -1969,7 +1969,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Business Inkjet 2250" + Attribute "ShortNickName" "" "HP Business Inkjet 2250 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2250;DES:hp business inkjet 2250;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;" PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -2004,7 +2004,7 @@ Manufacturer "HP" +@@ -1978,7 +1978,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Business Inkjet 2280" + Attribute "ShortNickName" "" "HP Business Inkjet 2280 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2280;DES:hp business inkjet 2280;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;" PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2522,7 +2522,7 @@ Manufacturer "HP" - ModelName "HP PSC 2200 Series" - Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2200 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;" - PCFileName "hp-psc_2200_series.ppd" - Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" - } -@@ -2540,7 +2540,7 @@ Manufacturer "HP" - ModelName "HP PSC 2300 Series" - Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2300 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;" - PCFileName "hp-psc_2300_series.ppd" - Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" - Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2549,7 +2549,7 @@ Manufacturer "HP" - ModelName "HP PSC 2350 Series" - Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2350 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;" - PCFileName "hp-psc_2350_series.ppd" - Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" - Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2592,7 +2592,7 @@ Manufacturer "HP" - ModelName "HP PSC 2500 Series" - Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2500 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;" - PCFileName "hp-psc_2500_series.ppd" - Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" - Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3040,7 +3040,7 @@ Manufacturer "HP" - ModelName "HP Officejet j5700 Series" - Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet j5700 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;" - PCFileName "hp-officejet_j5700_series.ppd" - Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3126,7 +3126,7 @@ Manufacturer "HP" - ModelName "HP Officejet 6100 Series" - Attribute "NickName" "" "HP Officejet 6100 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 6100 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100 series;DES:officejet 6100 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;" - PCFileName "hp-officejet_6100_series.ppd" - Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3350,7 +3350,7 @@ Manufacturer "HP" +@@ -2740,7 +2740,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 7200 Series" + Attribute "ShortNickName" "" "HP Officejet 7200 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7200 series;DES:officejet 7200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7200 series;DES:officejet 7200 series;" PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3452,7 +3452,7 @@ Manufacturer "HP" +@@ -2764,7 +2764,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 7400 Series" + Attribute "ShortNickName" "" "HP Officejet 7400 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7400 series;DES:officejet 7400 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7400 series;DES:officejet 7400 series;" PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -11486,7 +11486,7 @@ Manufacturer "HP" - ModelName "HP PSC 1100 Series" - Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 1100 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;" - PCFileName "hp-psc_1100_series.ppd" - Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" - Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -11496,7 +11496,7 @@ Manufacturer "HP" - ModelName "HP PSC 1200 Series" - Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 1200 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;" - PCFileName "hp-psc_1200_series.ppd" - Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" - Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -11688,7 +11688,7 @@ Manufacturer "HP" +@@ -2810,7 +2810,7 @@ Manufacturer "HP" + ModelName "HP Officejet j5700 Series" + Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet j5700 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;" + PCFileName "hp-officejet_j5700_series.ppd" + Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet j5785 All-in-one Printer)" +@@ -3488,7 +3488,7 @@ Manufacturer "HP" + ModelName "HP PSC 2200 Series" + Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2200 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;" + PCFileName "hp-psc_2200_series.ppd" + Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" + } +@@ -3506,7 +3506,7 @@ Manufacturer "HP" + ModelName "HP PSC 2300 Series" + Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2300 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;" + PCFileName "hp-psc_2300_series.ppd" + Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" +@@ -3514,8 +3514,7 @@ Manufacturer "HP" + { + ModelName "HP PSC 2350 Series" + Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version" +- Attribute "ShortNickName" "" "HP PSC 2350 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;" + PCFileName "hp-psc_2350_series.ppd" + Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2358 All-in-one Printer)" +@@ -3545,7 +3544,7 @@ Manufacturer "HP" + ModelName "HP PSC 2500 Series" + Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2500 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;" + PCFileName "hp-psc_2500_series.ppd" + Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" +@@ -7134,7 +7133,7 @@ Manufacturer "HP" + ModelName "HP Officejet 6100" + Attribute "NickName" "" "HP Officejet 6100, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 6100 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100;DES:officejet 6100;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;" + PCFileName "hp-officejet_6100.ppd" + Attribute "Product" "" "(HP Officejet 6100 Eprinter h611a)" + } +@@ -16828,7 +16827,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 4100 Series" + Attribute "ShortNickName" "" "HP Officejet 4100 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4100 series;DES:officejet 4100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-packard;MDL:officejet 4100 series;DES:officejet 4100 series;" PCFileName "hp-officejet_4100_series.ppd" Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" -@@ -11715,7 +11715,7 @@ Manufacturer "HP" +@@ -16855,7 +16854,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 4300 Series" + Attribute "ShortNickName" "" "HP Officejet 4300 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4300 series;DES:officejet 4300 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet 4300 series;DES:officejet 4300 series;" PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -12026,7 +12026,7 @@ Manufacturer "HP" - ModelName "HP Officejet j3600 Series" - Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet j3600 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;" - PCFileName "hp-officejet_j3600_series.ppd" - Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -12086,7 +12086,7 @@ Manufacturer "HP" + Attribute "Product" "" "(HP Officejet 4338 All-in-one Printer)" +@@ -16887,7 +16886,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 + ModelName "HP PSC 1100 Series" + Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 1100 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;" + PCFileName "hp-psc_1100_series.ppd" + Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" +@@ -16897,7 +16896,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 + ModelName "HP PSC 1200 Series" + Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 1200 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;" + PCFileName "hp-psc_1200_series.ppd" + Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1217 All-in-one Printer)" +@@ -17200,7 +17199,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 4200 Series" + Attribute "ShortNickName" "" "HP Officejet 4200 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4200 series;DES:officejet 4200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 4200 series;DES:officejet 4200 series;" PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -12609,6 +12609,7 @@ Manufacturer "HP" +@@ -17265,7 +17264,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 + ModelName "HP Officejet j3600 Series" + Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet j3600 Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;" + PCFileName "hp-officejet_j3600_series.ppd" + Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" +@@ -17768,6 +17767,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Photosmart 380 Series" + Attribute "ShortNickName" "" "HP Photosmart 380 Series hpijs" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" + Attribute "1284DeviceID" "" "MFG:HP;MDL:Photosmart 380 series_BT;DES:385;" PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -14554,7 +14557,7 @@ Group "RLT/HP Real Life Technologies" +@@ -19573,7 +19573,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Business Inkjet 2300" + Attribute "ShortNickName" "" "HP Business Inkjet 2300 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2300;DES:Hewlett-Packard Business Inkjet 2300;" PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -14818,7 +14821,7 @@ Group "RLT/HP Real Life Technologies" +@@ -19973,7 +19973,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 9100 Series" + Attribute "ShortNickName" "" "HP Officejet 9100 Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 9100 series;DES:officejet 9100 series;" PCFileName "hp-officejet_9100_series-pcl3.ppd" Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" -@@ -14902,7 +14905,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20057,7 +20057,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Business Inkjet 2800" + Attribute "ShortNickName" "" "HP Business Inkjet 2800 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2800;DES:hp business inkjet 2800;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2800;DES:Hewlett-Packard Business Inkjet 2800;" PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -15445,7 +15448,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20600,7 +20600,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Lx" + Attribute "ShortNickName" "" "HP Officejet Lx hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet lx;DES:officejet lx;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet;DES:officejet lx;" PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -15574,7 +15577,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet Series 300" - Attribute "NickName" "" "HP Officejet Series 300, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Series 300" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;" - PCFileName "hp-officejet_series_300.ppd" - Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" - } -@@ -15598,7 +15601,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Deskjet 400" - Attribute "NickName" "" "HP Deskjet 400, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 400" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;" - PCFileName "hp-deskjet_400.ppd" - Attribute "Product" "" "(HP Deskjet 400 Printer)" - Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -15615,7 +15618,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20737,7 +20737,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 540" + Attribute "ShortNickName" "" "HP Deskjet 540 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 540;DES:deskjet 540;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 540;DES:Hewlett-Packard DeskJet 540;" PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -15740,7 +15743,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20745,7 +20745,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 400" + Attribute "NickName" "" "HP Deskjet 400, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 400 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;" + PCFileName "hp-deskjet_400.ppd" + Attribute "Product" "" "(HP Deskjet 400 Printer)" + Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" +@@ -20762,7 +20762,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 300" + Attribute "NickName" "" "HP Officejet Series 300, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Series 300 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;" + PCFileName "hp-officejet_series_300.ppd" + Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" + } +@@ -20895,7 +20895,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 630c" + Attribute "ShortNickName" "" "HP Deskjet 630c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 630c;DES:deskjet 630c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 630C;DES:Hewlett-Packard DeskJet 630C;" PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -15756,7 +15759,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20911,7 +20911,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 656c" + Attribute "ShortNickName" "" "HP Deskjet 656c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 656c;DES:deskjet 656c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 656C;DES:DESKJET 656C;" PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -15869,7 +15872,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21024,7 +21024,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 600" + Attribute "ShortNickName" "" "HP Deskjet 600 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 600;DES:deskjet 600;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;" PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -15931,7 +15934,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21065,7 +21065,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 670c" + Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 670c hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;" + PCFileName "hp-deskjet_670c.ppd" + Attribute "Product" "" "(HP Deskjet 670c Printer)" + } +@@ -21137,7 +21137,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Series 600" + Attribute "ShortNickName" "" "HP Officejet Series 600 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 600;DES:officejet series 600;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 600;DES:officejet series 600;" PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -15983,7 +15986,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Deskjet 670c" - Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 670c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;" - PCFileName "hp-deskjet_670c.ppd" - Attribute "Product" "" "(HP Deskjet 670c)" - } -@@ -16127,7 +16130,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21282,7 +21282,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 610c" + Attribute "ShortNickName" "" "HP Deskjet 610c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 610c;DES:deskjet 610c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;" PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -16151,7 +16154,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21306,7 +21306,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 640c" + Attribute "ShortNickName" "" "HP Deskjet 640c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 640c;DES:deskjet 640c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;" PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -16171,7 +16174,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21335,7 +21335,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 690c" + Attribute "ShortNickName" "" "HP Deskjet 690c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 690c;DES:deskjet 690c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;" PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -16231,7 +16234,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21386,7 +21386,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Series 700" + Attribute "ShortNickName" "" "HP Officejet Series 700 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 700;DES:officejet series 700;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 700;DES:officejet series 700;" PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -16382,7 +16385,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21537,7 +21537,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 812c" + Attribute "ShortNickName" "" "HP Deskjet 812c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 812c;DES:deskjet 812c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;" PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -16390,7 +16393,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21545,7 +21545,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 815c" + Attribute "ShortNickName" "" "HP Deskjet 815c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 815c;DES:deskjet 815c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;" PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -16422,7 +16425,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21577,7 +21577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 840c" + Attribute "ShortNickName" "" "HP Deskjet 840c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 840c;DES:deskjet 840c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 840C;DES:deskjet 840c;" PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -16430,7 +16433,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21585,7 +21585,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 841c" + Attribute "ShortNickName" "" "HP Deskjet 841c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 841c;DES:deskjet 841c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 841C;DES:deskjet 841c;" PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -16446,7 +16449,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21601,7 +21601,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 843c" + Attribute "ShortNickName" "" "HP Deskjet 843c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 843c;DES:deskjet 843c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 843C;DES:deskjet 843c;" PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -16455,7 +16458,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21610,7 +21610,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 880c" + Attribute "ShortNickName" "" "HP Deskjet 880c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 880c;DES:deskjet 880c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;" PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -16471,7 +16474,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21626,7 +21626,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 895c" + Attribute "ShortNickName" "" "HP Deskjet 895c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 895c;DES:deskjet 895c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;" PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -16481,7 +16484,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21636,7 +21636,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet r40" + Attribute "ShortNickName" "" "HP Officejet r40 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r40;DES:officejet r40;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;" PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -16505,7 +16508,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21660,7 +21660,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet r60" + Attribute "ShortNickName" "" "HP Officejet r60 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r60;DES:officejet r60;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;" PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -16513,7 +16516,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21668,7 +21668,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet r65" + Attribute "ShortNickName" "" "HP Officejet r65 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r65;DES:officejet r65;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;" PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -16521,7 +16524,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21676,7 +21676,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet r80" + Attribute "ShortNickName" "" "HP Officejet r80 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r80;DES:officejet r80;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;" PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -16537,7 +16540,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21692,7 +21692,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" Attribute "NickName" "" "HP Officejet T Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet T Series" + Attribute "ShortNickName" "" "HP Officejet T Series hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet t series;DES:officejet t series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;" PCFileName "hp-officejet_t_series.ppd" - Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -16548,7 +16551,7 @@ Group "RLT/HP Real Life Technologies" + Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" +@@ -21703,7 +21703,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 500" + Attribute "ShortNickName" "" "HP PSC 500 hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 500;DES:psc 500;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;" PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -16664,7 +16667,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21819,7 +21819,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 825c" + Attribute "ShortNickName" "" "HP Deskjet 825c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 825c;DES:deskjet 825c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;" PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -16673,7 +16676,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21828,7 +21828,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 845c" + Attribute "ShortNickName" "" "HP Deskjet 845c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 845c;DES:deskjet 845c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;" PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -16784,7 +16787,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet Pro 1150c" - Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Pro 1150c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;" - PCFileName "hp-officejet_pro_1150c.ppd" - Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" - Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" -@@ -16793,7 +16796,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21939,7 +21939,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 850c" + Attribute "ShortNickName" "" "HP Deskjet 850c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 850c;DES:deskjet 850c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;" PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -16812,7 +16815,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21958,7 +21958,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 870c" + Attribute "ShortNickName" "" "HP Deskjet 870c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 870c;DES:deskjet 870c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;" PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -16928,7 +16931,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet Pro 1170c Series" - Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;" - PCFileName "hp-officejet_pro_1170c_series.ppd" - Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" - Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" -@@ -16941,7 +16944,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21969,7 +21969,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1150c" + Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 1150c hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;" + PCFileName "hp-officejet_pro_1150c.ppd" + Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" +@@ -22083,7 +22083,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 890c" + Attribute "ShortNickName" "" "HP Deskjet 890c hpijs" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 890c;DES:deskjet 890c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;" PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" +@@ -22092,7 +22092,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1170c Series" + Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;" + PCFileName "hp-officejet_pro_1170c_series.ppd" + Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" diff --git a/hplip-snmp-quirks.patch b/hplip-snmp-quirks.patch index 517ed2f..e31b698 100644 --- a/hplip-snmp-quirks.patch +++ b/hplip-snmp-quirks.patch @@ -1,18 +1,18 @@ -diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.13.4/prnt/drv/hpcups.drv.in ---- hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks 2013-04-09 12:11:58.447587815 +0200 -+++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-09 12:11:58.594585761 +0200 -@@ -6757,6 +6757,8 @@ Manufacturer "HP" +diff -up hplip-3.17.11/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.17.11/prnt/drv/hpcups.drv.in +--- hplip-3.17.11/prnt/drv/hpcups.drv.in.snmp-quirks 2017-12-07 15:21:34.149138400 +0100 ++++ hplip-3.17.11/prnt/drv/hpcups.drv.in 2017-12-07 15:33:32.443211804 +0100 +@@ -10831,6 +10831,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a" + Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a hpijs" Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;" + // This device lies about its supplies capacity. + Attribute "cupsSNMPQuirks" "" "capacity" PCFileName "hp-officejet_pro_8500_a909a.ppd" Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)" } -@@ -6773,6 +6775,8 @@ Manufacturer "HP" +@@ -10839,6 +10841,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g" + Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g hpijs" Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;" + // This device lies about its supplies capacity. + Attribute "cupsSNMPQuirks" "" "capacity" diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index d833bb6..4836054 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,10 +1,10 @@ -diff -up hplip-3.15.11/Makefile.am.udev-rules hplip-3.15.11/Makefile.am ---- hplip-3.15.11/Makefile.am.udev-rules 2015-11-12 11:29:04.000000000 +0100 -+++ hplip-3.15.11/Makefile.am 2015-12-10 12:43:11.518518146 +0100 -@@ -118,7 +118,7 @@ rulessystemdir=/usr/lib/systemd/system - dist_rulessystem_DATA =data/rules/hplip-printer@.service +diff -up hplip-3.17.11/Makefile.am.udev-rules hplip-3.17.11/Makefile.am +--- hplip-3.17.11/Makefile.am.udev-rules 2017-12-07 13:44:04.472414453 +0100 ++++ hplip-3.17.11/Makefile.am 2017-12-07 15:20:18.544755557 +0100 +@@ -132,7 +132,7 @@ dist_rulessystem_DATA =data/rules/hplip- # hpmud.rules + if !HPLIP_CLASS_DRIVER -rulesdir = /etc/udev/rules.d +rulesdir = /usr/lib/udev/rules.d if UDEV_SYSFS_RULES diff --git a/hplip.spec b/hplip.spec index cdc9d0e..875101b 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,8 +6,8 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.17.10 -Release: 3%{?dist} +Version: 3.17.11 +Release: 1%{?dist} License: GPLv2+ and MIT and BSD Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -242,6 +242,8 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \ prnt/filters/hpps \ fax/filters/pstotiff +rm hpps hpcups dat2drv + %build # Work-around Makefile.am imperfections. sed -i 's|^AM_INIT_AUTOMAKE|AM_INIT_AUTOMAKE([foreign])|g' configure.in @@ -284,7 +286,8 @@ rm -rf %{buildroot}%{_sysconfdir}/sane.d \ %{buildroot}%{_docdir} \ %{buildroot}%{_datadir}/hal/fdi \ %{buildroot}%{_datadir}/hplip/pkservice.py \ - %{buildroot}%{_bindir}/hp-pkservice + %{buildroot}%{_bindir}/hp-pkservice \ + %{buildroot}%{_datadir}/hplip/locatedriver* rm -f %{buildroot}%{_bindir}/hp-logcapture \ %{buildroot}%{_bindir}/hp-doctor \ @@ -513,6 +516,9 @@ update-desktop-database &> /dev/null ||: %postun libs -p /sbin/ldconfig %changelog +* Thu Dec 07 2017 Zdenek Dohnal - 3.17.11-1 +- 3.17.11 + * Mon Nov 06 2017 Zdenek Dohnal - 3.17.10-3 - 1509394 - Add support for HP ColorLaserjet MFP M278-M281 diff --git a/sources b/sources index 31211e3..ef287de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hplip-3.17.10.tar.gz) = 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8 +SHA512 (hplip-3.17.11.tar.gz) = 29899d58959d49a0b5e730520ef598f245570b084db33d322859b4773a934167387893888a5829c5cfd5a2e4b66848b173fc7c60973fccdb6d3f854105ad7665