From 75a0336e396661951bb0cfaa579778c1e97d7074 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Fri, 3 Dec 2010 17:01:22 +0100 Subject: [PATCH] Corrected many Device IDs (bug #659039, #659040). --- hplip-deviceIDs-drv.patch | 507 ++++++++++++++++++++++++++------------ hplip-deviceIDs-ppd.patch | 308 +++++++++++++++++++++++ hplip.spec | 17 +- 3 files changed, 672 insertions(+), 160 deletions(-) diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index a90b455..b5019b6 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv/hpcups.drv.in ---- hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-07-19 04:20:01.000000000 +0200 -+++ hplip-3.10.6/prnt/drv/hpcups.drv.in 2010-07-27 11:33:48.000000000 +0200 -@@ -433,7 +433,7 @@ Manufacturer "HP" +diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv/hpcups.drv.in +--- hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-09-26 19:09:24.000000000 +0200 ++++ hplip-3.10.9/prnt/drv/hpcups.drv.in 2010-12-03 15:39:34.000000000 +0100 +@@ -442,7 +442,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" @@ -10,7 +10,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -441,7 +441,7 @@ Manufacturer "HP" +@@ -450,7 +450,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, $Version" Attribute "ShortNickName" "" "HP Officejet v40" @@ -19,7 +19,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -458,7 +458,7 @@ Manufacturer "HP" +@@ -467,7 +467,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, $Version" Attribute "ShortNickName" "" "HP Officejet g55" @@ -28,7 +28,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -506,7 +506,7 @@ Manufacturer "HP" +@@ -515,7 +515,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, $Version" Attribute "ShortNickName" "" "HP Officejet g85" @@ -37,7 +37,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -522,7 +522,7 @@ Manufacturer "HP" +@@ -531,7 +531,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, $Version" Attribute "ShortNickName" "" "HP Officejet g95" @@ -46,7 +46,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -538,7 +538,7 @@ Manufacturer "HP" +@@ -547,7 +547,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, $Version" Attribute "ShortNickName" "" "HP PSC 750xi" @@ -55,7 +55,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -546,7 +546,7 @@ Manufacturer "HP" +@@ -555,7 +555,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, $Version" Attribute "ShortNickName" "" "HP PSC 750" @@ -64,7 +64,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -578,7 +578,7 @@ Manufacturer "HP" +@@ -587,7 +587,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" @@ -73,7 +73,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -594,7 +594,7 @@ Manufacturer "HP" +@@ -603,7 +603,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" @@ -82,7 +82,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -613,7 +613,7 @@ Manufacturer "HP" +@@ -622,7 +622,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" @@ -91,7 +91,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -654,7 +654,7 @@ Manufacturer "HP" +@@ -663,7 +663,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" @@ -100,7 +100,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -673,7 +673,7 @@ Manufacturer "HP" +@@ -682,7 +682,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -109,7 +109,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -730,7 +730,7 @@ Manufacturer "HP" +@@ -739,7 +739,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" Attribute "NickName" "" "HP Deskjet 959c, $Version" Attribute "ShortNickName" "" "HP Deskjet 959c" @@ -118,7 +118,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_959c.ppd" Attribute "Product" "" "(HP Deskjet 959c Printer)" } -@@ -738,7 +738,7 @@ Manufacturer "HP" +@@ -747,7 +747,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" @@ -127,7 +127,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -758,7 +758,7 @@ Manufacturer "HP" +@@ -767,7 +767,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -136,7 +136,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -767,7 +767,7 @@ Manufacturer "HP" +@@ -776,7 +776,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -145,7 +145,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -801,7 +801,7 @@ Manufacturer "HP" +@@ -810,7 +810,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -154,7 +154,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -839,7 +839,7 @@ Manufacturer "HP" +@@ -848,7 +848,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -163,7 +163,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -847,7 +847,7 @@ Manufacturer "HP" +@@ -856,7 +856,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -172,7 +172,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -898,7 +898,7 @@ Manufacturer "HP" +@@ -907,7 +907,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" @@ -181,7 +181,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1094,7 +1094,7 @@ Manufacturer "HP" +@@ -1103,7 +1103,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, $Version" Attribute "ShortNickName" "" "HP 2000c" @@ -190,7 +190,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1536,7 +1536,7 @@ Manufacturer "HP" +@@ -1545,7 +1545,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, $Version" Attribute "ShortNickName" "" "HP Officejet D Series" @@ -199,7 +199,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1559,7 +1559,7 @@ Manufacturer "HP" +@@ -1568,7 +1568,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -208,7 +208,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1569,7 +1569,7 @@ Manufacturer "HP" +@@ -1578,7 +1578,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -217,7 +217,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1578,7 +1578,7 @@ Manufacturer "HP" +@@ -1587,7 +1587,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -226,7 +226,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1641,7 +1641,7 @@ Manufacturer "HP" +@@ -1650,7 +1650,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -235,7 +235,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1649,7 +1649,7 @@ Manufacturer "HP" +@@ -1658,7 +1658,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" @@ -244,7 +244,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1662,7 +1662,7 @@ Manufacturer "HP" +@@ -1671,7 +1671,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" @@ -253,7 +253,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1670,7 +1670,7 @@ Manufacturer "HP" +@@ -1679,7 +1679,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" @@ -262,7 +262,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1707,7 +1707,7 @@ Manufacturer "HP" +@@ -1716,7 +1716,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -271,7 +271,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1937,7 +1937,7 @@ Manufacturer "HP" +@@ -1946,7 +1946,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" @@ -280,7 +280,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1947,7 +1947,7 @@ Manufacturer "HP" +@@ -1956,7 +1956,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" @@ -289,7 +289,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1955,7 +1955,7 @@ Manufacturer "HP" +@@ -1964,7 +1964,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" @@ -298,7 +298,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1964,7 +1964,7 @@ Manufacturer "HP" +@@ -1973,7 +1973,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" @@ -307,7 +307,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2485,7 +2485,7 @@ Manufacturer "HP" +@@ -2494,7 +2494,7 @@ Manufacturer "HP" ModelName "HP PSC 1600 Series" Attribute "NickName" "" "HP PSC 1600 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1600 Series" @@ -316,7 +316,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_1600_series.ppd" Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" -@@ -2501,7 +2501,7 @@ Manufacturer "HP" +@@ -2510,7 +2510,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -325,7 +325,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2519,7 +2519,7 @@ Manufacturer "HP" +@@ -2528,7 +2528,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -334,7 +334,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv 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)" -@@ -2528,7 +2528,7 @@ Manufacturer "HP" +@@ -2537,7 +2537,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -343,7 +343,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2545,7 +2545,7 @@ Manufacturer "HP" +@@ -2554,7 +2554,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" @@ -352,7 +352,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-psc_2400_series.ppd" Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" -@@ -2571,7 +2571,7 @@ Manufacturer "HP" +@@ -2580,7 +2580,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -361,7 +361,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -3032,7 +3032,7 @@ Manufacturer "HP" +@@ -3041,7 +3041,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -370,7 +370,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3105,7 +3105,7 @@ Manufacturer "HP" +@@ -3114,7 +3114,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -379,7 +379,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3160,7 +3160,7 @@ Manufacturer "HP" +@@ -3169,7 +3169,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" @@ -388,7 +388,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3329,7 +3329,7 @@ Manufacturer "HP" +@@ -3338,7 +3338,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -397,7 +397,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3414,7 +3414,7 @@ Manufacturer "HP" +@@ -3423,7 +3423,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" @@ -406,7 +406,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -7579,7 +7579,7 @@ Manufacturer "HP" +@@ -8196,7 +8196,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -415,7 +415,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -7589,7 +7589,7 @@ Manufacturer "HP" +@@ -8206,7 +8206,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -424,7 +424,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -7772,7 +7772,7 @@ Manufacturer "HP" +@@ -8389,7 +8389,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" Attribute "NickName" "" "HP Deskjet 3940, $Version" Attribute "ShortNickName" "" "HP Deskjet 3940" @@ -433,7 +433,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_3940.ppd" Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" -@@ -7781,7 +7781,7 @@ Manufacturer "HP" +@@ -8398,7 +8398,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -442,7 +442,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -7808,7 +7808,7 @@ Manufacturer "HP" +@@ -8425,7 +8425,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -451,7 +451,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -8114,7 +8114,7 @@ Manufacturer "HP" +@@ -8731,7 +8731,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -460,7 +460,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -8185,7 +8185,7 @@ Manufacturer "HP" +@@ -8802,7 +8802,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -469,7 +469,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -8682,6 +8682,7 @@ Manufacturer "HP" +@@ -9299,6 +9299,7 @@ Manufacturer "HP" Attribute "NickName" "" "HP Photosmart 380 Series, $Version" Attribute "ShortNickName" "" "HP Photosmart 380 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" @@ -477,7 +477,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -9109,7 +9110,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9726,7 +9727,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" @@ -486,7 +486,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -9135,7 +9136,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9752,7 +9753,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" @@ -495,7 +495,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -9143,7 +9144,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9760,7 +9761,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -504,7 +504,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -9153,7 +9154,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9770,7 +9771,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -513,7 +513,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -9161,7 +9162,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9778,7 +9779,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -522,7 +522,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -9173,7 +9174,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9790,7 +9791,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -531,7 +531,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -9181,7 +9182,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9798,7 +9799,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -540,7 +540,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -9191,7 +9192,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9808,7 +9809,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -549,7 +549,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -9233,7 +9234,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9850,7 +9851,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -558,7 +558,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -9251,7 +9252,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9868,7 +9869,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -567,7 +567,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -9268,7 +9269,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9885,7 +9886,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" @@ -576,7 +576,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -9276,7 +9277,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9893,7 +9894,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -585,7 +585,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -9301,7 +9302,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9918,7 +9919,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -594,7 +594,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -9309,7 +9310,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9926,7 +9927,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -603,7 +603,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -9334,7 +9335,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9951,7 +9952,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" @@ -612,7 +612,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -9358,7 +9359,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9975,7 +9976,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" Attribute "NickName" "" "HP LaserJet 1320, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320" @@ -621,7 +621,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -9431,7 +9432,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10048,7 +10049,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" @@ -630,7 +630,16 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -9507,7 +9508,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10112,7 +10113,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2100" + Attribute "NickName" "" "HP LaserJet 2100, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2100" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100;DES:hp laserjet 2100;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:hp laserjet 2100;" + PCFileName "hp-laserjet_2100.ppd" + Attribute "Product" "" "(HP LaserJet 2100 Printer)" + Attribute "Product" "" "(HP LaserJet 2100m Printer)" +@@ -10124,7 +10125,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" @@ -639,7 +648,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -9523,7 +9524,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10140,7 +10141,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -648,7 +657,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -9536,7 +9537,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10153,7 +10154,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -657,7 +666,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -9549,7 +9550,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10166,7 +10167,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" @@ -666,7 +675,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -9565,7 +9566,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10182,7 +10183,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -675,7 +684,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -9576,7 +9577,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10193,7 +10194,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -684,7 +693,25 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -9626,7 +9627,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10221,7 +10222,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p3005" + Attribute "NickName" "" "HP LaserJet p3005 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p3005" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p3005;DES:hp laserjet p3005;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;DES:hp laserjet p3005;" + PCFileName "hp-laserjet_p3005-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p3005 Printer)" + Attribute "Product" "" "(HP LaserJet p3005d Printer)" +@@ -10234,7 +10235,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p3010 Series" + Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p3010 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p3010 series;DES:hp laserjet p3010 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;DES:hp laserjet p3010 series;" + PCFileName "hp-laserjet_p3010_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p3015 Printer)" + Attribute "Product" "" "(HP LaserJet p3011 Printer)" +@@ -10243,7 +10244,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -693,7 +720,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -9634,7 +9635,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10251,7 +10252,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -702,7 +729,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -9642,7 +9643,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10259,7 +10260,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" @@ -711,7 +738,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -9651,7 +9652,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10268,7 +10269,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -720,7 +747,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -9659,7 +9660,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10276,7 +10277,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -729,7 +756,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -9668,7 +9669,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10285,7 +10286,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -738,7 +765,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -9676,7 +9677,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10293,7 +10294,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -747,7 +774,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -9704,7 +9705,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10321,7 +10322,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -756,7 +783,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -9720,7 +9721,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10337,7 +10338,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -765,7 +792,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -9740,7 +9741,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10357,7 +10358,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -774,7 +801,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -9748,7 +9749,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10365,7 +10366,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -783,7 +810,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -9756,7 +9757,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10373,7 +10374,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -792,7 +819,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -9772,7 +9773,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10389,7 +10390,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" @@ -801,25 +828,34 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -9848,7 +9849,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10417,7 +10418,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p4014" + Attribute "NickName" "" "HP LaserJet p4014, $Version" + Attribute "ShortNickName" "" "HP LaserJet p4014" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014;DES:hp laserjet p4014;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P4014;DES:hp laserjet p4014;" + PCFileName "hp-laserjet_p4014.ppd" + Attribute "Product" "" "(HP LaserJet p4014 Printer)" + } +@@ -10465,7 +10466,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4050 series;DES:hp laserjet 4050 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series;DES:Hewlett-Packard LaserJet 4050 Series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;DES:Hewlett-Packard LaserJet 4050 Series;" PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -9860,7 +9861,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10477,7 +10478,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4100 series;DES:hp laserjet 4100 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series;DES:Hewlett-Packard LaserJet 4100 Series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;DES:Hewlett-Packard LaserJet 4100 Series;" PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -9888,7 +9889,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10505,7 +10506,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -828,7 +864,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -9913,7 +9914,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10530,7 +10531,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -837,7 +873,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -9925,7 +9926,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10542,7 +10543,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -846,7 +882,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -9938,7 +9939,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10555,7 +10556,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" @@ -855,7 +891,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -9949,7 +9950,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10566,7 +10567,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" @@ -864,7 +900,25 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -10020,7 +10021,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10585,7 +10586,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4350" + Attribute "NickName" "" "HP LaserJet 4350 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4350" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4350;DES:hp laserjet 4350;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;DES:hp laserjet 4350;" + PCFileName "hp-laserjet_4350-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4350 Printer)" + Attribute "Product" "" "(HP LaserJet 4350dtn Printer)" +@@ -10621,7 +10622,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p4515" + Attribute "NickName" "" "HP LaserJet p4515, $Version" + Attribute "ShortNickName" "" "HP LaserJet p4515" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4515;DES:hp laserjet p4515;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P4515;DES:hp laserjet p4515;" + PCFileName "hp-laserjet_p4515.ppd" + Attribute "Product" "" "(HP LaserJet p4515 Printer)" + } +@@ -10637,7 +10638,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" @@ -873,7 +927,16 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -10130,7 +10131,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10653,7 +10654,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 8000 Series" + Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 8000 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8000 series;DES:hp laserjet 8000 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;DES:hp laserjet 8000 series;" + PCFileName "hp-laserjet_8000_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 8000 Series Printer)" + } +@@ -10747,7 +10748,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -882,7 +945,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -10166,7 +10167,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10783,7 +10784,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" @@ -891,7 +954,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -10187,7 +10188,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10804,7 +10805,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" @@ -900,7 +963,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -10195,7 +10196,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10812,7 +10813,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" @@ -909,7 +972,25 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -10264,7 +10265,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10830,7 +10831,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5100 Series" + Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5100 series;DES:hp laserjet 5100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;DES:hp laserjet 5100 series;" + PCFileName "hp-laserjet_5100_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5100 Printer)" + Attribute "Product" "" "(HP LaserJet 5100le Printer)" +@@ -10861,7 +10862,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 8000" + Attribute "NickName" "" "HP LaserJet 8000, $Version" + Attribute "ShortNickName" "" "HP LaserJet 8000" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8000;DES:hp laserjet 8000;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;DES:hp laserjet 8000;" + PCFileName "hp-laserjet_8000.ppd" + Attribute "Product" "" "(HP LaserJet 8000 Printer)" + Attribute "Product" "" "(HP LaserJet 8000dn Printer)" +@@ -10881,7 +10882,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" @@ -918,7 +999,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -10477,7 +10478,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11094,7 +11095,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm1312nfi MFP" Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" @@ -927,7 +1008,16 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } -@@ -10501,7 +10502,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11110,7 +11111,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp1515n" + Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1515n;DES:hp color laserjet cp1515n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1515n;DES:hp color laserjet cp1515n;" + PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" + } +@@ -11118,7 +11119,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1518ni" Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" @@ -936,7 +1026,16 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" } -@@ -10541,7 +10542,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11150,7 +11151,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp2025n" + Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025n;DES:hp color laserjet cp2025n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025n;DES:hp color laserjet cp2025n;" + PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" + } +@@ -11158,7 +11159,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2300" @@ -945,7 +1044,43 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -10663,7 +10664,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11192,7 +11193,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm2320nf MFP" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM2320nf MFP;DES:hp color laserjet cm2320nf mfp;" + PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" + } +@@ -11200,7 +11201,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 2500" + Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 2500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500;DES:hp color laserjet 2500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;DES:hp color laserjet 2500;" + PCFileName "hp-color_laserjet_2500-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" + } +@@ -11241,7 +11242,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp3525" + Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp3525" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3525;DES:hp color laserjet cp3525;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;DES:hp color laserjet cp3525;" + PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" +@@ -11261,7 +11262,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3700" + Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700;DES:hp color laserjet 3700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;DES:hp color laserjet 3700;" + PCFileName "hp-color_laserjet_3700-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" + } +@@ -11280,7 +11281,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3800" Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3800" @@ -954,16 +1089,25 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -10710,7 +10711,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11319,7 +11320,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp4520 Series" + Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4520 series;DES:hp color laserjet cp4520 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4520 Series;DES:hp color laserjet cp4520 series;" + PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" + } +@@ -11327,7 +11328,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550;DES:Hewlett-Packard Color LaserJet 4550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;DES:Hewlett-Packard Color LaserJet 4550;" PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -10723,7 +10724,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11340,7 +11341,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" @@ -972,7 +1116,43 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -10821,7 +10822,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11352,7 +11353,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4600" + Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600;DES:hp color laserjet 4600;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:hp color laserjet 4600;" + PCFileName "hp-color_laserjet_4600-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" + } +@@ -11368,7 +11369,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4650" + Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4650" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4650;DES:hp color laserjet 4650;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;DES:hp color laserjet 4650;" + PCFileName "hp-color_laserjet_4650-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" +@@ -11380,7 +11381,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4700" + Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4700;DES:hp color laserjet 4700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;DES:hp color laserjet 4700;" + PCFileName "hp-color_laserjet_4700-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" +@@ -11392,7 +11393,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm4730 MFP" + Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4730 mfp;DES:hp color laserjet cm4730 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;DES:hp color laserjet cm4730 mfp;" + PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" +@@ -11438,7 +11439,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" @@ -981,7 +1161,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -10862,7 +10863,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11479,7 +11480,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" @@ -990,7 +1170,16 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -11154,7 +11155,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11514,7 +11515,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 5550" + Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 5550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 5550;DES:hp color laserjet 5550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 5550 ;DES:hp color laserjet 5550;" + PCFileName "hp-color_laserjet_5550-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 5550n Printer)" + Attribute "Product" "" "(HP Color LaserJet 5550 Printer)" +@@ -11771,7 +11772,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -999,7 +1188,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -11162,7 +11163,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11779,7 +11780,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -1008,7 +1197,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -11370,7 +11371,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11987,7 +11988,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1017,7 +1206,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -11534,7 +11535,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12151,7 +12152,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" Attribute "NickName" "" "HP Officejet Series 300, $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" @@ -1026,7 +1215,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -11558,7 +11559,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12175,7 +12176,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -1035,7 +1224,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -11575,7 +11576,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12192,7 +12193,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -1044,7 +1233,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -11700,7 +11701,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12317,7 +12318,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1053,7 +1242,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -11716,7 +11717,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12333,7 +12334,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1062,7 +1251,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -11829,7 +11830,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12446,7 +12447,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1071,7 +1260,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -11851,7 +11852,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12468,7 +12469,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 500" Attribute "NickName" "" "HP Officejet Series 500, $Version" Attribute "ShortNickName" "" "HP Officejet Series 500" @@ -1080,7 +1269,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_series_500.ppd" Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" } -@@ -11891,7 +11892,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12508,7 +12509,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" @@ -1089,7 +1278,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -11943,7 +11944,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12560,7 +12561,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1098,7 +1287,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -12095,7 +12096,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12712,7 +12713,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1107,7 +1296,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -12119,7 +12120,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12736,7 +12737,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1116,7 +1305,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -12139,7 +12140,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12756,7 +12757,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1125,7 +1314,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -12199,7 +12200,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12816,7 +12817,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" @@ -1134,7 +1323,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -12342,7 +12343,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12959,7 +12960,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" Attribute "NickName" "" "HP Officejet T Series, $Version" Attribute "ShortNickName" "" "HP Officejet T Series" @@ -1143,7 +1332,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -12353,7 +12354,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12970,7 +12971,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1152,7 +1341,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -12377,7 +12378,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12994,7 +12995,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1161,7 +1350,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -12385,7 +12386,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13002,7 +13003,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1170,7 +1359,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -12401,7 +12402,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13018,7 +13019,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1179,7 +1368,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -12409,7 +12410,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13026,7 +13027,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1188,7 +1377,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -12426,7 +12427,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13043,7 +13044,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1197,7 +1386,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -12434,7 +12435,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13051,7 +13052,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1206,7 +1395,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -12466,7 +12467,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13083,7 +13084,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1215,7 +1404,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -12474,7 +12475,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13091,7 +13092,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1224,7 +1413,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -12490,7 +12491,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13107,7 +13108,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1233,7 +1422,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -12499,7 +12500,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13116,7 +13117,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1242,7 +1431,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -12515,7 +12516,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13132,7 +13133,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1251,7 +1440,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -12632,7 +12633,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13249,7 +13250,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1260,7 +1449,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -12641,7 +12642,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13258,7 +13259,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1269,7 +1458,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -12752,7 +12753,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13369,7 +13370,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1278,7 +1467,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -12771,7 +12772,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13388,7 +13389,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1287,7 +1476,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -12782,7 +12783,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13399,7 +13400,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" @@ -1296,7 +1485,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -12896,7 +12897,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13513,7 +13514,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1305,7 +1494,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -12905,7 +12906,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13522,7 +13523,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" @@ -1314,7 +1503,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/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)" -@@ -13047,7 +13048,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13664,7 +13665,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1018" Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" @@ -1323,7 +1512,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1018.ppd" Attribute "Product" "" "(HP LaserJet 1018 Printer)" Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -13056,7 +13057,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13673,7 +13674,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1020" Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" @@ -1332,7 +1521,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -13524,7 +13525,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14150,7 +14151,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2600n" Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n" @@ -1341,7 +1530,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-color_laserjet_2600n.ppd" Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" } -@@ -13659,7 +13660,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14285,7 +14286,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" @@ -1350,7 +1539,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -13669,7 +13670,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14295,7 +14296,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" @@ -1359,7 +1548,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } -@@ -13963,7 +13964,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14589,7 +14590,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1006" Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" @@ -1368,7 +1557,7 @@ diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } -@@ -13971,7 +13972,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14597,7 +14598,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1007" Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch index 29dfd3d..f42c184 100644 --- a/hplip-deviceIDs-ppd.patch +++ b/hplip-deviceIDs-ppd.patch @@ -196,3 +196,311 @@ diff -up hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip *Product: "(HP LaserJet 4000 Series)" *Product: "(Hewlett-Packard HP LaserJet 4000 Series)" *ModelName: "HP LaserJet 4000 Series" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd 2010-12-03 16:12:33.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 2500)" + *Product: "(Hewlett-Packard hp color LaserJet 2500)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd 2010-12-03 16:12:11.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 2500)" + *Product: "(Hewlett-Packard hp color LaserJet 2500)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd 2010-12-03 16:12:57.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2550 series;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 2550 series)" + *Product: "(Hewlett-Packard hp color LaserJet 2550 series)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd 2010-12-03 16:13:58.000000000 +0100 +@@ -43,6 +43,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 3700)" + *Product: "(Hewlett-Packard hp color LaserJet 3700)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd 2010-12-03 16:13:23.000000000 +0100 +@@ -43,6 +43,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 3700)" + *Product: "(Hewlett-Packard hp color LaserJet 3700)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd 2010-12-03 16:14:24.000000000 +0100 +@@ -43,6 +43,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet 4550 )" + *Product: "(Hewlett-Packard HP Color LaserJet 4550 )" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd 2010-12-03 16:14:49.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 4600)" + *Product: "(Hewlett-Packard hp color LaserJet 4600)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd 2010-12-03 16:15:10.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 4600)" + *Product: "(Hewlett-Packard hp color LaserJet 4600)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd 2010-12-03 16:15:43.000000000 +0100 +@@ -47,6 +47,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 4650)" + *Product: "(Hewlett-Packard hp color LaserJet 4650)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd 2010-12-03 16:16:06.000000000 +0100 +@@ -49,6 +49,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet 4700)" + *Product: "(Hewlett-Packard HP Color LaserJet 4700)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd 2010-12-03 16:16:29.000000000 +0100 +@@ -46,6 +46,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 5550 ;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 5550 )" + *Product: "(Hewlett-Packard hp color LaserJet 5550 )" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd 2010-12-03 16:17:23.000000000 +0100 +@@ -49,6 +49,7 @@ + *%== Mac OS X specific end == + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet CM4730 MFP)" + *Product: "(Hewlett-Packard HP Color LaserJet CM4730 MFP)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd 2010-12-03 16:16:55.000000000 +0100 +@@ -51,6 +51,7 @@ + *%== Mac OS X specific end == + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet CP3525)" + *Product: "(Hewlett-Packard HP Color LaserJet CP3525)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd 2010-12-03 16:04:48.000000000 +0100 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 2100 Series)" + *Product: "(Hewlett-Packard HP LaserJet 2100 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;" + *PSVersion: "(2014.111) 1" + + *%================================================= +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd 2010-12-03 16:05:22.000000000 +0100 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 2100 Series)" + *Product: "(Hewlett-Packard HP LaserJet 2100 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;" + *PSVersion: "(2014.111) 1" + + *%================================================= +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd 2010-12-03 16:05:51.000000000 +0100 +@@ -60,6 +60,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2420)" + *Product: "(HP LaserJet 2420)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:24:27.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd 2010-12-03 16:03:05.000000000 +0100 +@@ -52,6 +52,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;" + *Product: "(HP LaserJet 4050 Series )" + *Product: "(Hewlett-Packard HP LaserJet 4050 Series )" + *Product: "(HP LaserJet 4050 Series)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd 2010-12-03 16:03:27.000000000 +0100 +@@ -51,6 +51,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;" + *Product: "(HP LaserJet 4100 Series )" + *Product: "(Hewlett-Packard HP LaserJet 4100 Series )" + *Product: "(HP LaserJet 4100 Series)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd 2010-12-03 16:06:31.000000000 +0100 +@@ -52,6 +52,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;" + *Product: "(hp LaserJet 4200)" + *Product: "(Hewlett-Packard hp LaserJet 4200)" + *Product: "(HP LaserJet 4200)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd 2010-12-03 16:07:07.000000000 +0100 +@@ -52,6 +52,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;" + *Product: "(hp LaserJet 4300)" + *Product: "(Hewlett-Packard hp LaserJet 4300)" + *Product: "(HP LaserJet 4300)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd 2010-12-03 16:07:37.000000000 +0100 +@@ -53,6 +53,7 @@ + *HPPDEPanel: "HPImagingOptions" + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;" + *Product: "(hp LaserJet 4350)" + *Product: "(Hewlett-Packard hp LaserJet 4350)" + *Product: "(HP LaserJet 4350)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd 2010-12-03 16:08:01.000000000 +0100 +@@ -53,6 +53,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;" + *Product: "(HP LaserJet 5100 Series)" + *Product: "(Hewlett-Packard HP LaserJet 5100 Series)" + *ModelName: "HP LaserJet 5100 Series" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd 2010-12-03 16:08:28.000000000 +0100 +@@ -55,6 +55,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;" + *ModelName: "HP LaserJet 8000 Series" + *ShortNickName: "HP LaserJet 8000 Series" + *NickName: "HP LaserJet 8000 Series Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd 2010-12-03 16:08:53.000000000 +0100 +@@ -55,6 +55,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;" + *ModelName: "HP LaserJet 8000 Series" + *ShortNickName: "HP LaserJet 8000 Series" + *NickName: "HP LaserJet 8000 Series Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd 2010-12-03 16:10:19.000000000 +0100 +@@ -56,6 +56,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;" + *ModelName: "HP LaserJet M3027 MFP" + *ShortNickName: "HP LaserJet M3027 MFP" + *NickName: "HP LaserJet M3027 MFP Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd 2010-12-03 16:10:41.000000000 +0100 +@@ -56,6 +56,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;" + *ModelName: "HP LaserJet M3035 MFP" + *ShortNickName: "HP LaserJet M3035 MFP" + *NickName: "HP LaserJet M3035 MFP Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd 2010-12-03 16:11:04.000000000 +0100 +@@ -57,6 +57,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;" + *ModelName: "HP LaserJet P3005" + *ShortNickName: "HP LaserJet P3005" + *NickName: "HP LaserJet P3005 Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd 2010-12-03 16:11:32.000000000 +0100 +@@ -51,6 +51,7 @@ + *%== Mac OS X specific end == + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;" + *Product: "(HP LaserJet P3015)" + *Product: "(Hewlett-Packard HP LaserJet P3015)" + *Product: "(HP LaserJet P3011)" diff --git a/hplip.spec b/hplip.spec index bbe1696..04e37a8 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.9 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -158,6 +158,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # HP Color LaserJet 2840 (bug #582215). # HP Color LaserJet CP1518ni (bug #613689). # HP Color LaserJet 2600n (bug #613712). +# HP LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series +# P3005/P3010 Series/P4014/P4515 (bug #659039) +# HP Color LaserJet 2500/3700/4550/4600/4650/4700/5550/CP1515n/CP2025n +# CP3525/CP4520 Series/CM2320nf/CM4730 MFP (bug #659040) %patch5 -p1 -b .deviceIDs-drv # Stopped hpcups pointlessly trying to read spool files @@ -204,6 +208,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # HP Color LaserJet 2605dn (bug #583953). # HP Color LaserJet 3800 (bug #581935). # HP Color LaserJet 2840 (bug #582215). +# HP LaserJet 4050 Series/4100 Series/2100 Series/2420/4200/4300/4350/5100 Series +# 8000 Series/M3027 MFP/M3035 MFP/P3005/P3010 Series (bug #659039) +# HP Color LaserJet 2500/2550/2605dn/3700/4550/4600 +# 4650/4700/5550/CP3525/CM4730 MFP (bug #659040) for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz @@ -485,6 +493,13 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Fri Dec 03 2010 Jiri Popelka 3.10.9-7 +- Corrected IEEE 1284 Device IDs: + HP LaserJet 4050/4100/2100 Series/2420/4200/4300/4350/5100/8000 + M3027 MFP/M3035 MFP/P3005/P3010/P4014/P4515 (bug #659039). + HP Color LaserJet 2500/2550 series/3700/4550/4600/4650/4700/5550 + CP1515n/CP3525/CP4520/CM2320nf MFP (bug #659040). + * Fri Nov 12 2010 Tim Waugh - 3.10.9-6 - Call cupsSetUser in cupsext's addPrinter method before connecting so that we can get an authentication callback (bug #538352).