From 9f4e3894a15ecb389384c909371f9430764f4467 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Tue, 4 Oct 2011 16:17:04 +0200 Subject: [PATCH] 3.11.10 Use _cups_serverbin macro from cups-devel for where to put driver executables. No need to define BuildRoot and clean it in clean and install section anymore. Corrected IEEE 1284 Device IDs: Officejet 6300 series (bug #689378) LaserJet Professional M1212nf MFP (bug #742490) --- .gitignore | 1 + hplip-3.11.10.tar.gz.asc | 7 + hplip-3.11.7.tar.gz.asc | 7 - hplip-CVE-2011-2722.patch | 21 --- hplip-deviceIDs-drv.patch | 373 +++++++++++++++++++------------------- hplip-hpcups-crash.patch | 12 -- hplip-sane-crash.patch | 25 --- hplip.spec | 111 ++++++------ sources | 2 +- 9 files changed, 251 insertions(+), 308 deletions(-) create mode 100644 hplip-3.11.10.tar.gz.asc delete mode 100644 hplip-3.11.7.tar.gz.asc delete mode 100644 hplip-CVE-2011-2722.patch delete mode 100644 hplip-hpcups-crash.patch delete mode 100644 hplip-sane-crash.patch diff --git a/.gitignore b/.gitignore index bc3e644..4cca431 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ hplip-3.10.6.tar.gz /hplip-3.11.3a.tar.gz /hplip-3.11.5.tar.gz /hplip-3.11.7.tar.gz +/hplip-3.11.10.tar.gz diff --git a/hplip-3.11.10.tar.gz.asc b/hplip-3.11.10.tar.gz.asc new file mode 100644 index 0000000..83053e4 --- /dev/null +++ b/hplip-3.11.10.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAk6H1w0ACgkQc9dwzaWQR7nTGwCfdrOZAl0nguWBYFpEgWh4Vm5l +TIYAoJ/mlrUoMMeTnqZjTNs7NMyFu3lq +=DGE1 +-----END PGP SIGNATURE----- diff --git a/hplip-3.11.7.tar.gz.asc b/hplip-3.11.7.tar.gz.asc deleted file mode 100644 index 9d0c036..0000000 --- a/hplip-3.11.7.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAk4sb9YACgkQc9dwzaWQR7l98wCfT9DH91wml2LcfPvsKq5BLSOp -EW4AoI2tK03vh/o+Q3NOjKkIJ++a/NDB -=vlbG ------END PGP SIGNATURE----- diff --git a/hplip-CVE-2011-2722.patch b/hplip-CVE-2011-2722.patch deleted file mode 100644 index fa157e8..0000000 --- a/hplip-CVE-2011-2722.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up hplip-3.11.7/prnt/hpijs/hpcupsfax.cpp.CVE-2011-2722 hplip-3.11.7/prnt/hpijs/hpcupsfax.cpp ---- hplip-3.11.7/prnt/hpijs/hpcupsfax.cpp.CVE-2011-2722 2011-07-29 10:21:37.404874641 +0100 -+++ hplip-3.11.7/prnt/hpijs/hpcupsfax.cpp 2011-07-29 10:28:10.071298117 +0100 -@@ -625,8 +625,15 @@ int send_data_to_stdout(int fromFD) - fp = NULL; - if (iLogLevel & SAVE_PCL_FILE) - { -- fp = fopen ("/tmp/hpcupsfax.out", "w"); -- system ("chmod 666 /tmp/hpcupsfax.out"); -+ int fd; -+ -+ unlink ("/tmp/hpcupsfax.out"); -+ fd = open ("/tmp/hpcupsfax.out", O_WRONLY | O_CREAT | O_EXCL, -+ S_IRUSR | S_IWUSR | S_IRGRP); -+ if (fd != -1) -+ { -+ fp = fdopen (fd, "w"); -+ } - } - - while ((len = read (fromFD, pTmp, iSize)) > 0) diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index cc34ebb..8f94f43 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv/hpcups.drv.in ---- hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv 2011-05-09 02:07:42.000000000 +0100 -+++ hplip-3.11.5/prnt/drv/hpcups.drv.in 2011-06-28 11:12:14.099845241 +0100 -@@ -450,7 +450,7 @@ Manufacturer "HP" +diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/drv/hpcups.drv.in +--- hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv 2011-10-02 05:11:24.000000000 +0200 ++++ hplip-3.11.10/prnt/drv/hpcups.drv.in 2011-10-04 15:48:54.881957881 +0200 +@@ -458,7 +458,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" @@ -10,7 +10,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -458,7 +458,7 @@ Manufacturer "HP" +@@ -466,7 +466,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, $Version" Attribute "ShortNickName" "" "HP Officejet v40" @@ -19,7 +19,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -475,7 +475,7 @@ Manufacturer "HP" +@@ -483,7 +483,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, $Version" Attribute "ShortNickName" "" "HP Officejet g55" @@ -28,7 +28,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -523,7 +523,7 @@ Manufacturer "HP" +@@ -531,7 +531,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, $Version" Attribute "ShortNickName" "" "HP Officejet g85" @@ -37,7 +37,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -539,7 +539,7 @@ Manufacturer "HP" +@@ -547,7 +547,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, $Version" Attribute "ShortNickName" "" "HP Officejet g95" @@ -46,7 +46,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -555,7 +555,7 @@ Manufacturer "HP" +@@ -563,7 +563,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, $Version" Attribute "ShortNickName" "" "HP PSC 750xi" @@ -55,7 +55,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -563,7 +563,7 @@ Manufacturer "HP" +@@ -571,7 +571,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, $Version" Attribute "ShortNickName" "" "HP PSC 750" @@ -64,7 +64,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -595,7 +595,7 @@ Manufacturer "HP" +@@ -603,7 +603,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" @@ -73,7 +73,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -611,7 +611,7 @@ Manufacturer "HP" +@@ -619,7 +619,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" @@ -82,7 +82,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -630,7 +630,7 @@ Manufacturer "HP" +@@ -638,7 +638,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" @@ -91,7 +91,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -671,7 +671,7 @@ Manufacturer "HP" +@@ -679,7 +679,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" @@ -100,7 +100,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -690,7 +690,7 @@ Manufacturer "HP" +@@ -698,7 +698,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -109,7 +109,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -747,7 +747,7 @@ Manufacturer "HP" +@@ -755,7 +755,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" Attribute "NickName" "" "HP Deskjet 959c, $Version" Attribute "ShortNickName" "" "HP Deskjet 959c" @@ -118,7 +118,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_959c.ppd" Attribute "Product" "" "(HP Deskjet 959c Printer)" } -@@ -755,7 +755,7 @@ Manufacturer "HP" +@@ -763,7 +763,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" @@ -127,7 +127,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -775,7 +775,7 @@ Manufacturer "HP" +@@ -783,7 +783,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -136,7 +136,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -784,7 +784,7 @@ Manufacturer "HP" +@@ -792,7 +792,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -145,7 +145,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -818,7 +818,7 @@ Manufacturer "HP" +@@ -826,7 +826,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -154,7 +154,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -856,7 +856,7 @@ Manufacturer "HP" +@@ -864,7 +864,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -163,7 +163,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -864,7 +864,7 @@ Manufacturer "HP" +@@ -872,7 +872,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -172,7 +172,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -915,7 +915,7 @@ Manufacturer "HP" +@@ -923,7 +923,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" @@ -181,7 +181,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1111,7 +1111,7 @@ Manufacturer "HP" +@@ -1119,7 +1119,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, $Version" Attribute "ShortNickName" "" "HP 2000c" @@ -190,7 +190,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1553,7 +1553,7 @@ Manufacturer "HP" +@@ -1561,7 +1561,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, $Version" Attribute "ShortNickName" "" "HP Officejet D Series" @@ -199,7 +199,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1576,7 +1576,7 @@ Manufacturer "HP" +@@ -1584,7 +1584,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -208,7 +208,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1586,7 +1586,7 @@ Manufacturer "HP" +@@ -1594,7 +1594,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -217,7 +217,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1595,7 +1595,7 @@ Manufacturer "HP" +@@ -1603,7 +1603,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -226,7 +226,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1658,7 +1658,7 @@ Manufacturer "HP" +@@ -1666,7 +1666,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -235,7 +235,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1666,7 +1666,7 @@ Manufacturer "HP" +@@ -1674,7 +1674,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" @@ -244,7 +244,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1679,7 +1679,7 @@ Manufacturer "HP" +@@ -1687,7 +1687,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" @@ -253,7 +253,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1687,7 +1687,7 @@ Manufacturer "HP" +@@ -1695,7 +1695,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" @@ -262,7 +262,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1724,7 +1724,7 @@ Manufacturer "HP" +@@ -1732,7 +1732,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -271,7 +271,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1954,7 +1954,7 @@ Manufacturer "HP" +@@ -1962,7 +1962,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" @@ -280,7 +280,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1964,7 +1964,7 @@ Manufacturer "HP" +@@ -1972,7 +1972,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" @@ -289,7 +289,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1972,7 +1972,7 @@ Manufacturer "HP" +@@ -1980,7 +1980,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" @@ -298,7 +298,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1981,7 +1981,7 @@ Manufacturer "HP" +@@ -1989,7 +1989,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" @@ -307,7 +307,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2500,7 +2500,7 @@ Manufacturer "HP" +@@ -2508,7 +2508,7 @@ Manufacturer "HP" ModelName "HP PSC 1600 Series" Attribute "NickName" "" "HP PSC 1600 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1600 Series" @@ -316,7 +316,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_1600_series.ppd" Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" -@@ -2516,7 +2516,7 @@ Manufacturer "HP" +@@ -2524,7 +2524,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -325,7 +325,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2534,7 +2534,7 @@ Manufacturer "HP" +@@ -2542,7 +2542,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -334,7 +334,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_2300_series.ppd" Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2543,7 +2543,7 @@ Manufacturer "HP" +@@ -2551,7 +2551,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -343,7 +343,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2560,7 +2560,7 @@ Manufacturer "HP" +@@ -2568,7 +2568,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" @@ -352,7 +352,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_2400_series.ppd" Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" -@@ -2586,7 +2586,7 @@ Manufacturer "HP" +@@ -2594,7 +2594,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -361,7 +361,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3047,7 +3047,7 @@ Manufacturer "HP" +@@ -3055,7 +3055,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -370,7 +370,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3120,7 +3120,7 @@ Manufacturer "HP" +@@ -3128,7 +3128,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -379,16 +379,16 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3175,7 +3175,7 @@ Manufacturer "HP" +@@ -3183,7 +3183,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6300 series;DES:officejet 6300 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;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)" -@@ -3344,7 +3344,7 @@ Manufacturer "HP" +@@ -3352,7 +3352,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -397,7 +397,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3429,7 +3429,7 @@ Manufacturer "HP" +@@ -3437,7 +3437,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" @@ -406,7 +406,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -8449,7 +8449,7 @@ Manufacturer "HP" +@@ -9194,7 +9194,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -415,7 +415,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -8459,7 +8459,7 @@ Manufacturer "HP" +@@ -9204,7 +9204,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -424,7 +424,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -8642,7 +8642,7 @@ Manufacturer "HP" +@@ -9387,7 +9387,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" Attribute "NickName" "" "HP Deskjet 3940, $Version" Attribute "ShortNickName" "" "HP Deskjet 3940" @@ -433,7 +433,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_3940.ppd" Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" -@@ -8651,7 +8651,7 @@ Manufacturer "HP" +@@ -9396,7 +9396,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -442,7 +442,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_4100_series.ppd" Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" -@@ -8678,7 +8678,7 @@ Manufacturer "HP" +@@ -9423,7 +9423,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -451,7 +451,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -8994,7 +8994,7 @@ Manufacturer "HP" +@@ -9739,7 +9739,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -460,7 +460,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -9065,7 +9065,7 @@ Manufacturer "HP" +@@ -9810,7 +9810,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -469,7 +469,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -9572,6 +9572,7 @@ Manufacturer "HP" +@@ -10317,6 +10317,7 @@ Manufacturer "HP" Attribute "NickName" "" "HP Photosmart 380 Series, $Version" Attribute "ShortNickName" "" "HP Photosmart 380 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" @@ -477,7 +477,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -9999,7 +10000,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10744,7 +10745,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" @@ -486,7 +486,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -10025,7 +10026,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10770,7 +10771,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" @@ -495,7 +495,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -10033,7 +10034,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10778,7 +10779,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -504,7 +504,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -10043,7 +10044,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10788,7 +10789,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -513,7 +513,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -10051,7 +10052,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10796,7 +10797,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -522,7 +522,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -10063,7 +10064,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10808,7 +10809,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -531,7 +531,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -10071,7 +10072,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10816,7 +10817,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -540,7 +540,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -10081,7 +10082,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10826,7 +10827,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -549,7 +549,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -10123,7 +10124,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10868,7 +10869,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -558,7 +558,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -10141,7 +10142,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10886,7 +10887,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -567,7 +567,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -10158,7 +10159,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10903,7 +10904,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" @@ -576,7 +576,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -10166,7 +10167,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10911,7 +10912,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -585,7 +585,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -10191,7 +10192,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10936,7 +10937,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -594,7 +594,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -10199,7 +10200,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10944,7 +10945,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -603,7 +603,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -10224,7 +10225,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10969,7 +10970,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" @@ -612,7 +612,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -10248,7 +10249,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10993,7 +10994,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" Attribute "NickName" "" "HP LaserJet 1320, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320" @@ -621,7 +621,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -10353,7 +10354,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11098,7 +11099,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" @@ -630,7 +630,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -10417,7 +10418,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11162,7 +11163,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100" Attribute "NickName" "" "HP LaserJet 2100, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100" @@ -639,7 +639,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_2100.ppd" Attribute "Product" "" "(HP LaserJet 2100 Printer)" Attribute "Product" "" "(HP LaserJet 2100m Printer)" -@@ -10429,7 +10430,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11174,7 +11175,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" @@ -648,7 +648,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -10445,7 +10446,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11190,7 +11191,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -657,7 +657,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -10458,7 +10459,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11203,7 +11204,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -666,7 +666,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -10471,7 +10472,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11216,7 +11217,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" @@ -675,7 +675,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -10487,7 +10488,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11232,7 +11233,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -684,7 +684,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -10498,7 +10499,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11243,7 +11244,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -693,7 +693,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -10526,7 +10527,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11271,7 +11272,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3005" Attribute "NickName" "" "HP LaserJet p3005 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p3005" @@ -702,7 +702,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_p3005-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3005 Printer)" Attribute "Product" "" "(HP LaserJet p3005d Printer)" -@@ -10539,7 +10540,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11284,7 +11285,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3010 Series" Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p3010 Series" @@ -711,7 +711,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_p3010_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3015 Printer)" Attribute "Product" "" "(HP LaserJet p3011 Printer)" -@@ -10548,7 +10549,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11293,7 +11294,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -720,7 +720,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -10556,7 +10557,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11301,7 +11302,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -729,7 +729,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -10564,7 +10565,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11309,7 +11310,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" @@ -738,7 +738,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -10573,7 +10574,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11318,7 +11319,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -747,7 +747,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -10581,7 +10582,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11326,7 +11327,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -756,7 +756,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -10590,7 +10591,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11335,7 +11336,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -765,7 +765,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -10598,7 +10599,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11343,7 +11344,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -774,7 +774,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -10626,7 +10627,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11371,7 +11372,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -783,7 +783,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -10642,7 +10643,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11387,7 +11388,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -792,7 +792,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -10662,7 +10663,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11407,7 +11408,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -801,7 +801,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -10670,7 +10671,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11415,7 +11416,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -810,7 +810,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -10678,7 +10679,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11423,7 +11424,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -819,7 +819,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -10694,7 +10695,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11439,7 +11440,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" @@ -828,7 +828,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -10722,7 +10723,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11467,7 +11468,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4014" Attribute "NickName" "" "HP LaserJet p4014, $Version" Attribute "ShortNickName" "" "HP LaserJet p4014" @@ -837,7 +837,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_p4014.ppd" Attribute "Product" "" "(HP LaserJet p4014 Printer)" } -@@ -10770,7 +10771,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11515,7 +11516,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" @@ -846,7 +846,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -10791,7 +10792,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11536,7 +11537,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" @@ -855,7 +855,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -10810,7 +10811,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11555,7 +11556,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -864,7 +864,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -10835,7 +10836,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11580,7 +11581,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -873,7 +873,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -10847,7 +10848,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11592,7 +11593,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -882,7 +882,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -10860,7 +10861,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11605,7 +11606,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" @@ -891,7 +891,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -10871,7 +10872,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11616,7 +11617,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" @@ -900,7 +900,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -10890,7 +10891,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11635,7 +11636,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4350" Attribute "NickName" "" "HP LaserJet 4350 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4350" @@ -909,7 +909,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_4350-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4350 Printer)" Attribute "Product" "" "(HP LaserJet 4350dtn Printer)" -@@ -10926,7 +10927,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11671,7 +11672,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4515" Attribute "NickName" "" "HP LaserJet p4515, $Version" Attribute "ShortNickName" "" "HP LaserJet p4515" @@ -918,7 +918,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_p4515.ppd" Attribute "Product" "" "(HP LaserJet p4515 Printer)" } -@@ -10942,7 +10943,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11687,7 +11688,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" @@ -927,7 +927,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -10958,7 +10959,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11703,7 +11704,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000 Series" Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8000 Series" @@ -936,7 +936,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_8000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8000 Series Printer)" } -@@ -11052,7 +11053,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11797,7 +11798,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -945,7 +945,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -11088,7 +11089,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11833,7 +11834,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" @@ -954,7 +954,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -11109,7 +11110,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11854,7 +11855,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" @@ -963,7 +963,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -11117,7 +11118,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11862,7 +11863,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" @@ -972,7 +972,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -11135,7 +11136,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11880,7 +11881,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5100 Series" Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5100 Series" @@ -981,7 +981,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_5100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5100 Printer)" Attribute "Product" "" "(HP LaserJet 5100le Printer)" -@@ -11166,7 +11167,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11911,7 +11912,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000" Attribute "NickName" "" "HP LaserJet 8000, $Version" Attribute "ShortNickName" "" "HP LaserJet 8000" @@ -990,7 +990,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_8000.ppd" Attribute "Product" "" "(HP LaserJet 8000 Printer)" Attribute "Product" "" "(HP LaserJet 8000dn Printer)" -@@ -11186,7 +11187,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11931,7 +11932,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" @@ -999,7 +999,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -11399,7 +11400,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12144,7 +12145,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm1312nfi MFP" Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" @@ -1008,7 +1008,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } -@@ -11479,7 +11480,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12224,7 +12225,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1515n" Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" @@ -1017,7 +1017,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" } -@@ -11487,7 +11488,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12232,7 +12233,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1518ni" Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" @@ -1026,7 +1026,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" } -@@ -11503,7 +11504,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12240,7 +12241,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp2025dn" Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" @@ -1035,7 +1035,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" } -@@ -11519,7 +11520,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12256,7 +12257,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp2025n" Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" @@ -1044,7 +1044,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" } -@@ -11527,7 +11528,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12272,7 +12273,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2300" @@ -1053,7 +1053,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -11561,7 +11562,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12306,7 +12307,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm2320nf MFP" Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" @@ -1062,7 +1062,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" } -@@ -11569,7 +11570,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12314,7 +12315,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2500" Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 2500" @@ -1071,7 +1071,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_2500-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" } -@@ -11610,7 +11611,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12355,7 +12356,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp3525" Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp3525" @@ -1080,7 +1080,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" -@@ -11621,7 +11622,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12366,7 +12367,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm3530 MFP" Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" @@ -1089,7 +1089,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" -@@ -11630,7 +11631,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12375,7 +12376,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3700" Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3700" @@ -1098,7 +1098,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_3700-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" } -@@ -11649,7 +11650,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12394,7 +12395,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3800" Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3800" @@ -1107,7 +1107,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -11688,7 +11689,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12433,7 +12434,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp4520 Series" Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" @@ -1116,7 +1116,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" } -@@ -11704,7 +11705,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12449,7 +12450,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" @@ -1125,7 +1125,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -11717,7 +11718,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12462,7 +12463,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" @@ -1134,7 +1134,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -11729,7 +11730,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12474,7 +12475,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600" Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600" @@ -1143,7 +1143,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_4600-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" } -@@ -11745,7 +11746,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12490,7 +12491,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4650" Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4650" @@ -1152,7 +1152,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_4650-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" -@@ -11757,7 +11758,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12502,7 +12503,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4700" Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4700" @@ -1161,7 +1161,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_4700-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" -@@ -11769,7 +11770,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12514,7 +12515,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm4730 MFP" Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" @@ -1170,7 +1170,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" -@@ -11823,7 +11824,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12568,7 +12569,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" @@ -1179,7 +1179,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_9100_series-pcl3.ppd" Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" -@@ -11864,7 +11865,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12609,7 +12610,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" @@ -1188,7 +1188,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -11899,7 +11900,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12644,7 +12645,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 5550" Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 5550" @@ -1197,7 +1197,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_5550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 5550n Printer)" Attribute "Product" "" "(HP Color LaserJet 5550 Printer)" -@@ -12156,7 +12157,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12901,7 +12902,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -1206,7 +1206,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -12164,7 +12165,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12909,7 +12910,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -1215,7 +1215,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -12372,7 +12373,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13117,7 +13118,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1224,7 +1224,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -12536,7 +12537,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13281,7 +13282,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" Attribute "NickName" "" "HP Officejet Series 300, $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" @@ -1233,7 +1233,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -12560,7 +12561,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13305,7 +13306,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -1242,7 +1242,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -12577,7 +12578,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13322,7 +13323,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -1251,7 +1251,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -12702,7 +12703,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13447,7 +13448,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1260,7 +1260,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -12718,7 +12719,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13463,7 +13464,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1269,7 +1269,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -12831,7 +12832,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13576,7 +13577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1278,7 +1278,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -12853,7 +12854,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13598,7 +13599,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 500" Attribute "NickName" "" "HP Officejet Series 500, $Version" Attribute "ShortNickName" "" "HP Officejet Series 500" @@ -1287,7 +1287,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_series_500.ppd" Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" } -@@ -12893,7 +12894,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13638,7 +13639,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" @@ -1296,7 +1296,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -12945,7 +12946,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13690,7 +13691,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1305,7 +1305,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -13097,7 +13098,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13842,7 +13843,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1314,7 +1314,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -13121,7 +13122,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13866,7 +13867,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1323,7 +1323,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -13141,7 +13142,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13886,7 +13887,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1332,7 +1332,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -13201,7 +13202,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13946,7 +13947,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" @@ -1341,7 +1341,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -13344,7 +13345,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14089,7 +14090,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" Attribute "NickName" "" "HP Officejet T Series, $Version" Attribute "ShortNickName" "" "HP Officejet T Series" @@ -1350,7 +1350,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -13355,7 +13356,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14100,7 +14101,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1359,7 +1359,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -13379,7 +13380,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14124,7 +14125,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1368,7 +1368,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -13387,7 +13388,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14132,7 +14133,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1377,7 +1377,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -13403,7 +13404,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14148,7 +14149,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1386,7 +1386,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -13411,7 +13412,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14156,7 +14157,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1395,7 +1395,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -13428,7 +13429,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14173,7 +14174,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1404,7 +1404,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -13436,7 +13437,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14181,7 +14182,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1413,7 +1413,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -13468,7 +13469,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14213,7 +14214,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1422,7 +1422,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -13476,7 +13477,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14221,7 +14222,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1431,7 +1431,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -13492,7 +13493,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14237,7 +14238,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1440,7 +1440,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -13501,7 +13502,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14246,7 +14247,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1449,7 +1449,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -13517,7 +13518,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14262,7 +14263,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1458,7 +1458,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -13634,7 +13635,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14379,7 +14380,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1467,7 +1467,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -13643,7 +13644,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14388,7 +14389,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1476,7 +1476,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -13754,7 +13755,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14499,7 +14500,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1485,7 +1485,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -13773,7 +13774,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14518,7 +14519,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1494,7 +1494,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -13784,7 +13785,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14529,7 +14530,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" @@ -1503,7 +1503,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_pro_1150c.ppd" Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" -@@ -13898,7 +13899,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14643,7 +14644,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1512,7 +1512,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -13907,7 +13908,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14652,7 +14653,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" @@ -1521,7 +1521,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-officejet_pro_1170c_series.ppd" Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" -@@ -14049,7 +14050,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14794,7 +14795,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1018" Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" @@ -1530,7 +1530,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1018.ppd" Attribute "Product" "" "(HP LaserJet 1018 Printer)" Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -14058,7 +14059,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14803,7 +14804,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1020" Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" @@ -1539,7 +1539,16 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -14418,7 +14419,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15001,7 +15002,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet Professional m1212nf MFP" + Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, $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)" + } +@@ -15179,7 +15180,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1606dn" Attribute "NickName" "" "HP LaserJet Professional p1606dn, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional p1606dn" @@ -1548,7 +1557,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_professional_p1606dn.ppd" Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)" } -@@ -14560,7 +14561,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15321,7 +15322,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2600n" Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n" @@ -1557,7 +1566,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_2600n.ppd" Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" } -@@ -14768,7 +14769,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15521,7 +15522,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" @@ -1566,7 +1575,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -14778,7 +14779,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15531,7 +15532,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" @@ -1575,7 +1584,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } -@@ -14930,7 +14931,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15683,7 +15684,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1505" Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505" @@ -1584,7 +1593,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_p1505.ppd" Attribute "Product" "" "(HP LaserJet p1505 Printer)" } -@@ -15072,7 +15073,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15825,7 +15826,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1006" Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" @@ -1593,7 +1602,7 @@ diff -up hplip-3.11.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.5/prnt/drv PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } -@@ -15080,7 +15081,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15833,7 +15834,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1007" Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" diff --git a/hplip-hpcups-crash.patch b/hplip-hpcups-crash.patch deleted file mode 100644 index bef5828..0000000 --- a/hplip-hpcups-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.11.7/prnt/hpcups/ModeJbig.cpp.hpcups-crash hplip-3.11.7/prnt/hpcups/ModeJbig.cpp ---- hplip-3.11.7/prnt/hpcups/ModeJbig.cpp.hpcups-crash 2011-09-02 16:04:58.118437727 +0100 -+++ hplip-3.11.7/prnt/hpcups/ModeJbig.cpp 2011-09-02 16:06:27.625795462 +0100 -@@ -99,6 +99,8 @@ const BYTE ModeJbig::szByte2[256] = - - ModeJbig::ModeJbig (unsigned int RasterSize) : Compressor (RasterSize, false) - { -+ m_hHPLibHandle = 0; -+ m_pszInputRasterData = 0; - m_iWidth = ((RasterSize + 31) / 32) * 4; - m_iPlaneNumber = 0; - m_iCurrentPlane = 0; diff --git a/hplip-sane-crash.patch b/hplip-sane-crash.patch deleted file mode 100644 index ff34b0c..0000000 --- a/hplip-sane-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up hplip-3.11.7/scan/sane/bb_ledm.c.sane-crash hplip-3.11.7/scan/sane/bb_ledm.c ---- hplip-3.11.7/scan/sane/bb_ledm.c.sane-crash 2011-07-24 21:01:23.000000000 +0200 -+++ hplip-3.11.7/scan/sane/bb_ledm.c 2011-09-06 16:58:04.101315124 +0200 -@@ -808,10 +808,10 @@ int bb_start_scan(struct ledm_session *p - len = snprintf(buf, sizeof(buf), CREATE_SCAN_JOB_REQUEST, - ps->currentResolution, - ps->currentResolution, -- (int) (ps->currentTlx / 5548.7133 ), -+ (int) (ps->currentTlx / 5548.7133), - (int) (ps->currentTly / 5548.7133), -- (int) (ps->currentBrx / 5548.7133), -- (int) (ps->currentBry / 5548.7133), -+ (int) ((ps->currentBrx / 5548.7133) - (ps->currentTlx / 5548.7133)), -+ (int) ((ps->currentBry / 5548.7133) - (ps->currentTly / 5548.7133)), - "Jpeg", - (! strcmp(ce_element[ps->currentScanMode], "Color8")) ? "Color" : (! strcmp(ce_element[ps->currentScanMode], "Gray8")) ? "Gray" : "Gray", - ((! strcmp(ce_element[ps->currentScanMode], "Color8")) || (! strcmp(ce_element[ps->currentScanMode], "Gray8"))) ? 8: 8, -@@ -844,6 +844,7 @@ int bb_start_scan(struct ledm_session *p - - char joblist[64]; - char* jl=strstr(buf, "Location:"); -+ if (!jl) goto bugout; - jl=jl+10; - - int i=0; diff --git a/hplip.spec b/hplip.spec index e9a5940..8c8709b 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.11.7 -Release: 5%{?dist} +Version: 3.11.10 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -24,7 +24,7 @@ Patch9: hplip-snmp-quirks.patch Patch10: hplip-discovery-method.patch Patch11: hplip-hpijs-marker-supply.patch Patch12: hplip-clear-old-state-reasons.patch -Patch13: hplip-hpcups-crash.patch + Patch14: hplip-hpcups-sigpipe.patch Patch15: hplip-fax-ppd.patch Patch16: hplip-bad-low-ink-warning.patch @@ -33,7 +33,7 @@ Patch18: hplip-skip-blank-lines.patch Patch19: hplip-dbglog-newline.patch Patch20: hplip-no-system-tray.patch Patch22: hplip-ppd-ImageableArea.patch -Patch23: hplip-sane-crash.patch + Patch25: hplip-raw_deviceID-traceback.patch Patch26: hplip-UnicodeDecodeError.patch Patch27: hplip-emit-SIGNAL.patch @@ -46,9 +46,6 @@ Patch33: hplip-dbus-threads.patch Patch34: hplip-notification-exception.patch Patch35: hplip-CVE-2010-4267.patch Patch36: hplip-wifisetup.patch -Patch37: hplip-CVE-2011-2722.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service Requires(post): /sbin/chkconfig @@ -141,7 +138,6 @@ Requires: %{name}-libs = %{version}-%{release} SANE driver for scanners in HP's multi-function devices (from HPOJ). %prep -rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup -q # The pstotiff filter is rubbish so replace it (launchpad #528394). @@ -157,21 +153,23 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %patch4 -p1 -b .no-asm # Corrected several IEEE 1284 Device IDs using foomatic data. -# HP LaserJet P1007 (bug #585272). -# HP LaserJet P1505 (bug #680951). -# HP Color LaserJet CM1312nfi (bug #581005). -# HP Color LaserJet 3800 (bug #581935). -# HP Color LaserJet 2840 (bug #582215). -# HP Color LaserJet CP1518ni (bug #613689). -# HP Color LaserJet 2600n (bug #613712). -# HP LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series -# P3005/P3010 Series/P4014/P4515 (bug #659039). -# HP Color LaserJet 2500/3700/4550/4600/4650/4700/5550/CP1515n/CP2025n -# CP3525/CP4520 Series/CM2320nf (bug #659040). -# HP Color LaserJet CP2025dn (bug #651509). -# HP Color LaserJet CM4730 MFP (bug #658831). -# HP Color LaserJet CM3530 MFP (bug #659381). -# HP LaserJet Professional P1606dn (bug #708472). +# LaserJet P1007 (bug #585272) +# LaserJet P1505 (bug #680951) +# 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) +# LaserJet 4050 Series/4100 Series/2100 Series/4350/5100 Series/8000 Series +# P3005/P3010 Series/P4014/P4515 (bug #659039) +# 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 Professional P1606dn (bug #708472) +# LaserJet Professional M1212nf MFP (bug #742490) +# Officejet 6300 series (bug #689378) %patch5 -p1 -b .deviceIDs-drv chmod +x %{SOURCE2} mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} @@ -202,9 +200,6 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} # Clear old printer-state-reasons we used to manage (bug #510926). %patch12 -p1 -b .clear-old-state-reasons -# Fixed hpcups crash when required plugin missing (bug #733461). -%patch13 -p1 -b .hpcups-crash - # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -215,20 +210,20 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} %patch16 -p1 -b .bad-low-ink-warning # Add Device ID for -# HP LaserJet 1200 (bug #577308) -# HP LaserJet 1320 series (bug #579920) -# HP LaserJet 2300 (bug #576928) -# HP LaserJet P2015 Series (bug #580231) -# HP LaserJet 4250 (bug #585499). -# HP Color LaserJet 2605dn (bug #583953). -# HP Color LaserJet 3800 (bug #581935). -# HP Color LaserJet 2840 (bug #582215). -# HP LaserJet 4050 Series/4100 Series/2100 Series/2420/4200/4300/4350/5100 Series -# 8000 Series/M3027 MFP/M3035 MFP/P3005/P3010 Series (bug #659039). -# HP Color LaserJet 2500/2550/2605dn/3700/4550/4600 -# 4650/4700/5550/CP3525 (bug #659040). -# HP Color LaserJet CM4730 MFP (bug #658831). -# HP Color LaserJet CM3530 MFP (bug #659381). +# 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) for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz @@ -259,9 +254,6 @@ do gzip -n ${ppd_file#*/} done -# Fixed xsane crash when doing a multi-image scan (bug #725878) -%patch23 -p1 -b .sane-crash - # Fixed traceback on error condition in device.py (bug #628125). %patch25 -p1 -b .raw_deviceID-traceback @@ -299,7 +291,6 @@ done # Avoid KeyError in ui4/wifisetupdialog.py (bug #680939). %patch36 -p1 -b .wifisetup -%patch37 -p1 -b .CVE-2011-2722 sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ @@ -323,7 +314,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} make install DESTDIR=%{buildroot} @@ -374,15 +364,12 @@ rm -rf %{buildroot}%{_datadir}/hplip/install.* rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff* -rm -f %{buildroot}/usr/lib/cups/filter/hpcac +rm -f %{buildroot}%{_cups_serverbin}/filter/hpcac # The systray applet doesn't work properly (displays icon as a # window), so don't ship the launcher yet. rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc COPYING doc/* @@ -411,12 +398,10 @@ rm -rf %{buildroot} %{_bindir}/hp-timedate %{_bindir}/hp-unload %{_bindir}/hp-wificonfig -# Note: this must be /usr/lib not %%{_libdir}, since that's the -# CUPS serverbin directory. -/usr/lib/cups/backend/hp -/usr/lib/cups/backend/hpfax -/usr/lib/cups/filter/pstotiff -/usr/lib/cups/filter/hpps +%{_cups_serverbin}/backend/hp +%{_cups_serverbin}/backend/hpfax +%{_cups_serverbin}/filter/pstotiff +%{_cups_serverbin}/filter/hpps %{_datadir}/cups/mime/pstotiff.convs # Files %{_datadir}/hplip/align.py* @@ -501,11 +486,9 @@ rm -rf %{buildroot} %dir %{_datadir}/ppd/HP %{_datadir}/ppd/HP/*.ppd.gz %{_datadir}/cups/drv/* -# Note: this must be /usr/lib not %%{_libdir}, since that's the -# CUPS serverbin directory. -/usr/lib/cups/filter/hpcups -/usr/lib/cups/filter/hpcupsfax -/usr/lib/cups/filter/hplipjs +%{_cups_serverbin}/filter/hpcups +%{_cups_serverbin}/filter/hpcupsfax +%{_cups_serverbin}/filter/hplipjs %files -n libsane-hpaio %defattr(-,root,root) @@ -533,6 +516,14 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Tue Oct 04 2011 Jiri Popelka 3.11.10-1 +- 3.11.10 +- Use _cups_serverbin macro from cups-devel for where to put driver executables. +- No need to define BuildRoot and clean it in clean and install section anymore. +- Corrected IEEE 1284 Device IDs: + Officejet 6300 series (bug #689378) + LaserJet Professional M1212nf MFP (bug #742490) + * Fri Sep 23 2011 Tim Waugh 3.11.7-5 - Fixed broken patch for pstotiff. diff --git a/sources b/sources index cf99d53..bc090c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cb89a00b0c680d8bf9bf4b4f1f863b1 hplip-3.11.7.tar.gz +6143f30f3b6905ef22105176a3b80db0 hplip-3.11.10.tar.gz