diff --git a/.gitignore b/.gitignore index 9caad59..d3559b1 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ hplip-3.10.6.tar.gz /hplip-3.14.3.tar.gz /hplip-3.14.4.tar.gz /hplip-3.14.6.tar.gz +/hplip-3.14.10.tar.gz diff --git a/hplip-3.14.10.tar.gz.asc b/hplip-3.14.10.tar.gz.asc new file mode 100644 index 0000000..744305b --- /dev/null +++ b/hplip-3.14.10.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlQzq2kACgkQc9dwzaWQR7kFZwCfVxHaORmTNA7jyexSGPKrXGoY +bWIAnjTK/xMAsx0un81KEWS/h2GFyB9V +=Vbpn +-----END PGP SIGNATURE----- diff --git a/hplip-3.14.6.tar.gz.asc b/hplip-3.14.6.tar.gz.asc deleted file mode 100644 index 3fbd840..0000000 --- a/hplip-3.14.6.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlONbUsACgkQc9dwzaWQR7nu0gCgpq2dT7qvrkIbaIarjUdX+EbC -F5UAn3C6ZjcYma+F2hAuqC4973F6fAf1 -=cteQ ------END PGP SIGNATURE----- diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index cddda9e..4021dde 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,6 +1,6 @@ -diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv/hpcups.drv.in ---- hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv 2014-03-06 06:10:40.000000000 +0100 -+++ hplip-3.14.3/prnt/drv/hpcups.drv.in 2014-03-07 10:05:46.912545144 +0100 +diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/drv/hpcups.drv.in +--- hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv 2014-10-07 10:56:09.000000000 +0200 ++++ hplip-3.14.10/prnt/drv/hpcups.drv.in 2014-10-07 15:57:42.392251535 +0200 @@ -473,7 +473,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" @@ -100,7 +100,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -713,7 +713,7 @@ Manufacturer "HP" +@@ -737,7 +737,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -352,7 +352,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv 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)" -@@ -3070,7 +3070,7 @@ Manufacturer "HP" +@@ -3057,7 +3057,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -397,7 +397,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -10701,7 +10701,7 @@ Manufacturer "HP" +@@ -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" @@ -406,7 +406,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -10711,7 +10711,7 @@ Manufacturer "HP" +@@ -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" @@ -415,7 +415,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -10894,7 +10894,7 @@ Manufacturer "HP" +@@ -11679,7 +11679,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" Attribute "NickName" "" "HP Deskjet 3940, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 3940" @@ -424,7 +424,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_3940.ppd" Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" -@@ -10903,7 +10903,7 @@ Manufacturer "HP" +@@ -11688,7 +11688,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -433,7 +433,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv 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)" -@@ -10930,7 +10930,7 @@ Manufacturer "HP" +@@ -11715,7 +11715,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -442,7 +442,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -11246,7 +11246,7 @@ Manufacturer "HP" +@@ -12042,7 +12042,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -451,7 +451,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -11317,7 +11317,7 @@ Manufacturer "HP" +@@ -12102,7 +12102,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -460,7 +460,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -11824,6 +11824,7 @@ Manufacturer "HP" +@@ -12609,6 +12609,7 @@ Manufacturer "HP" Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart 380 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" @@ -468,7 +468,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -12250,7 +12251,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13035,7 +13036,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" @@ -477,7 +477,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -12276,7 +12277,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13061,7 +13062,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -486,7 +486,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -12286,7 +12287,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13071,7 +13072,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" @@ -495,7 +495,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -12294,7 +12295,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13079,7 +13080,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -504,7 +504,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -12302,7 +12303,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13087,7 +13088,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -513,7 +513,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -12314,7 +12315,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13099,7 +13100,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -522,7 +522,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -12322,7 +12323,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13107,7 +13108,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -531,7 +531,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -12332,7 +12333,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13117,7 +13118,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -540,7 +540,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -12382,7 +12383,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13167,7 +13168,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -549,7 +549,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -12392,7 +12393,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13177,7 +13178,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -558,7 +558,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -12409,7 +12410,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13194,7 +13195,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" @@ -567,7 +567,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -12417,7 +12418,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13202,7 +13203,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -576,7 +576,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -12442,7 +12443,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13227,7 +13228,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -585,7 +585,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -12450,7 +12451,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13235,7 +13236,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -594,7 +594,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -12475,7 +12476,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13260,7 +13261,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" @@ -603,7 +603,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -12499,7 +12500,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13284,7 +13285,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" Attribute "NickName" "" "HP LaserJet 1320, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1320" @@ -612,7 +612,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -12524,7 +12525,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13309,7 +13310,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1522nf MFP" Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" @@ -621,7 +621,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)" } -@@ -12596,7 +12597,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13381,7 +13382,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" @@ -630,7 +630,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -12620,7 +12621,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13405,7 +13406,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2035" Attribute "NickName" "" "HP LaserJet p2035 pcl3, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" @@ -639,7 +639,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p2035-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2035 Printer)" } -@@ -12660,7 +12661,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13445,7 +13446,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100" Attribute "NickName" "" "HP LaserJet 2100, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2100" @@ -648,7 +648,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_2100.ppd" Attribute "Product" "" "(HP LaserJet 2100 Printer)" Attribute "Product" "" "(HP LaserJet 2100m Printer)" -@@ -12672,7 +12673,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13457,7 +13458,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" @@ -657,7 +657,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -12680,7 +12681,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13465,7 +13466,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200 Series" Attribute "NickName" "" "HP LaserJet 2200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2200 Series" @@ -666,7 +666,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_2200_series.ppd" Attribute "Product" "" "(HP LaserJet 2200 Series Printer)" } -@@ -12688,7 +12689,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13473,7 +13474,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -675,7 +675,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -12701,7 +12702,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13486,7 +13487,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -684,7 +684,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -12714,7 +12715,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13499,7 +13500,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" @@ -693,7 +693,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -12730,7 +12731,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13515,7 +13516,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -702,7 +702,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -12741,7 +12742,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13526,7 +13527,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -711,7 +711,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -12769,7 +12770,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13554,7 +13555,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3005" Attribute "NickName" "" "HP LaserJet p3005 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p3005" @@ -720,7 +720,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p3005-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3005 Printer)" Attribute "Product" "" "(HP LaserJet p3005d Printer)" -@@ -12782,7 +12783,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13567,7 +13568,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3010 Series" Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p3010 Series" @@ -729,7 +729,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p3010_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3015 Printer)" Attribute "Product" "" "(HP LaserJet p3011 Printer)" -@@ -12791,7 +12792,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13576,7 +13577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -738,7 +738,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -12799,7 +12800,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13584,7 +13585,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -747,7 +747,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -12807,7 +12808,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13592,7 +13593,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" @@ -756,7 +756,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -12816,7 +12817,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13601,7 +13602,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -765,7 +765,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -12824,7 +12825,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13609,7 +13610,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -774,7 +774,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -12833,7 +12834,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13618,7 +13619,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -783,7 +783,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -12841,7 +12842,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13626,7 +13627,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -792,7 +792,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -12869,7 +12870,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13654,7 +13655,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -801,7 +801,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -12885,7 +12886,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13670,7 +13671,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -810,7 +810,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -12905,7 +12906,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13690,7 +13691,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -819,7 +819,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -12913,7 +12914,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13698,7 +13699,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -828,7 +828,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -12921,7 +12922,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13706,7 +13707,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -837,7 +837,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -12937,7 +12938,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13722,7 +13723,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" @@ -846,7 +846,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -12965,7 +12966,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13742,7 +13743,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4014" Attribute "NickName" "" "HP LaserJet p4014, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4014" @@ -855,7 +855,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p4014.ppd" Attribute "Product" "" "(HP LaserJet p4014 Printer)" } -@@ -13013,7 +13014,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13798,7 +13799,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" @@ -864,7 +864,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -13034,7 +13035,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13819,7 +13820,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" @@ -873,7 +873,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -13053,7 +13054,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13838,7 +13839,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -882,7 +882,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -13078,7 +13079,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13863,7 +13864,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -891,7 +891,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -13090,7 +13091,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13875,7 +13876,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -900,7 +900,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -13103,7 +13104,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13888,7 +13889,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" @@ -909,7 +909,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -13114,7 +13115,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13899,7 +13900,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" @@ -918,7 +918,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -13133,7 +13134,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13918,7 +13919,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4350" Attribute "NickName" "" "HP LaserJet 4350 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4350" @@ -927,7 +927,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_4350-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4350 Printer)" Attribute "Product" "" "(HP LaserJet 4350dtn Printer)" -@@ -13169,7 +13170,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13954,7 +13955,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4515" Attribute "NickName" "" "HP LaserJet p4515, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4515" @@ -936,7 +936,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p4515.ppd" Attribute "Product" "" "(HP LaserJet p4515 Printer)" } -@@ -13185,7 +13186,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13970,7 +13971,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" @@ -945,7 +945,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -13201,7 +13202,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13986,7 +13987,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000 Series" Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8000 Series" @@ -954,7 +954,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_8000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8000 Series Printer)" } -@@ -13295,7 +13296,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14080,7 +14081,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -963,7 +963,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -13331,7 +13332,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14116,7 +14117,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" @@ -972,7 +972,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -13352,7 +13353,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14137,7 +14138,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" @@ -981,7 +981,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -13360,7 +13361,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14145,7 +14146,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" @@ -990,7 +990,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -13378,7 +13379,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14163,7 +14164,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5100 Series" Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5100 Series" @@ -999,7 +999,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_5100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5100 Printer)" Attribute "Product" "" "(HP LaserJet 5100le Printer)" -@@ -13409,7 +13410,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14194,7 +14195,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000" Attribute "NickName" "" "HP LaserJet 8000, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8000" @@ -1008,7 +1008,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_8000.ppd" Attribute "Product" "" "(HP LaserJet 8000 Printer)" Attribute "Product" "" "(HP LaserJet 8000dn Printer)" -@@ -13429,7 +13430,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14214,7 +14215,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" @@ -1017,7 +1017,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -13633,7 +13634,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14418,7 +14419,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm1312nfi MFP" Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" @@ -1026,7 +1026,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } -@@ -13721,7 +13722,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14506,7 +14507,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1515n" Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" @@ -1035,7 +1035,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" } -@@ -13729,7 +13730,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14514,7 +14515,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1518ni" Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" @@ -1044,7 +1044,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" } -@@ -13737,7 +13738,9 @@ Group "RLT/HP Real Life Technologies" +@@ -14522,7 +14523,9 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp2025dn" Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" @@ -1055,7 +1055,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" } -@@ -13753,7 +13756,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14538,7 +14541,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp2025n" Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" @@ -1064,7 +1064,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" } -@@ -13769,7 +13772,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14554,7 +14557,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" @@ -1073,7 +1073,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -13779,7 +13782,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14564,7 +14567,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2500" Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 2500" @@ -1082,7 +1082,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_2500-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" } -@@ -13820,7 +13823,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14605,7 +14608,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp3525" Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp3525" @@ -1091,7 +1091,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" -@@ -13831,7 +13834,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14616,7 +14619,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm3530 MFP" Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" @@ -1100,7 +1100,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" -@@ -13840,7 +13843,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14625,7 +14628,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3700" Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3700" @@ -1109,7 +1109,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_3700-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" } -@@ -13859,7 +13862,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14644,7 +14647,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3800" Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3800" @@ -1118,7 +1118,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -13870,7 +13873,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14655,7 +14658,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp4005" Attribute "NickName" "" "HP Color LaserJet cp4005 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp4005" @@ -1127,7 +1127,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cp4005-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp4005n Printer)" Attribute "Product" "" "(HP Color LaserJet cp4005dn Printer)" -@@ -13898,7 +13901,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14683,7 +14686,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp4520 Series" Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" @@ -1136,7 +1136,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" } -@@ -13906,7 +13909,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14691,7 +14694,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm4540 MFP" Attribute "NickName" "" "HP Color LaserJet cm4540 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm4540 MFP" @@ -1145,7 +1145,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cm4540_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm4540 Multifunction Printer)" } -@@ -13914,7 +13917,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14699,7 +14702,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" @@ -1154,7 +1154,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -13927,7 +13930,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14712,7 +14715,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" Attribute "NickName" "" "HP Color LaserJet 4600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" @@ -1163,7 +1163,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -13939,7 +13942,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14724,7 +14727,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600" Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600" @@ -1172,7 +1172,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_4600-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" } -@@ -13955,7 +13958,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14740,7 +14743,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4650" Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4650" @@ -1181,7 +1181,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_4650-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" -@@ -13967,7 +13970,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14752,7 +14755,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4700" Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4700" @@ -1190,7 +1190,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_4700-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" -@@ -13979,7 +13982,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14764,7 +14767,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm4730 MFP" Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" @@ -1199,7 +1199,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" -@@ -14033,7 +14036,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14818,7 +14821,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" @@ -1208,7 +1208,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv 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)" -@@ -14061,7 +14064,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14846,7 +14849,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm2320nf MFP" Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" @@ -1217,7 +1217,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" } -@@ -14117,7 +14120,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14902,7 +14905,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" @@ -1226,7 +1226,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -14152,7 +14155,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14937,7 +14940,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 5550" Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 5550" @@ -1235,7 +1235,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_5550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 5550n Printer)" Attribute "Product" "" "(HP Color LaserJet 5550 Printer)" -@@ -14409,7 +14412,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15194,7 +15197,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -1244,7 +1244,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -14417,7 +14420,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15202,7 +15205,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -1253,7 +1253,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -14625,7 +14628,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15410,7 +15413,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1262,7 +1262,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -14789,7 +14792,7 @@ Group "RLT/HP Real Life Technologies" +@@ -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" @@ -1271,7 +1271,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -14813,7 +14816,7 @@ Group "RLT/HP Real Life Technologies" +@@ -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" @@ -1280,7 +1280,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -14830,7 +14833,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15615,7 +15618,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -1289,7 +1289,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -14955,7 +14958,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15740,7 +15743,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1298,7 +1298,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -14971,7 +14974,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15756,7 +15759,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1307,7 +1307,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -15084,7 +15087,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15869,7 +15872,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1316,7 +1316,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -15138,7 +15141,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15923,7 +15926,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" @@ -1325,7 +1325,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -15190,7 +15193,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15975,7 +15978,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1334,7 +1334,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -15342,7 +15345,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16127,7 +16130,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1343,7 +1343,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -15366,7 +15369,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16151,7 +16154,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1352,7 +1352,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -15386,7 +15389,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16171,7 +16174,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1361,7 +1361,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -15446,7 +15449,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16231,7 +16234,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" @@ -1370,7 +1370,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -15589,7 +15592,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16374,7 +16377,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" @@ -1379,7 +1379,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -15600,7 +15603,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16385,7 +16388,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1388,7 +1388,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -15624,7 +15627,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16409,7 +16412,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1397,7 +1397,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -15632,7 +15635,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16417,7 +16420,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1406,7 +1406,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -15648,7 +15651,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16433,7 +16436,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1415,7 +1415,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -15656,7 +15659,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16441,7 +16444,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1424,7 +1424,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -15673,7 +15676,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16458,7 +16461,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1433,7 +1433,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -15681,7 +15684,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16466,7 +16469,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1442,7 +1442,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -15713,7 +15716,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16498,7 +16501,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1451,7 +1451,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -15721,7 +15724,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16506,7 +16509,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1460,7 +1460,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -15737,7 +15740,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16522,7 +16525,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1469,7 +1469,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -15746,7 +15749,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16531,7 +16534,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1478,7 +1478,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -15762,7 +15765,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16547,7 +16550,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1487,7 +1487,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -15879,7 +15882,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16664,7 +16667,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1496,7 +1496,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -15888,7 +15891,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16673,7 +16676,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1505,7 +1505,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -15999,7 +16002,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16784,7 +16787,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1514,7 +1514,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -16018,7 +16021,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16803,7 +16806,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1523,7 +1523,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -16029,7 +16032,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16814,7 +16817,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" @@ -1532,7 +1532,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv 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)" -@@ -16143,7 +16146,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16928,7 +16931,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1541,7 +1541,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -16152,7 +16155,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16937,7 +16940,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" @@ -1550,7 +1550,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv 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)" -@@ -16294,7 +16297,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17079,7 +17082,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1018" Attribute "NickName" "" "HP LaserJet 1018, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" @@ -1559,7 +1559,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1018.ppd" Attribute "Product" "" "(HP LaserJet 1018 Printer)" Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -16303,7 +16306,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17088,7 +17091,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1020" Attribute "NickName" "" "HP LaserJet 1020, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" @@ -1568,7 +1568,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -16337,7 +16340,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17122,7 +17125,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1120 MFP" Attribute "NickName" "" "HP LaserJet m1120 MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" @@ -1577,7 +1577,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_m1120_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)" } -@@ -16353,7 +16356,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17138,7 +17141,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1319f MFP" Attribute "NickName" "" "HP LaserJet m1319f MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" @@ -1586,7 +1586,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_m1319f_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)" } -@@ -16369,7 +16372,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17154,7 +17157,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2035" Attribute "NickName" "" "HP LaserJet p2035 zjs, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" @@ -1595,7 +1595,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p2035-zjs.ppd" Attribute "Product" "" "(HP LaserJet p2035 Printer)" } -@@ -16461,7 +16464,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17246,7 +17249,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1102w" Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet Professional p1102w" @@ -1604,7 +1604,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_professional_p1102w.ppd" Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)" } -@@ -16469,7 +16472,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17254,7 +17257,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1102" Attribute "NickName" "" "HP LaserJet Professional p1102, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet Professional p1102" @@ -1613,7 +1613,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_professional_p1102.ppd" Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)" Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)" -@@ -16591,7 +16594,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17376,7 +17379,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional m1212nf MFP" Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP" @@ -1622,7 +1622,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd" Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" } -@@ -16827,7 +16830,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17612,7 +17615,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1606dn" Attribute "NickName" "" "HP LaserJet Professional p1606dn, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional p1606dn" @@ -1631,7 +1631,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_professional_p1606dn.ppd" Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)" } -@@ -17001,7 +17004,7 @@ Group "RLT/HP Real Life Technologies" +@@ -17786,7 +17789,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2600n" Attribute "NickName" "" "HP Color LaserJet 2600n, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n" @@ -1640,7 +1640,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_2600n.ppd" Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" } -@@ -17479,7 +17482,7 @@ Group "RLT/HP Real Life Technologies" +@@ -18304,7 +18307,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" Attribute "NickName" "" "HP Color LaserJet 3500, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" @@ -1649,7 +1649,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -17489,7 +17492,7 @@ Group "RLT/HP Real Life Technologies" +@@ -18314,7 +18317,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" Attribute "NickName" "" "HP Color LaserJet 3550, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" @@ -1658,7 +1658,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } -@@ -17641,7 +17644,7 @@ Group "RLT/HP Real Life Technologies" +@@ -18466,7 +18469,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1505" Attribute "NickName" "" "HP LaserJet p1505, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505" @@ -1667,7 +1667,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p1505.ppd" Attribute "Product" "" "(HP LaserJet p1505 Printer)" } -@@ -17775,7 +17778,7 @@ Group "RLT/HP Real Life Technologies" +@@ -18600,7 +18603,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1005" Attribute "NickName" "" "HP LaserJet p1005, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1005" @@ -1676,7 +1676,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p1005.ppd" Attribute "Product" "" "(HP LaserJet p1005 Printer)" } -@@ -17783,7 +17786,7 @@ Group "RLT/HP Real Life Technologies" +@@ -18608,7 +18611,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1006" Attribute "NickName" "" "HP LaserJet p1006, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" @@ -1685,7 +1685,7 @@ diff -up hplip-3.14.3/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.3/prnt/drv PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } -@@ -17791,7 +17794,7 @@ Group "RLT/HP Real Life Technologies" +@@ -18616,7 +18619,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1007" Attribute "NickName" "" "HP LaserJet p1007, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index 37de4e1..355f188 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,20 +1,21 @@ -diff -up hplip-3.14.3/data/rules/56-hpmud.rules.udev-rules hplip-3.14.3/data/rules/56-hpmud.rules ---- hplip-3.14.3/data/rules/56-hpmud.rules.udev-rules 2014-03-07 10:06:30.338946358 +0100 -+++ hplip-3.14.3/data/rules/56-hpmud.rules 2014-03-07 10:10:25.004683464 +0100 -@@ -11,9 +11,6 @@ LABEL="hpmud_usb_rules" +diff -up hplip-3.14.10/data/rules/56-hpmud.rules.udev-rules hplip-3.14.10/data/rules/56-hpmud.rules +--- hplip-3.14.10/data/rules/56-hpmud.rules.udev-rules 2014-10-07 15:58:17.081756602 +0200 ++++ hplip-3.14.10/data/rules/56-hpmud.rules 2014-10-07 16:01:21.372127237 +0200 +@@ -10,10 +10,6 @@ LABEL="hpmud_usb_rules" + # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" - --# This rule will add the printer and install plugin +- +-# This rule will check the smart install feature, plugin status and firmware download for the required printers. -ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi &'" - # If sane-bankends is installed add hpaio backend support to dll.conf if needed. ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'" -diff -up hplip-3.14.3/Makefile.in.udev-rules hplip-3.14.3/Makefile.in ---- hplip-3.14.3/Makefile.in.udev-rules 2014-03-06 06:11:18.000000000 +0100 -+++ hplip-3.14.3/Makefile.in 2014-03-07 10:06:30.341946316 +0100 -@@ -4442,7 +4442,7 @@ cups_drv = prnt/drv/hpcups.drv +diff -up hplip-3.14.10/Makefile.in.udev-rules hplip-3.14.10/Makefile.in +--- hplip-3.14.10/Makefile.in.udev-rules 2014-10-07 10:56:30.000000000 +0200 ++++ hplip-3.14.10/Makefile.in 2014-10-07 15:58:17.084756560 +0200 +@@ -4550,7 +4550,7 @@ cups_drv = prnt/drv/hpcups.drv @HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service # hpmud.rules diff --git a/hplip.spec b/hplip.spec index 287960d..80e8f68 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,8 +6,8 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.14.6 -Release: 7%{?dist} +Version: 3.14.10 +Release: 1%{?dist} License: GPLv2+ and MIT Url: http://hplip.sourceforge.net/ @@ -488,6 +488,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Tue Oct 07 2014 Jiri Popelka - 3.14.10-1 +- 3.14.10 + * Tue Aug 26 2014 Tim Waugh - 3.14.6-7 - Reverted previous change as it didn't help (bug #1076954). diff --git a/sources b/sources index e47b332..300158e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec14b3bf3ac17a7c00b96e51d4c38114 hplip-3.14.6.tar.gz +7af44ee1c4312b00d2269c1b25008f73 hplip-3.14.10.tar.gz