diff --git a/.gitignore b/.gitignore index d3559b1..88b0a93 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ hplip-3.10.6.tar.gz /hplip-3.14.4.tar.gz /hplip-3.14.6.tar.gz /hplip-3.14.10.tar.gz +/hplip-3.15.2.tar.gz diff --git a/hplip-3.14.10.tar.gz.asc b/hplip-3.14.10.tar.gz.asc deleted file mode 100644 index 744305b..0000000 --- a/hplip-3.14.10.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlQzq2kACgkQc9dwzaWQR7kFZwCfVxHaORmTNA7jyexSGPKrXGoY -bWIAnjTK/xMAsx0un81KEWS/h2GFyB9V -=Vbpn ------END PGP SIGNATURE----- diff --git a/hplip-3.15.2.tar.gz.asc b/hplip-3.15.2.tar.gz.asc new file mode 100644 index 0000000..a072e81 --- /dev/null +++ b/hplip-3.15.2.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlTKJoUACgkQc9dwzaWQR7nT8gCdEy8HVaJNSA5ajtXet7YAGs5H +6NwAoLVDro3CLYkLqnwHIDTzR+leQgdM +=qmEP +-----END PGP SIGNATURE----- diff --git a/hplip-avahi-parsing.patch b/hplip-avahi-parsing.patch index 6e8ebca..029040b 100644 --- a/hplip-avahi-parsing.patch +++ b/hplip-avahi-parsing.patch @@ -1,19 +1,19 @@ -diff -up hplip-3.14.6/base/avahi.py.avahi-parsing hplip-3.14.6/base/avahi.py ---- hplip-3.14.6/base/avahi.py.avahi-parsing 2014-06-17 14:42:57.557586402 +0100 -+++ hplip-3.14.6/base/avahi.py 2014-06-17 14:45:56.104509934 +0100 -@@ -59,9 +59,13 @@ def detectNetworkDevices(ttl=4, timeout= - 'status_code': 0, 'device2': '0', 'device3': '0', 'note': ''} - y['ip'] = ip - y['hn'] = bits[6].replace('.local', '') -- details = bits[9].split('" "') -+ details = bits[9].rstrip ().strip ('"').split('" "') - for item in details: -- key, value = item.split('=', 1) -+ keyvalue = item.split('=', 1) -+ if len (keyvalue) < 2: -+ # Skip parts that don't match key=value -+ continue -+ key, value = keyvalue - if key == 'ty': - y['mdns'] = value - y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value +diff -up hplip-3.15.2/base/avahi.py.parsing hplip-3.15.2/base/avahi.py +--- hplip-3.15.2/base/avahi.py.parsing 2015-02-04 15:43:37.662551377 +0100 ++++ hplip-3.15.2/base/avahi.py 2015-02-04 15:45:56.576564858 +0100 +@@ -52,9 +52,14 @@ def detectNetworkDevices(ttl=4, timeout= + 'status_code': 0, 'device2': '0', 'device3': '0', 'note': ''} + y['ip'] = ip + y['hn'] = bits[6].replace('.local', '') +- details = bits[9].split('" "') ++ details = bits[9].rstrip ().strip ('"').split('" "') + for item in details: + key, value = item.split('=', 1) ++ keyvalue = item.split('=', 1) ++ if len (keyvalue) < 2: ++ # Skip parts that don't match key=value ++ continue ++ key, value = keyvalue + if key == 'ty': + y['mdns'] = value + y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value diff --git a/hplip-codec.patch b/hplip-codec.patch deleted file mode 100644 index 0c57a96..0000000 --- a/hplip-codec.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up hplip-3.14.6/base/utils.py.codec hplip-3.14.6/base/utils.py ---- hplip-3.14.6/base/utils.py.codec 2014-07-09 10:35:11.813576899 +0100 -+++ hplip-3.14.6/base/utils.py 2014-07-09 10:43:20.786495160 +0100 -@@ -463,7 +463,12 @@ def sort_dict_by_value(d): - - - def commafy(val): -- return locale.format("%d", val, grouping=True).decode(locale.getpreferredencoding()) -+ format = locale.format("%d", val, grouping=True) -+ encoding = locale.getlocale(locale.LC_NUMERIC)[1] -+ if encoding == None: -+ return format -+ -+ return format.decode(encoding) - - - def format_bytes(s, show_bytes=False): diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 81e2372..dc975b5 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,133 +1,7 @@ -diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/drv/hpcups.drv.in ---- hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv 2014-10-07 09:56:09.000000000 +0100 -+++ hplip-3.14.10/prnt/drv/hpcups.drv.in 2014-11-04 10:47:59.260551958 +0000 -@@ -473,7 +473,7 @@ Manufacturer "HP" - ModelName "HP Officejet v40xi" - Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet v40xi" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" - PCFileName "hp-officejet_v40xi.ppd" - Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" - } -@@ -481,7 +481,7 @@ Manufacturer "HP" - ModelName "HP Officejet v40" - Attribute "NickName" "" "HP Officejet v40, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet v40" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" - PCFileName "hp-officejet_v40.ppd" - Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -498,7 +498,7 @@ Manufacturer "HP" - ModelName "HP Officejet g55" - Attribute "NickName" "" "HP Officejet g55, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet g55" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" - PCFileName "hp-officejet_g55.ppd" - Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" - } -@@ -546,7 +546,7 @@ Manufacturer "HP" - ModelName "HP Officejet g85" - Attribute "NickName" "" "HP Officejet g85, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet g85" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" - PCFileName "hp-officejet_g85.ppd" - Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" - } -@@ -562,7 +562,7 @@ Manufacturer "HP" - ModelName "HP Officejet g95" - Attribute "NickName" "" "HP Officejet g95, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet g95" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" - PCFileName "hp-officejet_g95.ppd" - Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" - } -@@ -578,7 +578,7 @@ Manufacturer "HP" - ModelName "HP PSC 750xi" - Attribute "NickName" "" "HP PSC 750xi, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 750xi" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" - PCFileName "hp-psc_750xi.ppd" - Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" - } -@@ -586,7 +586,7 @@ Manufacturer "HP" - ModelName "HP PSC 750" - Attribute "NickName" "" "HP PSC 750, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 750" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" - PCFileName "hp-psc_750.ppd" - Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" - } -@@ -618,7 +618,7 @@ Manufacturer "HP" - ModelName "HP PSC 900 Series" - Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 900 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" - PCFileName "hp-psc_900_series.ppd" - Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" - } -@@ -634,7 +634,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 920c" - Attribute "NickName" "" "HP Deskjet 920c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 920c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 920c;DES:deskjet 920c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;" - PCFileName "hp-deskjet_920c.ppd" - Attribute "Product" "" "(HP Deskjet 920c Printer)" - Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -653,7 +653,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 930c" - Attribute "NickName" "" "HP Deskjet 930c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 930c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 930c;DES:deskjet 930c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;" - PCFileName "hp-deskjet_930c.ppd" - Attribute "Product" "" "(HP Deskjet 930c Printer)" - Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -694,7 +694,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 940c" - Attribute "NickName" "" "HP Deskjet 940c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 940c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 940c;DES:deskjet 940c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;" - PCFileName "hp-deskjet_940c.ppd" - Attribute "Product" "" "(HP Deskjet 940cvr Printer)" - Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -737,7 +737,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 950c" - Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 950c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" - PCFileName "hp-deskjet_950c.ppd" - Attribute "Product" "" "(HP Deskjet 950c Printer)" - } -@@ -770,7 +770,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 959c" - Attribute "NickName" "" "HP Deskjet 959c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 959c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 959c;DES:deskjet 959c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" - PCFileName "hp-deskjet_959c.ppd" - Attribute "Product" "" "(HP Deskjet 959c Printer)" - } -@@ -778,7 +778,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 970c" - Attribute "NickName" "" "HP Deskjet 970c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 970c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 970c;DES:deskjet 970c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;" - PCFileName "hp-deskjet_970c.ppd" - Attribute "Product" "" "(HP Deskjet 970cxi Printer)" - Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -798,7 +798,7 @@ Manufacturer "HP" +diff -up hplip-3.15.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.15.2/prnt/drv/hpcups.drv.in +--- hplip-3.15.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2015-01-29 13:21:00.000000000 +0100 ++++ hplip-3.15.2/prnt/drv/hpcups.drv.in 2015-02-04 14:20:39.756550038 +0100 +@@ -465,7 +465,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -136,7 +10,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -807,7 +807,7 @@ Manufacturer "HP" +@@ -474,7 +474,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -145,7 +19,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -841,7 +841,7 @@ Manufacturer "HP" +@@ -516,7 +516,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -154,7 +28,25 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -879,7 +879,7 @@ Manufacturer "HP" +@@ -542,7 +542,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40xi" + Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet v40xi" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40xi.ppd" + Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" + } +@@ -550,7 +550,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40" + Attribute "NickName" "" "HP Officejet v40, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet v40" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40.ppd" + Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" +@@ -579,7 +579,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -163,7 +55,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -887,7 +887,7 @@ Manufacturer "HP" +@@ -587,7 +587,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -172,6 +64,114 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } +@@ -604,7 +604,7 @@ Manufacturer "HP" + ModelName "HP Officejet g55" + Attribute "NickName" "" "HP Officejet g55, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g55" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g55.ppd" + Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" + } +@@ -644,7 +644,7 @@ Manufacturer "HP" + ModelName "HP PSC 750xi" + Attribute "NickName" "" "HP PSC 750xi, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 750xi" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750xi.ppd" + Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" + } +@@ -652,7 +652,7 @@ Manufacturer "HP" + ModelName "HP PSC 750" + Attribute "NickName" "" "HP PSC 750, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 750" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750.ppd" + Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" + } +@@ -700,7 +700,7 @@ Manufacturer "HP" + ModelName "HP Officejet g85" + Attribute "NickName" "" "HP Officejet g85, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g85" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g85.ppd" + Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" + } +@@ -716,7 +716,7 @@ Manufacturer "HP" + ModelName "HP PSC 900 Series" + Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 900 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" + PCFileName "hp-psc_900_series.ppd" + Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" + } +@@ -732,7 +732,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 920c" + Attribute "NickName" "" "HP Deskjet 920c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 920c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 920c;DES:deskjet 920c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;" + PCFileName "hp-deskjet_920c.ppd" + Attribute "Product" "" "(HP Deskjet 920c Printer)" + Attribute "Product" "" "(HP Deskjet 920cvr Printer)" +@@ -751,7 +751,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 930c" + Attribute "NickName" "" "HP Deskjet 930c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 930c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 930c;DES:deskjet 930c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;" + PCFileName "hp-deskjet_930c.ppd" + Attribute "Product" "" "(HP Deskjet 930c Printer)" + Attribute "Product" "" "(HP Deskjet 930cm Printer)" +@@ -792,7 +792,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 940c" + Attribute "NickName" "" "HP Deskjet 940c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 940c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 940c;DES:deskjet 940c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;" + PCFileName "hp-deskjet_940c.ppd" + Attribute "Product" "" "(HP Deskjet 940cvr Printer)" + Attribute "Product" "" "(HP Deskjet 940c Printer)" +@@ -811,7 +811,7 @@ Manufacturer "HP" + ModelName "HP Officejet g95" + Attribute "NickName" "" "HP Officejet g95, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g95" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g95.ppd" + Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" + } +@@ -843,7 +843,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 950c" + Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 950c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" + PCFileName "hp-deskjet_950c.ppd" + Attribute "Product" "" "(HP Deskjet 950c Printer)" + } +@@ -876,7 +876,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 959c" + Attribute "NickName" "" "HP Deskjet 959c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 959c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 959c;DES:deskjet 959c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" + PCFileName "hp-deskjet_959c.ppd" + Attribute "Product" "" "(HP Deskjet 959c Printer)" + } +@@ -884,7 +884,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 970c" + Attribute "NickName" "" "HP Deskjet 970c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 970c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 970c;DES:deskjet 970c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;" + PCFileName "hp-deskjet_970c.ppd" + Attribute "Product" "" "(HP Deskjet 970cxi Printer)" + Attribute "Product" "" "(HP Deskjet 970cse Printer)" @@ -938,7 +938,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version" @@ -190,16 +190,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1576,7 +1576,7 @@ Manufacturer "HP" - ModelName "HP Officejet D Series" - Attribute "NickName" "" "HP Officejet D Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet D Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet d series;DES:officejet d series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet d series;DES:officejet d series;" - PCFileName "hp-officejet_d_series.ppd" - Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" - Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1599,7 +1599,7 @@ Manufacturer "HP" +@@ -1609,7 +1609,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -208,7 +199,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1609,7 +1609,7 @@ Manufacturer "HP" +@@ -1619,7 +1619,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -217,7 +208,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1618,7 +1618,7 @@ Manufacturer "HP" +@@ -1628,7 +1628,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -226,7 +217,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1681,7 +1681,7 @@ Manufacturer "HP" +@@ -1658,7 +1658,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, hpcups $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -235,34 +226,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1689,7 +1689,7 @@ Manufacturer "HP" - ModelName "HP PSC 2100 Series" - Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2100 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2100 series;DES:psc 2100 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2100 Series;DES:psc 2100 series;" - PCFileName "hp-psc_2100_series.ppd" - Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" - Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1702,7 +1702,7 @@ Manufacturer "HP" - ModelName "HP PSC 2150 Series" - Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2150 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2150 series;DES:psc 2150 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2150 Series;DES:psc 2150 series;" - PCFileName "hp-psc_2150_series.ppd" - Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" - } -@@ -1710,7 +1710,7 @@ Manufacturer "HP" - ModelName "HP PSC 2170 Series" - Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2170 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2170 series;DES:psc 2170 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2170 Series;DES:psc 2170 series;" - PCFileName "hp-psc_2170_series.ppd" - Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" - Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1747,7 +1747,7 @@ Manufacturer "HP" +@@ -1666,7 +1666,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -271,6 +235,42 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" +@@ -1681,7 +1681,7 @@ Manufacturer "HP" + ModelName "HP Officejet D Series" + Attribute "NickName" "" "HP Officejet D Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet D Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet d series;DES:officejet d series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet d series;DES:officejet d series;" + PCFileName "hp-officejet_d_series.ppd" + Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" + Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" +@@ -1728,7 +1728,7 @@ Manufacturer "HP" + ModelName "HP PSC 2100 Series" + Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2100 series;DES:psc 2100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2100 Series;DES:psc 2100 series;" + PCFileName "hp-psc_2100_series.ppd" + Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" +@@ -1741,7 +1741,7 @@ Manufacturer "HP" + ModelName "HP PSC 2150 Series" + Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2150 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2150 series;DES:psc 2150 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2150 Series;DES:psc 2150 series;" + PCFileName "hp-psc_2150_series.ppd" + Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" + } +@@ -1749,7 +1749,7 @@ Manufacturer "HP" + ModelName "HP PSC 2170 Series" + Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2170 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2170 series;DES:psc 2170 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2170 Series;DES:psc 2170 series;" + PCFileName "hp-psc_2170_series.ppd" + Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" @@ -1977,7 +1977,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version" @@ -307,7 +307,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2539,7 +2539,7 @@ Manufacturer "HP" +@@ -2522,7 +2522,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -316,7 +316,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2557,7 +2557,7 @@ Manufacturer "HP" +@@ -2540,7 +2540,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -325,7 +325,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-psc_2300_series.ppd" Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2566,7 +2566,7 @@ Manufacturer "HP" +@@ -2549,7 +2549,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -334,16 +334,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2583,7 +2583,7 @@ Manufacturer "HP" - ModelName "HP PSC 2400 Series" - Attribute "NickName" "" "HP PSC 2400 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 2400 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;" -+ Attribute "1284DeviceID" "" "MFG:hp;MDL:psc 2400 series;" - 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)" -@@ -2609,7 +2609,7 @@ Manufacturer "HP" +@@ -2592,7 +2592,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -352,7 +343,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3057,7 +3057,7 @@ Manufacturer "HP" +@@ -3040,7 +3040,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -361,7 +352,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3143,7 +3143,7 @@ Manufacturer "HP" +@@ -3126,7 +3126,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -370,16 +361,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3198,7 +3198,7 @@ Manufacturer "HP" - ModelName "HP Officejet 6300 Series" - Attribute "NickName" "" "HP Officejet 6300 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet 6300 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6300 series;DES:officejet 6300 series;" -+ Attribute "1284DeviceID" "" "MFG:HP;MDL:Officejet 6300 series;" - PCFileName "hp-officejet_6300_series.ppd" - Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3367,7 +3367,7 @@ Manufacturer "HP" +@@ -3350,7 +3350,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -415,15 +397,6 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -11679,7 +11679,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 3940" - Attribute "NickName" "" "HP Deskjet 3940, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 3940" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3940;DES:deskjet 3940;" -+ Attribute "1284DeviceID" "" "MFG:HP;MDL:Deskjet 3900;DES:3940;" - PCFileName "hp-deskjet_3940.ppd" - Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" - Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" @@ -11688,7 +11688,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version" @@ -442,7 +415,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -12042,7 +12042,7 @@ Manufacturer "HP" +@@ -12026,7 +12026,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -451,7 +424,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -12102,7 +12102,7 @@ Manufacturer "HP" +@@ -12086,7 +12086,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -468,602 +441,6 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -13035,7 +13036,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4 Plus" - Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4 Plus" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4 plus;DES:hp laserjet 4 plus;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4 Plus;DES:hp laserjet 4 plus;" - PCFileName "hp-laserjet_4_plus-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" - Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -13061,7 +13062,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5l" - Attribute "NickName" "" "HP LaserJet 5l, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 5l" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5l;DES:hp laserjet 5l;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5L;DES:Hewlett-Packard LaserJet 5L Printer;" - PCFileName "hp-laserjet_5l.ppd" - Attribute "Product" "" "(HP LaserJet 5l Printer)" - Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -13071,7 +13072,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5mp" - Attribute "NickName" "" "HP LaserJet 5mp pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 5mp" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;" - PCFileName "hp-laserjet_5mp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 5mp Printer)" - } -@@ -13079,7 +13080,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5p" - Attribute "NickName" "" "HP LaserJet 5p, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 5p" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5p;DES:hp laserjet 5p;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5P;DES:Hewlett-Packard LaserJet 5P Printer;" - PCFileName "hp-laserjet_5p.ppd" - Attribute "Product" "" "(HP LaserJet 5p Printer)" - } -@@ -13087,7 +13088,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 6l" - Attribute "NickName" "" "HP LaserJet 6l, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 6l" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6l;DES:hp laserjet 6l;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6L;DES:hp laserjet 6l;" - PCFileName "hp-laserjet_6l.ppd" - Attribute "Product" "" "(HP LaserJet 6l Printer)" - Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -13099,7 +13100,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 6p" - Attribute "NickName" "" "HP LaserJet 6p, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 6p" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6p;DES:hp laserjet 6p;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6P;DES:Hewlett-Packard LaserJet 6P Printer;" - PCFileName "hp-laserjet_6p.ppd" - Attribute "Product" "" "(HP LaserJet 6p Printer)" - } -@@ -13107,7 +13108,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 6mp" - Attribute "NickName" "" "HP LaserJet 6mp pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 6mp" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6mp;DES:hp laserjet 6mp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6MP;DES:Hewlett-Packard LaserJet 6MP Printer;" - PCFileName "hp-laserjet_6mp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 6mp Printer)" - Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -13117,7 +13118,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1015" - Attribute "NickName" "" "HP LaserJet 1015, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1015" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1015;DES:hp laserjet 1015;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1015;DES:hp laserjet 1015;" - PCFileName "hp-laserjet_1015.ppd" - Attribute "Product" "" "(HP LaserJet 1015 Printer)" - } -@@ -13167,7 +13168,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1100" - Attribute "NickName" "" "HP LaserJet 1100, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1100" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1100;DES:hp laserjet 1100;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100 Printer;" - PCFileName "hp-laserjet_1100.ppd" - Attribute "Product" "" "(HP LaserJet 1100 Printer)" - Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -13177,7 +13178,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1150" - Attribute "NickName" "" "HP LaserJet 1150, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1150" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1150;DES:hp laserjet 1150;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1150;DES:Hewlett-Packard LaserJet 1150;" - PCFileName "hp-laserjet_1150.ppd" - Attribute "Product" "" "(HP LaserJet 1150 Printer)" - } -@@ -13194,7 +13195,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1160 Series" - Attribute "NickName" "" "HP LaserJet 1160 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1160 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1160 series;DES:hp laserjet 1160 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1160 series;DES:Hewlett-Packard LaserJet 1160 series;" - PCFileName "hp-laserjet_1160_series.ppd" - Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" - } -@@ -13202,7 +13203,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1200" - Attribute "NickName" "" "HP LaserJet 1200 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1200" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1200;DES:hp laserjet 1200;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:hp laserjet 1200;" - PCFileName "hp-laserjet_1200-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 1200 Printer)" - Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -13227,7 +13228,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1220" - Attribute "NickName" "" "HP LaserJet 1220 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1220" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1220;DES:hp laserjet 1220;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1220;DES:Hewlett-Packard LaserJet 1220;" - PCFileName "hp-laserjet_1220-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" - } -@@ -13235,7 +13236,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1300" - Attribute "NickName" "" "HP LaserJet 1300 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1300" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1300;DES:hp laserjet 1300;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" - PCFileName "hp-laserjet_1300-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 1300 Printer)" - Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -13260,7 +13261,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1320 Series" - Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1320 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320 series;DES:hp laserjet 1320 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - PCFileName "hp-laserjet_1320_series-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" - } -@@ -13284,7 +13285,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1320" - Attribute "NickName" "" "HP LaserJet 1320, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1320" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320;DES:hp laserjet 1320;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - PCFileName "hp-laserjet_1320.ppd" - Attribute "Product" "" "(HP LaserJet 1320 Printer)" - Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -13309,7 +13310,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m1522nf MFP" - Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1522nf mfp;DES:hewlett-packard laserjet m1522nf mfp;" - PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)" - } -@@ -13381,7 +13382,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p2015 Series" - Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet p2015 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2015 series;DES:hp laserjet p2015 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" - PCFileName "hp-laserjet_p2015_series-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet p2015 Printer)" - } -@@ -13405,7 +13406,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 pcl3, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p2035" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2035;" - PCFileName "hp-laserjet_p2035-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet p2035 Printer)" - } -@@ -13445,7 +13446,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2100" - Attribute "NickName" "" "HP LaserJet 2100, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2100" -- 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)" -@@ -13457,7 +13458,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2100 Series" - Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2100 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100 series;DES:hp laserjet 2100 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;" - PCFileName "hp-laserjet_2100_series-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" - } -@@ -13465,7 +13466,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2200 Series" - Attribute "NickName" "" "HP LaserJet 2200 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2200 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200 series;DES:hp laserjet 2200 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" - PCFileName "hp-laserjet_2200_series.ppd" - Attribute "Product" "" "(HP LaserJet 2200 Series Printer)" - } -@@ -13473,7 +13474,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2200" - Attribute "NickName" "" "HP LaserJet 2200 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2200" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200;DES:hp laserjet 2200;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;" - PCFileName "hp-laserjet_2200-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 2200 Printer)" - Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -13486,7 +13487,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2300" - Attribute "NickName" "" "HP LaserJet 2300 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2300" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300;DES:hp laserjet 2300;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" - PCFileName "hp-laserjet_2300-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 2300 Printer)" - Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -13499,7 +13500,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2300 Series" - Attribute "NickName" "" "HP LaserJet 2300 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2300 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300 series;DES:hp laserjet 2300 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" - PCFileName "hp-laserjet_2300_series.ppd" - Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" - } -@@ -13515,7 +13516,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2420" - Attribute "NickName" "" "HP LaserJet 2420 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2420" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2420;DES:hp laserjet 2420;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;DES:Hewlett-Packard LaserJet 2420;" - PCFileName "hp-laserjet_2420-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 2420 Printer)" - Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -13526,7 +13527,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2430" - Attribute "NickName" "" "HP LaserJet 2430 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2430" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2430;DES:hp laserjet 2430;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2430;DES:Hewlett-Packard LaserJet 2430;" - PCFileName "hp-laserjet_2430-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 2430t Printer)" - Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -13554,7 +13555,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p3005" - Attribute "NickName" "" "HP LaserJet p3005 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet p3005" -- 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)" -@@ -13567,7 +13568,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p3010 Series" - Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet p3010 Series" -- 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)" -@@ -13576,7 +13577,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3015" - Attribute "NickName" "" "HP LaserJet 3015 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3015" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3015;DES:hp laserjet 3015;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3015;DES:Hewlett-Packard LaserJet 3015;" - PCFileName "hp-laserjet_3015-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" - } -@@ -13584,7 +13585,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3020" - Attribute "NickName" "" "HP LaserJet 3020 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3020" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3020;DES:hp laserjet 3020;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 3020;DES:Hewlett-Packard LaserJet 3020;" - PCFileName "hp-laserjet_3020-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" - } -@@ -13592,7 +13593,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m3027 MFP" - Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3027 mfp;DES:hp laserjet m3027 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;DES:Hewlett-Packard LaserJet M3027 MFP;" - PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" - Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -13601,7 +13602,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3030" - Attribute "NickName" "" "HP LaserJet 3030 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3030" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3030;DES:hp laserjet 3030;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3030;DES:Hewlett-Packard LaserJet 3030;" - PCFileName "hp-laserjet_3030-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" - } -@@ -13609,7 +13610,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3050" - Attribute "NickName" "" "HP LaserJet 3050 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3050" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3050;DES:hp laserjet 3050;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3050;DES:Hewlett-Packard LaserJet 3050;" - PCFileName "hp-laserjet_3050-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" - Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -13618,7 +13619,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3052" - Attribute "NickName" "" "HP LaserJet 3052 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3052" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3052;DES:hp laserjet 3052;" -+ Attribute "1284DeviceID" "" "MFG:HEwlett-Packard;MDL:HP LaserJet 3052;DES:Hewlett-Packard LaserJet 3052;" - PCFileName "hp-laserjet_3052-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" - } -@@ -13626,7 +13627,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3055" - Attribute "NickName" "" "HP LaserJet 3055, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3055" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3055;DES:hp laserjet 3055;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3055;DES:Hewlett-Packard LaserJet 3055;" - PCFileName "hp-laserjet_3055.ppd" - Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" - } -@@ -13654,7 +13655,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3200m" - Attribute "NickName" "" "HP LaserJet 3200m pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3200m" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200m;DES:hp laserjet 3200m;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200M;DES:Hewlett-Packard LaserJet 3200M;" - PCFileName "hp-laserjet_3200m-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" - } -@@ -13670,7 +13671,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3200" - Attribute "NickName" "" "HP LaserJet 3200, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3200" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200;DES:hp laserjet 3200;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200;DES:Hewlett-Packard LaserJet 3200;" - PCFileName "hp-laserjet_3200.ppd" - Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" - } -@@ -13690,7 +13691,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3330" - Attribute "NickName" "" "HP LaserJet 3330, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3330" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3330;DES:hp laserjet 3330;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3330;DES:Hewlett-Packard LaserJet 3330;" - PCFileName "hp-laserjet_3330.ppd" - Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" - } -@@ -13698,7 +13699,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3380" - Attribute "NickName" "" "HP LaserJet 3380 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3380" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3380;DES:hp laserjet 3380;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3380;DES:Hewlett-Packard LaserJet 3380;" - PCFileName "hp-laserjet_3380-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" - } -@@ -13706,7 +13707,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3390" - Attribute "NickName" "" "HP LaserJet 3390 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 3390" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3390;DES:hp laserjet 3390;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;" - PCFileName "hp-laserjet_3390-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" - } -@@ -13722,7 +13723,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4000 Series" - Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4000 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4000 series;DES:hp laserjet 4000 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;" - PCFileName "hp-laserjet_4000_series-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 4000 Printer)" - Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -13742,7 +13743,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p4014" - Attribute "NickName" "" "HP LaserJet p4014, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet p4014" -- 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)" - } -@@ -13798,7 +13799,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4050 Series" - Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4050 Series" -- 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;" - PCFileName "hp-laserjet_4050_series-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 4050 Printer)" - Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -13819,7 +13820,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4100 Series" - Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4100 Series" -- 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;" - PCFileName "hp-laserjet_4100_series-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 410dtn Printer)" - Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -13838,7 +13839,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4200" - Attribute "NickName" "" "HP LaserJet 4200 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4200" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4200;DES:hp laserjet 4200;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;DES:Hewlett-Packard LaserJet 4200;" - PCFileName "hp-laserjet_4200-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 4200 Printer)" - Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -13863,7 +13864,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4250" - Attribute "NickName" "" "HP LaserJet 4250 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4250" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4250;DES:hp laserjet 4250;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" - PCFileName "hp-laserjet_4250-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 4250 Printer)" - Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -13875,7 +13876,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4300" - Attribute "NickName" "" "HP LaserJet 4300 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4300" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4300;DES:hp laserjet 4300;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;DES:hp laserjet 4300;" - PCFileName "hp-laserjet_4300-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 4300 Printer)" - Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -13888,7 +13889,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4345 MFP" - Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4345 mfp;DES:hp laserjet 4345 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4345 mfp;DES:hp laserjet 4345 mfp;" - PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" - Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -13899,7 +13900,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m4345 MFP" - Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m4345 mfp;DES:hp laserjet m4345 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M4345 MFP;DES:Hewlett-Packard LaserJet M4345 MFP;" - PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" - Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -13918,7 +13919,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4350" - Attribute "NickName" "" "HP LaserJet 4350 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 4350" -- 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)" -@@ -13954,7 +13955,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p4515" - Attribute "NickName" "" "HP LaserJet p4515, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet p4515" -- 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)" - } -@@ -13970,7 +13971,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5000 Series" - Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 5000 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5000 series;DES:hp laserjet 5000 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5000 Series;DES:Hewlett-Packard LaserJet 5000 Series;" - PCFileName "hp-laserjet_5000_series-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" - } -@@ -13986,7 +13987,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 8000 Series" - Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 8000 Series" -- 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)" - } -@@ -14080,7 +14081,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5si" - Attribute "NickName" "" "HP LaserJet 5si pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 5si" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5si;DES:hp laserjet 5si;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5Si;DES:;" - PCFileName "hp-laserjet_5si-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 5si Printer)" - Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -14116,7 +14117,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m3035 MFP" - Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3035 mfp;DES:hp laserjet m3035 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;DES:Hewlett-Packard LaserJet M3035 MFP;" - PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" - Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -14137,7 +14138,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m5025 MFP" - Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5025 mfp;DES:hp laserjet m5025 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5025 MFP;DES:Hewlett-Packard LaserJet M5025 MFP;" - PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" - } -@@ -14145,7 +14146,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m5035 MFP" - Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5035 mfp;DES:hp laserjet m5035 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5035 MFP;DES:Hewlett-Packard LaserJet M5035 MFP;" - PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" - Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -14163,7 +14164,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5100 Series" - Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 5100 Series" -- 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)" -@@ -14194,7 +14195,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 8000" - Attribute "NickName" "" "HP LaserJet 8000, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 8000" -- 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)" -@@ -14214,7 +14215,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 8150 Series" - Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 8150 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8150 series;DES:hp laserjet 8150 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;" - PCFileName "hp-laserjet_8150_series-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 8150 Printer)" - Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -14418,7 +14419,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm1312nfi MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;" - PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" - } -@@ -14506,7 +14507,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp1515n" - Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" -- 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)" - } -@@ -14514,7 +14515,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp1518ni" - Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1518ni;DES:hp color laserjet cp1518ni;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1518ni;DES:Hewlett-Packard Color LaserJet CP1518ni;" - PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" - } -@@ -14522,7 +14523,9 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp2025dn" - Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025dn;DES:Hewlett-Packard Color LaserJet CP2025dn;" -+ // DNS-SD response has no usb_* keys, just ty/product -+ Attribute "1284DeviceID" "" "MFG:HP;MDL:Color LaserJet CP2025dn;" - PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" - } -@@ -14538,7 +14541,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp2025n" - Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" -- 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)" - } @@ -14554,7 +14557,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, hpcups $Version" @@ -1073,132 +450,6 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -14564,7 +14567,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 2500" - Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 2500" -- 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)" - } -@@ -14605,7 +14608,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp3525" - Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp3525" -- 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)" -@@ -14616,7 +14619,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm3530 MFP" - Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;DES:hp color laserjet cm3530 mfp;" - PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" -@@ -14625,7 +14628,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3700" - Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 3700" -- 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)" - } -@@ -14644,7 +14647,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3800" - Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 3800" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;" - PCFileName "hp-color_laserjet_3800-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" - Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -14655,7 +14658,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp4005" - Attribute "NickName" "" "HP Color LaserJet cp4005 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp4005" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;" - PCFileName "hp-color_laserjet_cp4005-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp4005n Printer)" - Attribute "Product" "" "(HP Color LaserJet cp4005dn Printer)" -@@ -14683,7 +14686,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp4520 Series" - Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" -- 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)" - } -@@ -14691,7 +14694,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm4540 MFP" - Attribute "NickName" "" "HP Color LaserJet cm4540 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm4540 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4540 mfp;DES:hp color laserjet cm4540 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;DES:HP Color LaserJet CM4540 MFP;" - PCFileName "hp-color_laserjet_cm4540_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm4540 Multifunction Printer)" - } -@@ -14699,7 +14702,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4550" - Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4550" -- 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;" - PCFileName "hp-color_laserjet_4550-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -14712,7 +14715,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4600 Series" - Attribute "NickName" "" "HP Color LaserJet 4600 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" - PCFileName "hp-color_laserjet_4600_series.ppd" - Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -14724,7 +14727,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4600" - Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4600" -- 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)" - } -@@ -14740,7 +14743,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4650" - Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4650" -- 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)" -@@ -14752,7 +14755,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4700" - Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4700" -- 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)" -@@ -14764,7 +14767,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm4730 MFP" - Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" -- 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)" @@ -14818,7 +14821,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, hpcups $Version" @@ -1208,15 +459,6 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_9100_series-pcl3.ppd" Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" -@@ -14846,7 +14849,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm2320nf MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" -- 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)" - } @@ -14902,7 +14905,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, hpcups $Version" @@ -1226,34 +468,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -14937,7 +14940,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 5550" - Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 5550" -- 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)" -@@ -15194,7 +15197,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1010" - Attribute "NickName" "" "HP LaserJet 1010, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1010" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1010;DES:hp laserjet 1010;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1010;DES:Hewlett-Packard LaserJet 1010;" - PCFileName "hp-laserjet_1010.ppd" - Attribute "Product" "" "(HP LaserJet 1010 Printer)" - } -@@ -15202,7 +15205,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1012" - Attribute "NickName" "" "HP LaserJet 1012, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 1012" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1012;DES:hp laserjet 1012;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1012;DES:hp laserjet 1012;" - PCFileName "hp-laserjet_1012.ppd" - Attribute "Product" "" "(HP LaserJet 1012 Printer)" - } -@@ -15410,7 +15413,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15445,7 +15448,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1316,7 +531,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -15923,7 +15926,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15931,7 +15934,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" @@ -1325,7 +540,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -15975,7 +15978,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15983,7 +15986,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1370,61 +585,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -16374,7 +16377,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet T Series" - Attribute "NickName" "" "HP Officejet T Series, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet T Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet t series;DES:officejet t series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;" - PCFileName "hp-officejet_t_series.ppd" - Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" - Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -16385,7 +16388,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet r40" - Attribute "NickName" "" "HP Officejet r40, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet r40" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r40;DES:officejet r40;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;" - PCFileName "hp-officejet_r40.ppd" - Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" - } -@@ -16409,7 +16412,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet r60" - Attribute "NickName" "" "HP Officejet r60, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet r60" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r60;DES:officejet r60;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;" - PCFileName "hp-officejet_r60.ppd" - Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" - } -@@ -16417,7 +16420,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet r65" - Attribute "NickName" "" "HP Officejet r65, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet r65" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r65;DES:officejet r65;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;" - PCFileName "hp-officejet_r65.ppd" - Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" - } -@@ -16433,7 +16436,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet r80" - Attribute "NickName" "" "HP Officejet r80, hpcups $Version" - Attribute "ShortNickName" "" "HP Officejet r80" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r80;DES:officejet r80;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;" - PCFileName "hp-officejet_r80.ppd" - Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" - } -@@ -16441,7 +16444,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP PSC 500" - Attribute "NickName" "" "HP PSC 500, hpcups $Version" - Attribute "ShortNickName" "" "HP PSC 500" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 500;DES:psc 500;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;" - PCFileName "hp-psc_500.ppd" - Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" - Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -16458,7 +16461,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16382,7 +16385,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1433,7 +594,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -16466,7 +16469,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16390,7 +16393,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1442,7 +603,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -16498,7 +16501,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16422,7 +16425,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1451,7 +612,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -16506,7 +16509,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16430,7 +16433,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1460,7 +621,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -16522,7 +16525,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16446,7 +16449,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1469,7 +630,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -16531,7 +16534,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16455,7 +16458,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1478,7 +639,7 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -16547,7 +16550,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16471,7 +16474,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1487,6 +648,60 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" +@@ -16481,7 +16484,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r40" + Attribute "NickName" "" "HP Officejet r40, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet r40" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r40;DES:officejet r40;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;" + PCFileName "hp-officejet_r40.ppd" + Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" + } +@@ -16505,7 +16508,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r60" + Attribute "NickName" "" "HP Officejet r60, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet r60" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r60;DES:officejet r60;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;" + PCFileName "hp-officejet_r60.ppd" + Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" + } +@@ -16513,7 +16516,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r65" + Attribute "NickName" "" "HP Officejet r65, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet r65" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r65;DES:officejet r65;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;" + PCFileName "hp-officejet_r65.ppd" + Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" + } +@@ -16521,7 +16524,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r80" + Attribute "NickName" "" "HP Officejet r80, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet r80" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r80;DES:officejet r80;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;" + PCFileName "hp-officejet_r80.ppd" + Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" + } +@@ -16537,7 +16540,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet T Series" + Attribute "NickName" "" "HP Officejet T Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet T Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet t series;DES:officejet t series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;" + PCFileName "hp-officejet_t_series.ppd" + Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" +@@ -16548,7 +16551,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP PSC 500" + Attribute "NickName" "" "HP PSC 500, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 500;DES:psc 500;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;" + PCFileName "hp-psc_500.ppd" + Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" @@ -16664,7 +16667,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version" @@ -1506,24 +721,6 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" @@ -16784,7 +16787,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Deskjet 850c" - Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 850c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 850c;DES:deskjet 850c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;" - PCFileName "hp-deskjet_850c.ppd" - Attribute "Product" "" "(HP Deskjet 850k Printer)" - Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -16803,7 +16806,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Deskjet 870c" - Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 870c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 870c;DES:deskjet 870c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;" - PCFileName "hp-deskjet_870c.ppd" - Attribute "Product" "" "(HP Deskjet 870k Printer)" - Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -16814,7 +16817,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" @@ -1532,16 +729,25 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d PCFileName "hp-officejet_pro_1150c.ppd" Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" +@@ -16793,7 +16796,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 850c" + Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 850c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 850c;DES:deskjet 850c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;" + PCFileName "hp-deskjet_850c.ppd" + Attribute "Product" "" "(HP Deskjet 850k Printer)" + Attribute "Product" "" "(HP Deskjet 850c Printer)" +@@ -16812,7 +16815,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 870c" + Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 870c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 870c;DES:deskjet 870c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;" + PCFileName "hp-deskjet_870c.ppd" + Attribute "Product" "" "(HP Deskjet 870k Printer)" + Attribute "Product" "" "(HP Deskjet 870c Printer)" @@ -16928,7 +16931,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Deskjet 890c" - Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version" - Attribute "ShortNickName" "" "HP Deskjet 890c" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 890c;DES:deskjet 890c;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;" - PCFileName "hp-deskjet_890c.ppd" - Attribute "Product" "" "(HP Deskjet 890cse Printer)" - Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -16937,7 +16940,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" @@ -1550,156 +756,12 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.14.10/prnt/d 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)" -@@ -17079,7 +17082,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1018" - Attribute "NickName" "" "HP LaserJet 1018, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1018" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1018;DES:HP LaserJet 1018;" - PCFileName "hp-laserjet_1018.ppd" - Attribute "Product" "" "(HP LaserJet 1018 Printer)" - Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -17088,7 +17091,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1020" - Attribute "NickName" "" "HP LaserJet 1020, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet 1020" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1020;DES:HP LaserJet 1020;" - PCFileName "hp-laserjet_1020.ppd" - Attribute "Product" "" "(HP LaserJet 1020 Printer)" - Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -17122,7 +17125,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m1120 MFP" - Attribute "NickName" "" "HP LaserJet m1120 MFP, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" - PCFileName "hp-laserjet_m1120_mfp.ppd" - Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)" - } -@@ -17138,7 +17141,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m1319f MFP" - Attribute "NickName" "" "HP LaserJet m1319f MFP, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" - PCFileName "hp-laserjet_m1319f_mfp.ppd" - Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)" - } -@@ -17154,7 +17157,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 zjs, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p2035" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2035;" - PCFileName "hp-laserjet_p2035-zjs.ppd" - Attribute "Product" "" "(HP LaserJet p2035 Printer)" - } -@@ -17246,7 +17249,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional p1102w" - Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet Professional p1102w" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" - PCFileName "hp-laserjet_professional_p1102w.ppd" - Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)" - } -@@ -17254,7 +17257,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional p1102" - Attribute "NickName" "" "HP LaserJet Professional p1102, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet Professional p1102" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" - PCFileName "hp-laserjet_professional_p1102.ppd" - Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)" - Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)" -@@ -17335,7 +17338,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional m1132 MFP" - Attribute "NickName" "" "HP LaserJet Professional m1132 MFP, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LJ Professional m1132 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1132 mfp;DES:hp laserjet professional m1132 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional m1132 mfp;DES:hp laserjet professional m1132 mfp;" - PCFileName "hp-laserjet_professional_m1132_mfp.ppd" - Attribute "Product" "" "(HP LaserJet Professional m1132 Multifunction Printer)" - Attribute "Product" "" "(HP LaserJet Professional m1132s Multifunction Printer)" -@@ -17376,7 +17379,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional m1212nf MFP" - Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1212nf mfp;DES:hp laserjet professional m1212nf mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet Professional M1212nf MFP;" - PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd" - Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" - } -@@ -17612,7 +17615,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional p1606dn" - Attribute "NickName" "" "HP LaserJet Professional p1606dn, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LJ Professional p1606dn" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1606dn;DES:hp laserjet professional p1606dn;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet Professional P1606dn;" - PCFileName "hp-laserjet_professional_p1606dn.ppd" - Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)" - } -@@ -17786,7 +17789,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 2600n" - Attribute "NickName" "" "HP Color LaserJet 2600n, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet 2600n" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2600n;DES:HP Color LaserJet 2600n;" - PCFileName "hp-color_laserjet_2600n.ppd" - Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" - } -@@ -18304,7 +18307,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3500" - Attribute "NickName" "" "HP Color LaserJet 3500, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet 3500" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3500;DES:hp color laserjet 3500;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3500;DES:Hewlett-Packard color LaserJet 3500;" - PCFileName "hp-color_laserjet_3500.ppd" - Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" - Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -18314,7 +18317,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3550" - Attribute "NickName" "" "HP Color LaserJet 3550, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP Color LaserJet 3550" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3550;DES:hp color laserjet 3550;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3550;DES:Hewlett-Packard color LaserJet 3550;" - PCFileName "hp-color_laserjet_3550.ppd" - Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" - } -@@ -18466,7 +18469,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p1505" - Attribute "NickName" "" "HP LaserJet p1505, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1505" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1505;DES:HP LaserJet P1505;" - PCFileName "hp-laserjet_p1505.ppd" - Attribute "Product" "" "(HP LaserJet p1505 Printer)" - } -@@ -18600,7 +18603,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p1005" - Attribute "NickName" "" "HP LaserJet p1005, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1005" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1005;" - PCFileName "hp-laserjet_p1005.ppd" - Attribute "Product" "" "(HP LaserJet p1005 Printer)" - } -@@ -18608,7 +18611,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p1006" - Attribute "NickName" "" "HP LaserJet p1006, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1006" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1006;DES:HP LaserJet P1006;" - PCFileName "hp-laserjet_p1006.ppd" - Attribute "Product" "" "(HP LaserJet p1006 Printer)" - } -@@ -18616,7 +18619,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p1007" - Attribute "NickName" "" "HP LaserJet p1007, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1007" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1007;DES:HP LaserJet P1007;" - PCFileName "hp-laserjet_p1007.ppd" - Attribute "Product" "" "(HP LaserJet p1007 Printer)" - } +@@ -16941,7 +16944,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 890c" + Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 890c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 890c;DES:deskjet 890c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;" + PCFileName "hp-deskjet_890c.ppd" + Attribute "Product" "" "(HP Deskjet 890cse Printer)" + Attribute "Product" "" "(HP Deskjet 890c Printer)" diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch index c869e03..810fdc3 100644 --- a/hplip-deviceIDs-ppd.patch +++ b/hplip-deviceIDs-ppd.patch @@ -1,597 +1,3 @@ -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd 2013-07-23 12:41:46.653625035 +0200 -@@ -42,6 +42,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.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd 2013-07-23 12:41:46.654625021 +0200 -@@ -42,6 +42,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.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd 2013-07-23 12:41:46.655625007 +0200 -@@ -42,6 +42,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.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd 2013-07-23 12:41:46.656624993 +0200 -@@ -46,6 +46,7 @@ - - *% Product Name and Version Information - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2605dn;DES:Hewlett-Packard Color LaserJet 2605dn;" - *Product: "(HP Color LaserJet 2605)" - *Product: "(Hewlett-Packard HP Color LaserJet 2605)" - *Product: "(HP Color LaserJet 2605dn)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd 2013-07-23 12:41:46.657624979 +0200 -@@ -43,6 +43,7 @@ - - *% Product Name and Version Information - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;" - *Product: "(HP Color LaserJet 2820)" - *Product: "(Hewlett-Packard HP Color LaserJet 2820)" - *Product: "(HP Color LaserJet 2830)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd 2013-07-23 12:41:46.658624966 +0200 -@@ -41,6 +41,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.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd 2013-07-23 12:41:46.659624952 +0200 -@@ -41,6 +41,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.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd 2013-07-23 12:41:46.660624938 +0200 -@@ -47,6 +47,7 @@ - - *% Product Name and Version Information - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;" - *Product: "(HP Color LaserJet 3800)" - *Product: "(Hewlett-Packard HP Color LaserJet 3800)" - *ModelName: "HP Color LaserJet 3800" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd 2013-07-23 12:41:46.661624924 +0200 -@@ -40,6 +40,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.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd 2013-07-23 12:41:46.662624910 +0200 -@@ -41,6 +41,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.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd 2013-07-23 12:41:46.663624897 +0200 -@@ -41,6 +41,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.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd 2013-07-23 12:41:46.664624883 +0200 -@@ -43,6 +43,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.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd 2013-07-23 12:41:46.665624869 +0200 -@@ -45,6 +45,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.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd 2013-07-23 12:41:46.666624855 +0200 -@@ -43,6 +43,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.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd 2013-07-23 12:41:46.667624841 +0200 -@@ -44,6 +44,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;" - *Manufacturer: "HP" - *Product: "(HP Color LaserJet CM3530 MFP)" - *Product: "(Hewlett-Packard HP Color LaserJet CM3530 MFP)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 12:46:53.884383444 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd 2013-07-23 12:43:46.000000000 +0200 -@@ -32,6 +32,7 @@ - *LanguageEncoding: ISOLatin1 - *PCFileName: "HPP00004.PPD" - *Product: "(HP Color LaserJet CM4540 MFP)" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;" - *Manufacturer: "HP" - *ModelName: "HP Color LaserJet CM4540 MFP" - *ShortNickName: "HP Color LaserJet CM4540 MFP" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd 2013-07-23 12:41:46.668624828 +0200 -@@ -43,6 +43,7 @@ - - - *% 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.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd 2013-07-23 12:41:46.670624800 +0200 -@@ -44,6 +44,7 @@ - - - *% 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.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd 2013-07-23 12:45:48.252289396 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd 2013-07-23 12:44:34.000000000 +0200 -@@ -44,6 +44,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4005;" - *Manufacturer: "HP" - *Product: "(HP Color LaserJet CP4005)" - *Product: "(Hewlett-Packard HP Color LaserJet CP4005)" -diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd 2013-07-23 12:41:46.670624800 +0200 -@@ -38,6 +38,7 @@ - *ShortNickName: "HP Designjet T770 PostScript" - *NickName: "HP Designjet T770ps 44in Postscript (recommended)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;" - - - *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== -diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd 2013-07-23 12:41:46.671624786 +0200 -@@ -38,6 +38,7 @@ - *ShortNickName: "HP Designjet T770ps 24in" - *NickName: "HP Designjet T770ps 24in Postscript (recommended)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;" - - - *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd 2013-07-23 12:41:46.671624786 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 1200)" - *Product: "(Hewlett-Packard HP LaserJet 1200)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd 2013-07-23 12:41:46.672624772 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 1200)" - *Product: "(Hewlett-Packard HP LaserJet 1200)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd 2013-07-23 12:41:46.673624759 +0200 -@@ -58,6 +58,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1300n)" - *Product: "(HP LaserJet 1300n)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd 2013-07-23 12:41:46.673624759 +0200 -@@ -58,6 +58,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1300n)" - *Product: "(HP LaserJet 1300n)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd 2013-07-23 12:41:46.674624745 +0200 -@@ -58,6 +58,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1300n)" - *Product: "(HP LaserJet 1300n)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd 2013-07-23 12:41:46.675624731 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd 2013-07-23 12:41:46.676624717 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd 2013-07-23 12:41:46.677624703 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd 2013-07-23 12:41:46.677624703 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd 2013-07-23 12:41:46.678624689 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd 2013-07-23 12:41:46.679624676 +0200 -@@ -54,6 +54,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.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd 2013-07-23 12:41:46.680624662 +0200 -@@ -54,6 +54,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.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd 2013-07-23 12:41:46.680624662 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 2200)" - *Product: "(Hewlett-Packard HP LaserJet 2200)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd 2013-07-23 12:41:46.681624648 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 2200)" - *Product: "(Hewlett-Packard HP LaserJet 2200)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd 2013-07-23 12:41:46.682624634 +0200 -@@ -59,6 +59,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2300L)" - *Product: "(HP LaserJet 2300L)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd 2013-07-23 12:41:46.683624620 +0200 -@@ -59,6 +59,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2300L)" - *Product: "(HP LaserJet 2300L)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd 2013-07-23 12:41:46.684624607 +0200 -@@ -57,6 +57,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.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd 2013-07-23 12:41:46.684624607 +0200 -@@ -58,6 +58,7 @@ - *Product: "(HP LaserJet 3390)" - *Product: "(Hewlett-Packard HP LaserJet 3390)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd 2013-07-23 12:41:46.685624593 +0200 -@@ -49,6 +49,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series" - *Product: "(HP LaserJet 4000 Series)" - *Product: "(Hewlett-Packard HP LaserJet 4000 Series)" - *ModelName: "HP LaserJet 4000 Series" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd 2013-07-23 12:41:46.686624579 +0200 -@@ -49,6 +49,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.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd 2013-07-23 12:41:46.687624565 +0200 -@@ -48,6 +48,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.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd 2013-07-23 12:41:46.688624551 +0200 -@@ -49,6 +49,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.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd 2013-07-23 12:41:46.689624538 +0200 -@@ -50,6 +50,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" - *Product: "(hp LaserJet 4250)" - *Product: "(Hewlett-Packard hp LaserJet 4250)" - *Product: "(HP LaserJet 4250)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd 2013-07-23 12:41:46.690624524 +0200 -@@ -49,6 +49,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.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd 2013-07-23 12:41:46.691624510 +0200 -@@ -50,6 +50,7 @@ - - - *% 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.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd 2013-07-23 12:41:46.692624496 +0200 -@@ -50,6 +50,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.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd 2013-07-23 12:41:46.694624469 +0200 -@@ -52,6 +52,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.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd 2013-07-23 12:41:46.695624455 +0200 -@@ -52,6 +52,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.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd 2013-07-23 12:41:46.696624441 +0200 -@@ -51,6 +51,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.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd 2013-07-23 12:41:46.697624427 +0200 -@@ -52,6 +52,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.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2013-07-23 12:41:46.698624413 +0200 -@@ -58,6 +58,7 @@ - *Product: "(HP LaserJet P2015 Series)" - *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd 2013-07-23 12:41:46.699624399 +0200 -@@ -50,6 +50,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.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd 2013-07-23 12:41:46.700624386 +0200 -@@ -45,6 +45,7 @@ - - - *% 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 -up hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd --- hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid 2014-11-04 09:41:13.200005393 +0000 +++ hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd 2014-11-04 09:42:13.168312042 +0000 diff --git a/hplip-device_open.patch b/hplip-device_open.patch deleted file mode 100644 index 4a5d39b..0000000 --- a/hplip-device_open.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.14.10/base/device.py.device_open hplip-3.14.10/base/device.py ---- hplip-3.14.10/base/device.py.device_open 2014-10-31 09:28:43.675181974 +0000 -+++ hplip-3.14.10/base/device.py 2014-10-31 09:28:56.579250180 +0000 -@@ -400,7 +400,7 @@ def makeURI(param, port=1): - mq = queryModelByURI(d) - - result_code, device_id = \ -- hpmudext.device_open(d, mq.get('io-mode', hpmudext.HPMUD_UNI_MODE)) -+ hpmudext.open_device(d, mq.get('io-mode', hpmudext.HPMUD_UNI_MODE)) - - if result_code == hpmudext.HPMUD_R_OK: - result_code, data = hpmudext.get_device_id(device_id) diff --git a/hplip-jpeg.patch b/hplip-jpeg.patch deleted file mode 100644 index 8353697..0000000 --- a/hplip-jpeg.patch +++ /dev/null @@ -1,419 +0,0 @@ -diff -up hplip-3.14.10/prnt/hpijs/jdatadbf.c.jpeg hplip-3.14.10/prnt/hpijs/jdatadbf.c ---- hplip-3.14.10/prnt/hpijs/jdatadbf.c.jpeg 2014-10-07 09:56:31.000000000 +0100 -+++ hplip-3.14.10/prnt/hpijs/jdatadbf.c 2014-10-31 14:52:08.236306644 +0000 -@@ -24,7 +24,7 @@ typedef struct { - JOCTET * outbuff; // target output buffer - JOCTET * buffer; // start of internal buffer - UINT16 size_outbuff; // current size of target output buffer -- JMETHOD (void, flush_output_buffer_callback, (JOCTET *outbuf, JOCTET* buffer, size_t size)); -+ void (* flush_output_buffer_callback) (JOCTET *outbuf, JOCTET* buffer, size_t size); - } my_destination_mgr; - - typedef my_destination_mgr * my_dest_ptr; -diff -up hplip-3.14.10/prnt/hpijs/jpegint.h.jpeg hplip-3.14.10/prnt/hpijs/jpegint.h ---- hplip-3.14.10/prnt/hpijs/jpegint.h.jpeg 2014-10-07 09:56:31.000000000 +0100 -+++ hplip-3.14.10/prnt/hpijs/jpegint.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,392 +0,0 @@ --/* -- * jpegint.h -- * -- * Copyright (C) 1991-1997, Thomas G. Lane. -- * This file is part of the Independent JPEG Group's software. -- * For conditions of distribution and use, see the accompanying README file. -- * -- * This file provides common declarations for the various JPEG modules. -- * These declarations are considered internal to the JPEG library; most -- * applications using the library shouldn't need to include this file. -- */ -- -- --/* Declarations for both compression & decompression */ -- --typedef enum { /* Operating modes for buffer controllers */ -- JBUF_PASS_THRU, /* Plain stripwise operation */ -- /* Remaining modes require a full-image buffer to have been created */ -- JBUF_SAVE_SOURCE, /* Run source subobject only, save output */ -- JBUF_CRANK_DEST, /* Run dest subobject only, using saved data */ -- JBUF_SAVE_AND_PASS /* Run both subobjects, save output */ --} J_BUF_MODE; -- --/* Values of global_state field (jdapi.c has some dependencies on ordering!) */ --#define CSTATE_START 100 /* after create_compress */ --#define CSTATE_SCANNING 101 /* start_compress done, write_scanlines OK */ --#define CSTATE_RAW_OK 102 /* start_compress done, write_raw_data OK */ --#define CSTATE_WRCOEFS 103 /* jpeg_write_coefficients done */ --#define DSTATE_START 200 /* after create_decompress */ --#define DSTATE_INHEADER 201 /* reading header markers, no SOS yet */ --#define DSTATE_READY 202 /* found SOS, ready for start_decompress */ --#define DSTATE_PRELOAD 203 /* reading multiscan file in start_decompress*/ --#define DSTATE_PRESCAN 204 /* performing dummy pass for 2-pass quant */ --#define DSTATE_SCANNING 205 /* start_decompress done, read_scanlines OK */ --#define DSTATE_RAW_OK 206 /* start_decompress done, read_raw_data OK */ --#define DSTATE_BUFIMAGE 207 /* expecting jpeg_start_output */ --#define DSTATE_BUFPOST 208 /* looking for SOS/EOI in jpeg_finish_output */ --#define DSTATE_RDCOEFS 209 /* reading file in jpeg_read_coefficients */ --#define DSTATE_STOPPING 210 /* looking for EOI in jpeg_finish_decompress */ -- -- --/* Declarations for compression modules */ -- --/* Master control module */ --struct jpeg_comp_master { -- JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo)); -- JMETHOD(void, pass_startup, (j_compress_ptr cinfo)); -- JMETHOD(void, finish_pass, (j_compress_ptr cinfo)); -- -- /* State variables made visible to other modules */ -- boolean call_pass_startup; /* True if pass_startup must be called */ -- boolean is_last_pass; /* True during last pass */ --}; -- --/* Main buffer control (downsampled-data buffer) */ --struct jpeg_c_main_controller { -- JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); -- JMETHOD(void, process_data, (j_compress_ptr cinfo, -- JSAMPARRAY input_buf, JDIMENSION *in_row_ctr, -- JDIMENSION in_rows_avail)); --}; -- --/* Compression preprocessing (downsampling input buffer control) */ --struct jpeg_c_prep_controller { -- JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); -- JMETHOD(void, pre_process_data, (j_compress_ptr cinfo, -- JSAMPARRAY input_buf, -- JDIMENSION *in_row_ctr, -- JDIMENSION in_rows_avail, -- JSAMPIMAGE output_buf, -- JDIMENSION *out_row_group_ctr, -- JDIMENSION out_row_groups_avail)); --}; -- --/* Coefficient buffer control */ --struct jpeg_c_coef_controller { -- JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode)); -- JMETHOD(boolean, compress_data, (j_compress_ptr cinfo, -- JSAMPIMAGE input_buf)); --}; -- --/* Colorspace conversion */ --struct jpeg_color_converter { -- JMETHOD(void, start_pass, (j_compress_ptr cinfo)); -- JMETHOD(void, color_convert, (j_compress_ptr cinfo, -- JSAMPARRAY input_buf, JSAMPIMAGE output_buf, -- JDIMENSION output_row, int num_rows)); --}; -- --/* Downsampling */ --struct jpeg_downsampler { -- JMETHOD(void, start_pass, (j_compress_ptr cinfo)); -- JMETHOD(void, downsample, (j_compress_ptr cinfo, -- JSAMPIMAGE input_buf, JDIMENSION in_row_index, -- JSAMPIMAGE output_buf, -- JDIMENSION out_row_group_index)); -- -- boolean need_context_rows; /* TRUE if need rows above & below */ --}; -- --/* Forward DCT (also controls coefficient quantization) */ --struct jpeg_forward_dct { -- JMETHOD(void, start_pass, (j_compress_ptr cinfo)); -- /* perhaps this should be an array??? */ -- JMETHOD(void, forward_DCT, (j_compress_ptr cinfo, -- jpeg_component_info * compptr, -- JSAMPARRAY sample_data, JBLOCKROW coef_blocks, -- JDIMENSION start_row, JDIMENSION start_col, -- JDIMENSION num_blocks)); --}; -- --/* Entropy encoding */ --struct jpeg_entropy_encoder { -- JMETHOD(void, start_pass, (j_compress_ptr cinfo, boolean gather_statistics)); -- JMETHOD(boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data)); -- JMETHOD(void, finish_pass, (j_compress_ptr cinfo)); --}; -- --/* Marker writing */ --struct jpeg_marker_writer { -- JMETHOD(void, write_file_header, (j_compress_ptr cinfo)); -- JMETHOD(void, write_frame_header, (j_compress_ptr cinfo)); -- JMETHOD(void, write_scan_header, (j_compress_ptr cinfo)); -- JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo)); -- JMETHOD(void, write_tables_only, (j_compress_ptr cinfo)); -- /* These routines are exported to allow insertion of extra markers */ -- /* Probably only COM and APPn markers should be written this way */ -- JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker, -- unsigned int datalen)); -- JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); --}; -- -- --/* Declarations for decompression modules */ -- --/* Master control module */ --struct jpeg_decomp_master { -- JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo)); -- JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo)); -- -- /* State variables made visible to other modules */ -- boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */ --}; -- --/* Input control module */ --struct jpeg_input_controller { -- JMETHOD(int, consume_input, (j_decompress_ptr cinfo)); -- JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo)); -- JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); -- JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo)); -- -- /* State variables made visible to other modules */ -- boolean has_multiple_scans; /* True if file has multiple scans */ -- boolean eoi_reached; /* True when EOI has been consumed */ --}; -- --/* Main buffer control (downsampled-data buffer) */ --struct jpeg_d_main_controller { -- JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); -- JMETHOD(void, process_data, (j_decompress_ptr cinfo, -- JSAMPARRAY output_buf, JDIMENSION *out_row_ctr, -- JDIMENSION out_rows_avail)); --}; -- --/* Coefficient buffer control */ --struct jpeg_d_coef_controller { -- JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); -- JMETHOD(int, consume_data, (j_decompress_ptr cinfo)); -- JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo)); -- JMETHOD(int, decompress_data, (j_decompress_ptr cinfo, -- JSAMPIMAGE output_buf)); -- /* Pointer to array of coefficient virtual arrays, or NULL if none */ -- jvirt_barray_ptr *coef_arrays; --}; -- --/* Decompression postprocessing (color quantization buffer control) */ --struct jpeg_d_post_controller { -- JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)); -- JMETHOD(void, post_process_data, (j_decompress_ptr cinfo, -- JSAMPIMAGE input_buf, -- JDIMENSION *in_row_group_ctr, -- JDIMENSION in_row_groups_avail, -- JSAMPARRAY output_buf, -- JDIMENSION *out_row_ctr, -- JDIMENSION out_rows_avail)); --}; -- --/* Marker reading & parsing */ --struct jpeg_marker_reader { -- JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo)); -- /* Read markers until SOS or EOI. -- * Returns same codes as are defined for jpeg_consume_input: -- * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI. -- */ -- JMETHOD(int, read_markers, (j_decompress_ptr cinfo)); -- /* Read a restart marker --- exported for use by entropy decoder only */ -- jpeg_marker_parser_method read_restart_marker; -- -- /* State of marker reader --- nominally internal, but applications -- * supplying COM or APPn handlers might like to know the state. -- */ -- boolean saw_SOI; /* found SOI? */ -- boolean saw_SOF; /* found SOF? */ -- int next_restart_num; /* next restart number expected (0-7) */ -- unsigned int discarded_bytes; /* # of bytes skipped looking for a marker */ --}; -- --/* Entropy decoding */ --struct jpeg_entropy_decoder { -- JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -- JMETHOD(boolean, decode_mcu, (j_decompress_ptr cinfo, -- JBLOCKROW *MCU_data)); -- -- /* This is here to share code between baseline and progressive decoders; */ -- /* other modules probably should not use it */ -- boolean insufficient_data; /* set TRUE after emitting warning */ --}; -- --/* Inverse DCT (also performs dequantization) */ --typedef JMETHOD(void, inverse_DCT_method_ptr, -- (j_decompress_ptr cinfo, jpeg_component_info * compptr, -- JCOEFPTR coef_block, -- JSAMPARRAY output_buf, JDIMENSION output_col)); -- --struct jpeg_inverse_dct { -- JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -- /* It is useful to allow each component to have a separate IDCT method. */ -- inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS]; --}; -- --/* Upsampling (note that upsampler must also call color converter) */ --struct jpeg_upsampler { -- JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -- JMETHOD(void, upsample, (j_decompress_ptr cinfo, -- JSAMPIMAGE input_buf, -- JDIMENSION *in_row_group_ctr, -- JDIMENSION in_row_groups_avail, -- JSAMPARRAY output_buf, -- JDIMENSION *out_row_ctr, -- JDIMENSION out_rows_avail)); -- -- boolean need_context_rows; /* TRUE if need rows above & below */ --}; -- --/* Colorspace conversion */ --struct jpeg_color_deconverter { -- JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -- JMETHOD(void, color_convert, (j_decompress_ptr cinfo, -- JSAMPIMAGE input_buf, JDIMENSION input_row, -- JSAMPARRAY output_buf, int num_rows)); --}; -- --/* Color quantization or color precision reduction */ --struct jpeg_color_quantizer { -- JMETHOD(void, start_pass, (j_decompress_ptr cinfo, boolean is_pre_scan)); -- JMETHOD(void, color_quantize, (j_decompress_ptr cinfo, -- JSAMPARRAY input_buf, JSAMPARRAY output_buf, -- int num_rows)); -- JMETHOD(void, finish_pass, (j_decompress_ptr cinfo)); -- JMETHOD(void, new_color_map, (j_decompress_ptr cinfo)); --}; -- -- --/* Miscellaneous useful macros */ -- --#undef MAX --#define MAX(a,b) ((a) > (b) ? (a) : (b)) --#undef MIN --#define MIN(a,b) ((a) < (b) ? (a) : (b)) -- -- --/* We assume that right shift corresponds to signed division by 2 with -- * rounding towards minus infinity. This is correct for typical "arithmetic -- * shift" instructions that shift in copies of the sign bit. But some -- * C compilers implement >> with an unsigned shift. For these machines you -- * must define RIGHT_SHIFT_IS_UNSIGNED. -- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity. -- * It is only applied with constant shift counts. SHIFT_TEMPS must be -- * included in the variables of any routine using RIGHT_SHIFT. -- */ -- --#ifdef RIGHT_SHIFT_IS_UNSIGNED --#define SHIFT_TEMPS INT32 shift_temp; --#define RIGHT_SHIFT(x,shft) \ -- ((shift_temp = (x)) < 0 ? \ -- (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \ -- (shift_temp >> (shft))) --#else --#define SHIFT_TEMPS --#define RIGHT_SHIFT(x,shft) ((x) >> (shft)) --#endif -- -- --/* Short forms of external names for systems with brain-damaged linkers. */ -- --#ifdef NEED_SHORT_EXTERNAL_NAMES --#define jinit_compress_master jICompress --#define jinit_c_master_control jICMaster --#define jinit_c_main_controller jICMainC --#define jinit_c_prep_controller jICPrepC --#define jinit_c_coef_controller jICCoefC --#define jinit_color_converter jICColor --#define jinit_downsampler jIDownsampler --#define jinit_forward_dct jIFDCT --#define jinit_huff_encoder jIHEncoder --#define jinit_phuff_encoder jIPHEncoder --#define jinit_marker_writer jIMWriter --#define jinit_master_decompress jIDMaster --#define jinit_d_main_controller jIDMainC --#define jinit_d_coef_controller jIDCoefC --#define jinit_d_post_controller jIDPostC --#define jinit_input_controller jIInCtlr --#define jinit_marker_reader jIMReader --#define jinit_huff_decoder jIHDecoder --#define jinit_phuff_decoder jIPHDecoder --#define jinit_inverse_dct jIIDCT --#define jinit_upsampler jIUpsampler --#define jinit_color_deconverter jIDColor --#define jinit_1pass_quantizer jI1Quant --#define jinit_2pass_quantizer jI2Quant --#define jinit_merged_upsampler jIMUpsampler --#define jinit_memory_mgr jIMemMgr --#define jdiv_round_up jDivRound --#define jround_up jRound --#define jcopy_sample_rows jCopySamples --#define jcopy_block_row jCopyBlocks --#define jzero_far jZeroFar --#define jpeg_zigzag_order jZIGTable --#define jpeg_natural_order jZAGTable --#endif /* NEED_SHORT_EXTERNAL_NAMES */ -- -- --/* Compression module initialization routines */ --EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo)); --EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo, -- boolean transcode_only)); --EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo, -- boolean need_full_buffer)); --EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo, -- boolean need_full_buffer)); --EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo, -- boolean need_full_buffer)); --EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo)); --EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo)); --EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo)); --EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo)); --EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo)); --EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo)); --/* Decompression module initialization routines */ --EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo, -- boolean need_full_buffer)); --EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo, -- boolean need_full_buffer)); --EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo, -- boolean need_full_buffer)); --EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo)); --EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo)); --/* Memory manager initialization */ --EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo)); -- --/* Utility routines in jutils.c */ --EXTERN(long) jdiv_round_up JPP((long a, long b)); --EXTERN(long) jround_up JPP((long a, long b)); --EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row, -- JSAMPARRAY output_array, int dest_row, -- int num_rows, JDIMENSION num_cols)); --EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row, -- JDIMENSION num_blocks)); --EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero)); --/* Constant tables in jutils.c */ --#if 0 /* This table is not actually needed in v6a */ --extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */ --#endif --extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */ -- --/* Suppress undefined-structure complaints if necessary. */ -- --#ifdef INCOMPLETE_TYPES_BROKEN --#ifndef AM_MEMORY_MANAGER /* only jmemmgr.c defines these */ --struct jvirt_sarray_control { long dummy; }; --struct jvirt_barray_control { long dummy; }; --#endif --#endif /* INCOMPLETE_TYPES_BROKEN */ ---- hplip-3.14.10/prnt/hpcups/jdatadbf.c.jpeg 2014-10-31 15:12:04.567605759 +0000 -+++ hplip-3.14.10/prnt/hpcups/jdatadbf.c 2014-10-31 15:12:08.254625172 +0000 -@@ -23,7 +23,7 @@ typedef struct { - JOCTET * outbuff; // target output buffer - JOCTET * buffer; // start of internal buffer - UINT16 size_outbuff; // current size of target output buffer -- JMETHOD (void, flush_output_buffer_callback, (JOCTET *outbuf, JOCTET* buffer, size_t size)); -+ void (* flush_output_buffer_callback) (JOCTET *outbuf, JOCTET* buffer, size_t size); - } my_destination_mgr; - - typedef my_destination_mgr * my_dest_ptr; diff --git a/hplip-log-stderr.patch b/hplip-log-stderr.patch index 0959ea2..6c0749f 100644 --- a/hplip-log-stderr.patch +++ b/hplip-log-stderr.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.14.4/fax/backend/hpfax.py.log hplip-3.14.4/fax/backend/hpfax.py ---- hplip-3.14.4/fax/backend/hpfax.py.log 2014-04-04 12:42:15.000000000 +0200 -+++ hplip-3.14.4/fax/backend/hpfax.py 2014-05-22 11:39:06.917683733 +0200 -@@ -52,7 +52,10 @@ home_dir = '' +diff -up hplip-3.15.2/fax/backend/hpfax.py.log-stderr hplip-3.15.2/fax/backend/hpfax.py +--- hplip-3.15.2/fax/backend/hpfax.py.log-stderr 2015-01-29 13:20:35.000000000 +0100 ++++ hplip-3.15.2/fax/backend/hpfax.py 2015-02-04 15:40:48.360972449 +0100 +@@ -55,7 +55,10 @@ home_dir = '' def bug(msg): syslog.syslog("hpfax[%d]: error: %s\n" % (pid, msg)) @@ -13,10 +13,10 @@ diff -up hplip-3.14.4/fax/backend/hpfax.py.log hplip-3.14.4/fax/backend/hpfax.py if os.path.exists(config_file): -diff -up hplip-3.14.4/prnt/filters/hpps.log hplip-3.14.4/prnt/filters/hpps ---- hplip-3.14.4/prnt/filters/hpps.log 2014-04-04 12:39:47.000000000 +0200 -+++ hplip-3.14.4/prnt/filters/hpps 2014-05-22 11:38:30.620187178 +0200 -@@ -49,10 +49,16 @@ home_dir = '' +diff -up hplip-3.15.2/prnt/filters/hpps.log-stderr hplip-3.15.2/prnt/filters/hpps +--- hplip-3.15.2/prnt/filters/hpps.log-stderr 2015-02-04 15:40:48.360972449 +0100 ++++ hplip-3.15.2/prnt/filters/hpps 2015-02-04 15:43:14.796878364 +0100 +@@ -53,10 +53,16 @@ home_dir = '' def bug(m): @@ -34,4 +34,4 @@ diff -up hplip-3.14.4/prnt/filters/hpps.log hplip-3.14.4/prnt/filters/hpps + sys.stderr.write("INFO: %s\n" % msg) if os.path.exists(config_file): - config = ConfigParser.ConfigParser() + config = configparser.ConfigParser() diff --git a/hplip-logdir.patch b/hplip-logdir.patch index 6d970fd..bbfab9b 100644 --- a/hplip-logdir.patch +++ b/hplip-logdir.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp.logdir 2014-06-05 13:33:05.426719552 +0200 -+++ hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp 2014-06-05 13:33:05.432719467 +0200 -@@ -604,7 +604,7 @@ int HPCupsFilter::processRasterData(cups +diff -up hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2015-02-04 14:22:43.838774401 +0100 ++++ hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp 2015-02-04 14:22:43.844774315 +0100 +@@ -619,7 +619,7 @@ int HPCupsFilter::processRasterData(cups char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages. @@ -10,15 +10,15 @@ diff -up hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.14.6/prnt/hpcu while (cupsRasterReadHeader2(cups_raster, &cups_header)) -diff -up hplip-3.14.6/prnt/hpcups/SystemServices.cpp.logdir hplip-3.14.6/prnt/hpcups/SystemServices.cpp ---- hplip-3.14.6/prnt/hpcups/SystemServices.cpp.logdir 2014-06-05 13:33:05.432719467 +0200 -+++ hplip-3.14.6/prnt/hpcups/SystemServices.cpp 2014-06-05 13:34:05.742861168 +0200 +diff -up hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.15.2/prnt/hpcups/SystemServices.cpp +--- hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir 2015-02-04 14:22:43.844774315 +0100 ++++ hplip-3.15.2/prnt/hpcups/SystemServices.cpp 2015-02-04 14:24:04.080626127 +0100 @@ -38,7 +38,7 @@ SystemServices::SystemServices(int iLogL if (iLogLevel & SAVE_OUT_FILE) { char fname[MAX_FILE_PATH_LEN]; - sprintf(fname, "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); + snprintf(fname, sizeof(fname), "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); - createTempFile(fname, &m_fp); if (m_fp) + { diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch index e06a820..014e2cf 100644 --- a/hplip-pstotiff-is-rubbish.patch +++ b/hplip-pstotiff-is-rubbish.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/filters/pstotiff ---- hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish 2011-07-24 21:06:43.000000000 +0200 -+++ hplip-3.11.7/fax/filters/pstotiff 2011-07-25 13:42:27.776988201 +0200 -@@ -1,40 +1,16 @@ +diff -up hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.15.2/fax/filters/pstotiff +--- hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish 2015-02-04 09:40:43.169147058 +0100 ++++ hplip-3.15.2/fax/filters/pstotiff 2015-02-04 09:47:20.786983832 +0100 +@@ -1,45 +1,16 @@ -#!/usr/bin/env python - -import os @@ -10,6 +10,8 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/ -import sys -import tempfile - +-PY3 = sys.version_info[0] == 3 +- -READ_SIZE = 8192 - -total_bytes_read = 0 @@ -36,7 +38,10 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/ -out_handle = open(temp_out_fname, mode='rb') -while (total_bytes_read < file_len): - data = out_handle.read(READ_SIZE) -- sys.stdout.write(data) +- if PY3: +- sys.stdout.buffer.write(data) +- else: +- sys.stdout.write(data) - total_bytes_read += READ_SIZE -out_handle.close() - diff --git a/hplip-scan-tmp.patch b/hplip-scan-tmp.patch index 4c7e299..39f2b96 100644 --- a/hplip-scan-tmp.patch +++ b/hplip-scan-tmp.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.14.4/scan.py.scan-tmp hplip-3.14.4/scan.py ---- hplip-3.14.4/scan.py.scan-tmp 2014-04-04 11:42:20.000000000 +0100 -+++ hplip-3.14.4/scan.py 2014-04-29 17:20:05.653622531 +0100 -@@ -1072,7 +1072,7 @@ try: +diff -up hplip-3.15.2/scan.py.scan-tmp hplip-3.15.2/scan.py +--- hplip-3.15.2/scan.py.scan-tmp 2015-02-04 15:27:20.423562999 +0100 ++++ hplip-3.15.2/scan.py 2015-02-04 15:34:59.170978476 +0100 +@@ -1080,7 +1080,7 @@ try: if ('editor' in dest or 'viewer' in dest or 'email' in dest or 'print' in dest) \ and not file_saved: @@ -9,11 +9,11 @@ diff -up hplip-3.14.4/scan.py.scan-tmp hplip-3.14.4/scan.py + output_fd, output = utils.make_temp_file(dir='/var/tmp', suffix='.png') try: im.save(output) - except IOError, e: -diff -up hplip-3.14.4/scan/sane.py.scan-tmp hplip-3.14.4/scan/sane.py ---- hplip-3.14.4/scan/sane.py.scan-tmp 2014-04-04 11:41:13.000000000 +0100 -+++ hplip-3.14.4/scan/sane.py 2014-04-29 17:21:34.663061497 +0100 -@@ -424,7 +424,8 @@ class ScanThread(threading.Thread): + except IOError as e: +diff -up hplip-3.15.2/scan/sane.py.scan-tmp hplip-3.15.2/scan/sane.py +--- hplip-3.15.2/scan/sane.py.scan-tmp 2015-01-29 13:20:21.000000000 +0100 ++++ hplip-3.15.2/scan/sane.py 2015-02-04 15:27:20.424562984 +0100 +@@ -425,7 +425,8 @@ class ScanThread(threading.Thread): self.dev = device self.update_queue = update_queue self.event_queue = event_queue diff --git a/hplip.spec b/hplip.spec index 9a03dd2..d17e9bd 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,13 +1,13 @@ # we don't want to provide private python extension libs %{?filter_setup: -%filter_provides_in %{python_sitearch}/.*\.so$ +%filter_provides_in %{python3_sitearch}/.*\.so$ %filter_setup } Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.14.10 -Release: 8%{?dist} +Version: 3.15.2 +Release: 1%{?dist} License: GPLv2+ and MIT Url: http://hplip.sourceforge.net/ @@ -30,27 +30,24 @@ Patch13: hplip-bad-low-ink-warning.patch Patch14: hplip-deviceIDs-ppd.patch Patch15: hplip-ppd-ImageableArea.patch Patch16: hplip-scan-tmp.patch -Patch17: hplip-codec.patch -Patch18: hplip-log-stderr.patch -Patch19: hplip-avahi-parsing.patch -Patch20: hplip-reportlab.patch -Patch21: hplip-device_open.patch -Patch22: hplip-jpeg.patch -Patch23: hplip-dj990c-margin.patch -Patch24: hplip-strncpy.patch +Patch17: hplip-log-stderr.patch +Patch18: hplip-avahi-parsing.patch +Patch19: hplip-reportlab.patch +Patch20: hplip-dj990c-margin.patch +Patch21: hplip-strncpy.patch %global hpijs_epoch 1 Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: python-imaging +Requires: python3-pillow Requires: cups Requires: wget -Requires: dbus-python +Requires: python3-dbus Requires: gnupg BuildRequires: net-snmp-devel BuildRequires: cups-devel -BuildRequires: python2-devel +BuildRequires: python3-devel BuildRequires: libjpeg-devel BuildRequires: desktop-file-utils BuildRequires: libusb1-devel @@ -83,7 +80,7 @@ Summary: HPLIP libraries Group: System Environment/Libraries License: GPLv2+ and MIT Requires: %{name}-common%{?_isa} = %{version}-%{release} -Requires: python +Requires: python3 %description libs Libraries needed by HPLIP. @@ -93,8 +90,9 @@ Summary: HPLIP graphical tools Group: Applications/System License: BSD Requires: PyQt4 -Requires: python-reportlab -Requires: pygobject2 +Requires: python3-reportlab +# hpssd.py +Requires: python3-gobject Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libsane-hpaio%{?_isa} = %{version}-%{release} @@ -143,33 +141,8 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). %patch4 -p1 -b .no-asm # Corrected several IEEE 1284 Device IDs using foomatic data. -# Color LaserJet CM1312nfi (bug #581005) -# Color LaserJet 3800 (bug #581935) -# Color LaserJet 2840 (bug #582215) -# Color LaserJet CP1518ni (bug #613689) -# Color LaserJet 2600n (bug #613712) -# Color LaserJet 2500/3700/4550/4600/4650/4700/5550/CP1515n/CP2025n -# CP3525/CP4520 Series/CM2320nf (bug #659040) -# Color LaserJet CP2025dn (bug #651509) -# Color LaserJet CM4730 MFP (bug #658831) -# Color LaserJet CM3530 MFP (bug #659381) -# LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series -# P3005/P3010 Series/P4014/P4515 (bug #659039) -# LaserJet Professional P1606dn (bug #708472) -# LaserJet Professional M1212nf MFP (bug #742490) -# LaserJet M1536dnf MFP (bug #743915) -# LaserJet M1522nf MFP (bug #745498) -# LaserJet M1319f MFP (bug #746614) -# LaserJet M1120 MFP (bug #754139) -# LaserJet P1007 (bug #585272) -# LaserJet P1505 (bug #680951) -# LaserJet P2035 (Ubuntu #917703) -# PSC 1600 series (bug #743821) -# Officejet 6300 series (bug #689378) -# LaserJet Professional P1102w (bug #795958) -# Color LaserJet CM4540 MFP (bug #968177) -# Color LaserJet cp4005 (bug #980976) -# HP LaserJet Professional M1132 MFP (bug #1158743) +# Color LaserJet 2500 series (bug #659040) +# LaserJet 4100 Series/2100 Series (bug #659039) %patch5 -p1 -b .deviceIDs-drv chmod +x %{SOURCE2} mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} @@ -203,23 +176,6 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} %patch13 -p1 -b .bad-low-ink-warning # Add Device ID for -# LaserJet 1200 (bug #577308) -# LaserJet 1320 series (bug #579920) -# LaserJet 2300 (bug #576928) -# LaserJet P2015 Series (bug #580231) -# LaserJet 4250 (bug #585499) -# Color LaserJet 2605dn (bug #583953) -# Color LaserJet 3800 (bug #581935) -# Color LaserJet 2840 (bug #582215) -# LaserJet 4050 Series/4100 Series/2100 Series/2420/4200/4300/4350/5100 Series -# 8000 Series/M3027 MFP/M3035 MFP/P3005/P3010 Series (bug #659039) -# Color LaserJet 2500/2550/2605dn/3700/4550/4600 -# 4650/4700/5550/CP3525 (bug #659040) -# Color LaserJet CM4730 MFP (bug #658831) -# Color LaserJet CM3530 MFP (bug #659381) -# Designjet T770 (bug #747957) -# Color LaserJet CM4540 MFP (bug #968177) -# Color LaserJet cp4005 (bug #980976) # HP LaserJet Color M451dn (bug #1159380) for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4); do @@ -245,39 +201,29 @@ done # Scan to /var/tmp instead of /tmp (bug #1076954). %patch16 -p1 -b .scan-tmp -# Fixed codec issue (bug #984167). -%patch17 -p1 -b .codec - # Treat logging before importing of logger module (bug #984699). -%patch18 -p1 -b .log-stderr +%patch17 -p1 -b .log-stderr # Fix parsing of avahi-daemon output (bug #1096939). -%patch19 -p1 -b .parsing +%patch18 -p1 -b .parsing # Fixed version comparisons for x.y.z-style versions such as # reportlab (bug #1121433). -%patch20 -p1 -b .reportlab - -# Fixed incorrect name in function call in makeURI when a parallel -# port device is used (bug #1159161). -%patch21 -p1 -b .device_open - -# Fixed build against libjpeg-turbo 1.3.90. -%patch22 -p1 -b .jpeg +%patch19 -p1 -b .reportlab # Fixed left/right margins for HP DeskJet 990C (LP #1405212). -%patch23 -p1 -b .dj990c-margin +%patch20 -p1 -b .dj990c-margin # Fixed uses of strncpy throughout. -%patch24 -p1 -b .strncpy +%patch21 -p1 -b .strncpy sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in -# Change shebang /usr/bin/env python -> /usr/bin/python (bug #618351). +# Change shebang /usr/bin/env python -> /usr/bin/python3 (bug #618351). find -name '*.py' -print0 | xargs -0 \ - sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python,' + sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' %build %configure \ @@ -286,7 +232,7 @@ find -name '*.py' -print0 | xargs -0 \ --enable-qt4 --enable-hpcups-install --enable-cups-drv-install \ --enable-foomatic-drv-install \ --enable-hpijs-install \ - --disable-policykit --with-mimedir=%{_datadir}/cups/mime + --disable-policykit --with-mimedir=%{_datadir}/cups/mime PYTHON=%{__python3} sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -295,7 +241,7 @@ make %install mkdir -p %{buildroot}%{_bindir} -make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} PYTHON=%{__python3} # Create /run/hplip mkdir -p %{buildroot}/run/hplip @@ -319,7 +265,7 @@ rm -rf %{buildroot}%{_sysconfdir}/sane.d \ rm -f %{buildroot}%{_bindir}/foomatic-rip \ %{buildroot}%{_libdir}/cups/filter/foomatic-rip \ %{buildroot}%{_libdir}/*.la \ - %{buildroot}%{python_sitearch}/*.la \ + %{buildroot}%{python3_sitearch}/*.la \ %{buildroot}%{_libdir}/libhpip.so \ %{buildroot}%{_libdir}/sane/*.la \ %{buildroot}%{_datadir}/cups/model/foomatic-ppds \ @@ -465,7 +411,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop # The so symlink is required here (see bug #489059). %{_libdir}/libhpmud.so* # Python extension -%{python_sitearch}/* +%{python3_sitearch}/* %files gui %{_bindir}/hp-check @@ -506,6 +452,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Wed Feb 04 2015 Jiri Popelka - 3.15.2-1 +- 3.15.2 + * Wed Jan 21 2015 Tim Waugh - 3.14.10-8 - No need to remove hpcac as it is no longer provided upstream. diff --git a/sources b/sources index 300158e..1f12e99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7af44ee1c4312b00d2269c1b25008f73 hplip-3.14.10.tar.gz +bbc55fc0d45e130a24ab042f60f9f888 hplip-3.15.2.tar.gz