From b11a4fdffa1a2f7a09eec723b1544ffbc87baf62 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 15 Jul 2019 14:12:31 +0200 Subject: [PATCH] 3.19.6 --- .gitignore | 1 + hplip-deviceIDs-drv.patch | 194 +++++++++++++++++--------------------- hplip-snmp-quirks.patch | 14 +-- hplip-stopiteration.patch | 12 --- hplip-ui-optional.patch | 24 ++--- hplip-wifisetup.patch | 17 +--- hplip.spec | 19 +--- sources | 2 +- 8 files changed, 119 insertions(+), 164 deletions(-) delete mode 100644 hplip-stopiteration.patch diff --git a/.gitignore b/.gitignore index ec26bd8..b991564 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ hplip-3.10.6.tar.gz /hplip-3.18.5.tar.gz /hplip-3.18.6.tar.gz /hplip-3.18.12.tar.gz +/hplip-3.19.6.tar.gz diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 4fee7e9..258b414 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,6 +1,6 @@ -diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/drv/hpcups.drv.in ---- hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv 2018-12-03 08:13:47.000000000 +0100 -+++ hplip-3.18.12/prnt/drv/hpcups.drv.in 2019-01-08 12:29:21.803213255 +0100 +diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv/hpcups.drv.in +--- hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv 2019-06-26 15:09:17.000000000 +0200 ++++ hplip-3.19.6/prnt/drv/hpcups.drv.in 2019-07-12 08:34:02.789910485 +0200 @@ -487,7 +487,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version" @@ -65,24 +65,6 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" @@ -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" @@ -91,7 +73,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -706,7 +706,7 @@ Manufacturer "HP" +@@ -681,7 +681,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet g85 hpijs" @@ -100,7 +82,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -722,7 +722,7 @@ Manufacturer "HP" +@@ -697,7 +697,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet g95 hpijs" @@ -109,7 +91,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -770,7 +770,7 @@ Manufacturer "HP" +@@ -745,7 +745,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet v40 hpijs" @@ -118,7 +100,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d 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" +@@ -754,7 +754,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet v40xi hpijs" @@ -127,7 +109,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -795,7 +795,7 @@ Manufacturer "HP" +@@ -770,7 +770,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1000 hpijs" @@ -136,7 +118,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -804,7 +804,7 @@ Manufacturer "HP" +@@ -779,7 +779,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1100 hpijs" @@ -145,7 +127,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -821,7 +821,7 @@ Manufacturer "HP" +@@ -796,7 +796,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 750 hpijs" @@ -154,7 +136,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -829,7 +829,7 @@ Manufacturer "HP" +@@ -804,7 +804,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 750xi hpijs" @@ -163,7 +145,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -861,7 +861,7 @@ Manufacturer "HP" +@@ -836,7 +836,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 900 Series hpijs" @@ -172,7 +154,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -935,7 +935,7 @@ Manufacturer "HP" +@@ -910,7 +910,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c hpijs" @@ -181,7 +163,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1125,7 +1125,7 @@ Manufacturer "HP" +@@ -1100,7 +1100,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, hpcups $Version" Attribute "ShortNickName" "" "HP 2000c hpijs" @@ -190,7 +172,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1589,7 +1589,7 @@ Manufacturer "HP" +@@ -1564,7 +1564,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 960c hpijs" @@ -199,7 +181,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1599,7 +1599,7 @@ Manufacturer "HP" +@@ -1574,7 +1574,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 980c hpijs" @@ -208,7 +190,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1608,7 +1608,7 @@ Manufacturer "HP" +@@ -1583,7 +1583,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 990c hpijs" @@ -217,16 +199,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -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 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)" - } -@@ -1646,7 +1646,7 @@ Manufacturer "HP" +@@ -1613,7 +1613,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series hpijs" @@ -235,7 +208,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1661,7 +1661,7 @@ Manufacturer "HP" +@@ -1628,7 +1628,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet D Series hpijs" @@ -244,7 +217,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1708,7 +1708,7 @@ Manufacturer "HP" +@@ -1675,7 +1675,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series hpijs" @@ -253,7 +226,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1721,7 +1721,7 @@ Manufacturer "HP" +@@ -1688,7 +1688,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series hpijs" @@ -262,7 +235,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1729,7 +1729,7 @@ Manufacturer "HP" +@@ -1696,7 +1696,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series hpijs" @@ -271,7 +244,16 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1951,7 +1951,7 @@ Manufacturer "HP" +@@ -1743,7 +1743,7 @@ Manufacturer "HP" + ModelName "HP Color Inkjet Printer cp1700" + Attribute "NickName" "" "HP Color Inkjet Printer cp1700, hpcups $Version" + Attribute "ShortNickName" "" "HP CJ IJ Printer cp1700 hpijs" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet printer cp1700;DES:hp color inkjet printer cp1700;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" + PCFileName "hp-color_inkjet_printer_cp1700.ppd" + Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" + Attribute "Product" "" "(HP Color Inkjet cp1700ps Printer)" +@@ -1918,7 +1918,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200 hpijs" @@ -280,7 +262,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1961,7 +1961,7 @@ Manufacturer "HP" +@@ -1928,7 +1928,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230 hpijs" @@ -289,7 +271,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1969,7 +1969,7 @@ Manufacturer "HP" +@@ -1936,7 +1936,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250 hpijs" @@ -298,7 +280,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1978,7 +1978,7 @@ Manufacturer "HP" +@@ -1945,7 +1945,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280 hpijs" @@ -307,7 +289,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2740,7 +2740,7 @@ Manufacturer "HP" +@@ -2689,7 +2689,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series hpijs" @@ -316,7 +298,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -2764,7 +2764,7 @@ Manufacturer "HP" +@@ -2713,7 +2713,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series hpijs" @@ -325,7 +307,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -2810,7 +2810,7 @@ Manufacturer "HP" +@@ -2757,7 +2757,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series hpijs" @@ -334,7 +316,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5785 All-in-one Printer)" -@@ -3461,7 +3461,7 @@ Manufacturer "HP" +@@ -3391,7 +3391,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series hpijs" @@ -343,7 +325,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -3479,7 +3479,7 @@ Manufacturer "HP" +@@ -3409,7 +3409,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series hpijs" @@ -352,7 +334,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d 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)" -@@ -3487,8 +3487,7 @@ Manufacturer "HP" +@@ -3417,8 +3417,7 @@ Manufacturer "HP" { ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version" @@ -362,7 +344,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2358 All-in-one Printer)" -@@ -3518,7 +3517,7 @@ Manufacturer "HP" +@@ -3448,7 +3447,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series hpijs" @@ -371,7 +353,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d 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)" -@@ -7107,7 +7106,7 @@ Manufacturer "HP" +@@ -7023,7 +7022,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100" Attribute "NickName" "" "HP Officejet 6100, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 6100 hpijs" @@ -380,7 +362,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_6100.ppd" Attribute "Product" "" "(HP Officejet 6100 Eprinter h611a)" } -@@ -17104,7 +17103,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 +@@ -16708,7 +16707,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series hpijs" @@ -389,7 +371,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d 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)" -@@ -17131,7 +17130,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 +@@ -16735,7 +16734,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series hpijs" @@ -398,7 +380,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4338 All-in-one Printer)" -@@ -17163,7 +17162,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 +@@ -16767,7 +16766,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series hpijs" @@ -407,7 +389,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -17173,7 +17172,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 +@@ -16777,7 +16776,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series hpijs" @@ -416,7 +398,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1217 All-in-one Printer)" -@@ -17476,7 +17475,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 +@@ -17077,7 +17076,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series hpijs" @@ -425,7 +407,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -17541,7 +17540,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 +@@ -17142,7 +17141,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series hpijs" @@ -434,7 +416,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -18044,6 +18043,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 +@@ -17639,6 +17638,7 @@ Manufacturer "HP" Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart 380 Series hpijs" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" @@ -442,7 +424,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -19849,7 +19849,7 @@ Group "RLT/HP Real Life Technologies" +@@ -19378,7 +19378,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 hpijs" @@ -451,7 +433,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -20249,7 +20249,7 @@ Group "RLT/HP Real Life Technologies" +@@ -19759,7 +19759,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 hpijs" @@ -460,7 +442,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d 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)" -@@ -20333,7 +20333,7 @@ Group "RLT/HP Real Life Technologies" +@@ -19843,7 +19843,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 hpijs" @@ -469,7 +451,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -20876,7 +20876,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20379,7 +20379,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Lx hpijs" @@ -478,7 +460,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -21013,7 +21013,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20516,7 +20516,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 540 hpijs" @@ -487,7 +469,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -21021,7 +21021,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20524,7 +20524,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 400 hpijs" @@ -496,7 +478,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -21038,7 +21038,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20541,7 +20541,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" @@ -505,7 +487,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -21171,7 +21171,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20674,7 +20674,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 630c hpijs" @@ -514,7 +496,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -21187,7 +21187,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20690,7 +20690,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 656c hpijs" @@ -523,7 +505,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -21300,7 +21300,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20803,7 +20803,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 600 hpijs" @@ -532,7 +514,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -21341,7 +21341,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20843,7 +20843,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 670c hpijs" @@ -541,7 +523,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c Printer)" } -@@ -21413,7 +21413,7 @@ Group "RLT/HP Real Life Technologies" +@@ -20915,7 +20915,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 hpijs" @@ -550,7 +532,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -21558,7 +21558,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21060,7 +21060,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 610c hpijs" @@ -559,7 +541,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -21582,7 +21582,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21084,7 +21084,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 640c hpijs" @@ -568,16 +550,16 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -21611,7 +21611,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21104,7 +21104,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version" 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 690 Printer)" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" - Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -21662,7 +21662,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21156,7 +21156,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 hpijs" @@ -586,7 +568,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -21813,7 +21813,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21307,7 +21307,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 812c hpijs" @@ -595,7 +577,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -21821,7 +21821,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21315,7 +21315,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 815c hpijs" @@ -604,7 +586,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -21853,7 +21853,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21347,7 +21347,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 840c hpijs" @@ -613,7 +595,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -21861,7 +21861,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21355,7 +21355,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 841c hpijs" @@ -622,7 +604,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -21877,7 +21877,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21371,7 +21371,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 843c hpijs" @@ -631,7 +613,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -21886,7 +21886,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21380,7 +21380,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 880c hpijs" @@ -640,7 +622,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -21902,7 +21902,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21396,7 +21396,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 895c hpijs" @@ -649,7 +631,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -21912,7 +21912,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21406,7 +21406,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r40 hpijs" @@ -658,7 +640,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -21936,7 +21936,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21430,7 +21430,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r60 hpijs" @@ -667,7 +649,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -21944,7 +21944,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21438,7 +21438,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r65 hpijs" @@ -676,7 +658,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -21952,7 +21952,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21446,7 +21446,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r80 hpijs" @@ -685,7 +667,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -21968,7 +21968,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21462,7 +21462,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 hpijs" @@ -694,7 +676,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -21979,7 +21979,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21473,7 +21473,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 500 hpijs" @@ -703,7 +685,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -22095,7 +22095,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21589,7 +21589,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 825c hpijs" @@ -712,7 +694,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -22104,7 +22104,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21598,7 +21598,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 845c hpijs" @@ -721,7 +703,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -22215,7 +22215,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21709,7 +21709,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 850c hpijs" @@ -730,7 +712,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -22234,7 +22234,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21728,7 +21728,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 870c hpijs" @@ -739,7 +721,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -22245,7 +22245,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21739,7 +21739,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" @@ -748,7 +730,7 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d 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)" -@@ -22359,7 +22359,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21853,7 +21853,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 890c hpijs" @@ -757,10 +739,10 @@ diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/d PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -22368,7 +22368,7 @@ Group "RLT/HP Real Life Technologies" +@@ -21862,7 +21862,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 "ShortNickName" "" "HP OJ 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" diff --git a/hplip-snmp-quirks.patch b/hplip-snmp-quirks.patch index e31b698..3f7be41 100644 --- a/hplip-snmp-quirks.patch +++ b/hplip-snmp-quirks.patch @@ -1,18 +1,18 @@ -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 +diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.19.6/prnt/drv/hpcups.drv.in +--- hplip-3.19.6/prnt/drv/hpcups.drv.in.snmp-quirks 2019-07-12 08:38:36.362527348 +0200 ++++ hplip-3.19.6/prnt/drv/hpcups.drv.in 2019-07-12 08:46:28.236417835 +0200 +@@ -10334,6 +10334,8 @@ Manufacturer "HP" Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a hpijs" + Attribute "ShortNickName" "" "HP OJ 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)" } -@@ -10839,6 +10841,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708 +@@ -10342,6 +10344,8 @@ Manufacturer "HP" Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g hpijs" + Attribute "ShortNickName" "" "HP OJ 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-stopiteration.patch b/hplip-stopiteration.patch deleted file mode 100644 index a0bcb9d..0000000 --- a/hplip-stopiteration.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.18.6/base/utils.py.stopiteration hplip-3.18.6/base/utils.py ---- hplip-3.18.6/base/utils.py.stopiteration 2018-11-12 16:27:25.938082056 +0100 -+++ hplip-3.18.6/base/utils.py 2018-11-12 16:28:02.678793293 +0100 -@@ -265,7 +265,7 @@ def walkFiles(root, recurse=True, abs_pa - try: - names = os.listdir(root) - except os.error: -- raise StopIteration -+ return - - pattern = pattern or '*' - pat_list = pattern.split(';') diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch index f7cbed2..0710d10 100644 --- a/hplip-ui-optional.patch +++ b/hplip-ui-optional.patch @@ -1,13 +1,13 @@ -diff -up hplip-3.18.4/base/utils.py.ui-optional hplip-3.18.4/base/utils.py ---- hplip-3.18.4/base/utils.py.ui-optional 2018-04-25 12:34:16.000000000 +0200 -+++ hplip-3.18.4/base/utils.py 2018-04-26 09:27:26.487258888 +0200 +diff -up hplip-3.19.6/base/utils.py.ui-optional hplip-3.19.6/base/utils.py +--- hplip-3.19.6/base/utils.py.ui-optional 2019-06-26 15:07:10.000000000 +0200 ++++ hplip-3.19.6/base/utils.py 2019-07-12 08:16:22.390256936 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # - # (c) Copyright 2001-2015 HP Development Company, L.P. -@@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3 + # (c) Copyright 2001-2018 HP Development Company, L.P. +@@ -734,6 +734,13 @@ def checkPyQtImport(): # qt3 if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'): no_qt_message_gtk() @@ -21,7 +21,7 @@ diff -up hplip-3.18.4/base/utils.py.ui-optional hplip-3.18.4/base/utils.py log.error("PyQt not installed. GUI not available. Exiting.") return False -@@ -783,7 +790,8 @@ def checkPyQtImport4(): +@@ -784,7 +791,8 @@ def checkPyQtImport4(): import PyQt5 import ui5 else: @@ -31,7 +31,7 @@ diff -up hplip-3.18.4/base/utils.py.ui-optional hplip-3.18.4/base/utils.py return False return True -@@ -2434,6 +2442,7 @@ def checkPyQtImport45(): +@@ -2456,6 +2464,7 @@ def checkPyQtImport45(): except ImportError as e: log.debug(e) @@ -39,7 +39,7 @@ diff -up hplip-3.18.4/base/utils.py.ui-optional hplip-3.18.4/base/utils.py raise ImportError("GUI Modules PyQt4 and PyQt5 are not installed") -@@ -2455,6 +2464,7 @@ def import_dialog(ui_toolkit): +@@ -2477,6 +2486,7 @@ def import_dialog(ui_toolkit): return (QApplication, "ui4") except ImportError as e: log.error(e) @@ -47,7 +47,7 @@ diff -up hplip-3.18.4/base/utils.py.ui-optional hplip-3.18.4/base/utils.py sys.exit(1) elif ui_toolkit == "qt5": try: -@@ -2463,9 +2473,7 @@ def import_dialog(ui_toolkit): +@@ -2485,9 +2495,7 @@ def import_dialog(ui_toolkit): return (QApplication, "ui5") except ImportError as e: log.error(e) @@ -58,9 +58,9 @@ diff -up hplip-3.18.4/base/utils.py.ui-optional hplip-3.18.4/base/utils.py sys.exit(1) -diff -up hplip-3.18.4/plugin.py.ui-optional hplip-3.18.4/plugin.py ---- hplip-3.18.4/plugin.py.ui-optional 2018-05-11 10:06:02.925579534 +0200 -+++ hplip-3.18.4/plugin.py 2018-05-11 10:25:08.576302069 +0200 +diff -up hplip-3.19.6/plugin.py.ui-optional hplip-3.19.6/plugin.py +--- hplip-3.19.6/plugin.py.ui-optional 2019-06-26 15:07:10.000000000 +0200 ++++ hplip-3.19.6/plugin.py 2019-07-12 08:15:03.731933177 +0200 @@ -252,7 +252,11 @@ if mode == GUI_MODE: # clean_exit(1) diff --git a/hplip-wifisetup.patch b/hplip-wifisetup.patch index 9b0cda9..7247b01 100644 --- a/hplip-wifisetup.patch +++ b/hplip-wifisetup.patch @@ -1,18 +1,11 @@ -commit 7cdc26da185db2335f1efdc6716804266caa1712 -Author: Tomas Korbar -Date: Thu Sep 20 15:04:47 2018 +0200 - - Fix wifi printer setup - -diff --git a/ui5/wifisetupdialog.py b/ui5/wifisetupdialog.py -index 74cc0ef..8daff7d 100644 ---- a/ui5/wifisetupdialog.py -+++ b/ui5/wifisetupdialog.py -@@ -570,7 +570,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog): +diff -up hplip-3.19.6/ui5/wifisetupdialog.py.wifisetup-bad-call-fix hplip-3.19.6/ui5/wifisetupdialog.py +--- hplip-3.19.6/ui5/wifisetupdialog.py.wifisetup-bad-call-fix 2019-07-12 08:46:56.873167869 +0200 ++++ hplip-3.19.6/ui5/wifisetupdialog.py 2019-07-12 08:49:36.813769803 +0200 +@@ -570,7 +570,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog try: self.ip,_,addressmode, subnetmask, gateway, pridns, sec_dns= self.wifiObj.getIPConfiguration(self.dev, self.adapterName) if self.ip == "0.0.0.0": -- self.ip, subnetmask, gateway, pri_dns, sec_dns, addressmode = self.wifiobj.getwifiotherdetails(self.dev,self.adapterName) +- self.ip, subnetmask, gateway, pri_dns, sec_dns, addressmode = self.wifiObj.getwifiotherdetails(self.dev,self.adapterName) + self.ip, subnetmask, gateway, pridns, sec_dns, addressmode = self.wifiObj.getwifiotherdetails(self.dev,self.adapterName) vsa_codes = self.wifiObj.getVSACodes(self.dev, self.adapterName) ss_max, ss_min, ss_val, ss_dbm = self.wifiObj.getSignalStrength(self.dev, self.adapterName,self.network, self.adaptor_id) diff --git a/hplip.spec b/hplip.spec index 2e64a15..a10309c 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,8 +6,8 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.18.12 -Release: 16%{?dist} +Version: 3.19.6 +Release: 1%{?dist} License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC Url: https://developers.hp.com/hp-linux-imaging-and-printing @@ -52,11 +52,6 @@ Patch32: hplip-colorlaserjet-mfp-m278-m281.patch Patch33: hplip-error-print.patch Patch34: hplip-hpfax-importerror-print.patch Patch35: hplip-wifisetup.patch -# bz1645815, hplaunchpad1802941 - python3.7 treats StopIteration in generators -# differently than before, now it gets propagated as other exceptions and -# it cannot silently end the loop (as it was sometimes used) - use 'return' -# instead of raising StopIteration exception -Patch36: hplip-stopiteration.patch # pgp.mit.edu keyserver got bad connection, so we need to have pool of keyservers # to choose (Bz#1641100, launchpad#1799212) Patch37: hplip-keyserver.patch @@ -72,9 +67,6 @@ Patch39: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch # commented out. # The patch is taken from Debian. Patch40: 0027-Fixed-incomplete-removal-of-hp-toolbox-features-whic.patch -# New tool - hp-uiscan - misses support of -h argument and crashes with traceback -# Reported as https://bugs.launchpad.net/hplip/+bug/1810943 -Patch41: hplip-uiscan-help.patch # hp-setup crashed when user wanted to define a path to PPD file. It was due # byte + string variables incompatibility and it is fixed by decoding the # bytes-like variable @@ -331,9 +323,6 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h # bug caused by typo in wifisetupdialog wifiObj property call %patch35 -p1 -b .wifisetup-bad-call-fix -# 1645815 - hp-check --runtime crashes involving FileNotFoundError -%patch36 -p1 -b .stopiteration - # have pool of keyservers to choose %patch37 -p1 -b .keyserver @@ -349,7 +338,6 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h %{_bindir}/rm prnt/hpcups/libImageProcessor-x86* %patch40 -p1 -b .toolbox-crash -%patch41 -p1 -b .uiscan-help # part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076 %patch42 -p1 -b .add-ppd-crash # 1671513 - after 'successful' plugin installation it is not installed @@ -668,6 +656,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog +* Fri Jul 12 2019 Zdenek Dohnal - 3.19.6-1 +- 3.19.6 + * Fri Jul 12 2019 Zdenek Dohnal - 3.18.12-16 - fixing issues found by coverity scan diff --git a/sources b/sources index 091b294..51393d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hplip-3.18.12.tar.gz) = 7197cac325cf40c03f49053a98ee0e8ac6c670d142b2a64df09c0f7afa1d7d3602216c55c825ccbf20a1fbda9c9289173b8708e9f87171a862dae5b6b4ef7635 +SHA512 (hplip-3.19.6.tar.gz) = c99448ad0cef9fc626a0a03147a0d582513cb838ecfbfe29f07c65bbf701dee5c7d02222469b118ccc4e8c230c7a4b4685a72a1e67595ee01150b0472692d654