From 48687510358460113f819a0c5b4a7ef7b854e222 Mon Sep 17 00:00:00 2001 From: Jiří Popelka Date: Jul 27 2010 10:33:48 +0000 Subject: - 3.10.6. - Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351). - Corrected IEEE 1284 Device IDs: - HP Color LaserJet CP1518ni (bug #613689). - HP Color LaserJet 2600n (bug #613712). --- diff --git a/.cvsignore b/.cvsignore index 5b20f8c..c849e92 100644 --- a/.cvsignore +++ b/.cvsignore @@ -35,3 +35,4 @@ hplip-3.9.12.tar.gz hplip-3.10.2.tar.gz hpcups-update-ppds.sh hplip-3.10.5.tar.gz +hplip-3.10.6.tar.gz diff --git a/hplip-3.10.5.tar.gz.asc b/hplip-3.10.5.tar.gz.asc deleted file mode 100644 index 662f63e..0000000 --- a/hplip-3.10.5.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkvrPtwACgkQc9dwzaWQR7kBQQCg5QMDPz05Oz1r9aQtk7drg8mQ -wxEAoMYrbJ7YkjqWyhsK/04y8tqZ022U -=H4Nc ------END PGP SIGNATURE----- diff --git a/hplip-3.10.6.tar.gz.asc b/hplip-3.10.6.tar.gz.asc new file mode 100644 index 0000000..f8f003c --- /dev/null +++ b/hplip-3.10.6.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkxDtwQACgkQc9dwzaWQR7nApgCcC0cVr7w9rEJdir1Gyl71m9rB +PEsAoK+qjoBn/ksBmhTiNQRYdr/XCE19 +=MeCZ +-----END PGP SIGNATURE----- diff --git a/hplip-bad-state-attr.patch b/hplip-bad-state-attr.patch deleted file mode 100644 index 9c74f35..0000000 --- a/hplip-bad-state-attr.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp ---- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr 2010-06-17 15:11:53.417989598 +0100 -+++ hplip-3.10.5/prnt/hpijs/hpijs.cpp 2010-06-17 15:28:41.169989632 +0100 -@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char * - case WARN_LOW_INK_YELLOW: - case WARN_LOW_INK_MULTIPLE_PENS: - { -- BUG ("STATE: +marker-supply-low-warning\n"); -+ fputs("STATE: +marker-supply-low-warning\n", stderr); - break; - } - default: -- BUG ("STATE: -marker-supply-low-warning\n"); -+ fputs("STATE: -marker-supply-low-warning\n", stderr); - } - } - diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 5f7c42c..a90b455 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv/hpcups.drv.in ---- hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-05-13 01:47:57.000000000 +0200 -+++ hplip-3.10.5/prnt/drv/hpcups.drv.in 2010-05-17 14:46:45.000000000 +0200 -@@ -424,7 +424,7 @@ Manufacturer "HP" +diff -up hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.6/prnt/drv/hpcups.drv.in +--- hplip-3.10.6/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-07-19 04:20:01.000000000 +0200 ++++ hplip-3.10.6/prnt/drv/hpcups.drv.in 2010-07-27 11:33:48.000000000 +0200 +@@ -433,7 +433,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" @@ -10,7 +10,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -432,7 +432,7 @@ Manufacturer "HP" +@@ -441,7 +441,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, $Version" Attribute "ShortNickName" "" "HP Officejet v40" @@ -19,7 +19,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -449,7 +449,7 @@ Manufacturer "HP" +@@ -458,7 +458,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, $Version" Attribute "ShortNickName" "" "HP Officejet g55" @@ -28,7 +28,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -497,7 +497,7 @@ Manufacturer "HP" +@@ -506,7 +506,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, $Version" Attribute "ShortNickName" "" "HP Officejet g85" @@ -37,7 +37,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -513,7 +513,7 @@ Manufacturer "HP" +@@ -522,7 +522,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, $Version" Attribute "ShortNickName" "" "HP Officejet g95" @@ -46,7 +46,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -529,7 +529,7 @@ Manufacturer "HP" +@@ -538,7 +538,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, $Version" Attribute "ShortNickName" "" "HP PSC 750xi" @@ -55,7 +55,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -537,7 +537,7 @@ Manufacturer "HP" +@@ -546,7 +546,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, $Version" Attribute "ShortNickName" "" "HP PSC 750" @@ -64,7 +64,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -569,7 +569,7 @@ Manufacturer "HP" +@@ -578,7 +578,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" @@ -73,7 +73,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -585,7 +585,7 @@ Manufacturer "HP" +@@ -594,7 +594,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" @@ -82,7 +82,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -604,7 +604,7 @@ Manufacturer "HP" +@@ -613,7 +613,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" @@ -91,7 +91,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -645,7 +645,7 @@ Manufacturer "HP" +@@ -654,7 +654,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" @@ -100,7 +100,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -664,7 +664,7 @@ Manufacturer "HP" +@@ -673,7 +673,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -109,7 +109,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -721,7 +721,7 @@ Manufacturer "HP" +@@ -730,7 +730,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" Attribute "NickName" "" "HP Deskjet 959c, $Version" Attribute "ShortNickName" "" "HP Deskjet 959c" @@ -118,7 +118,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_959c.ppd" Attribute "Product" "" "(HP Deskjet 959c Printer)" } -@@ -729,7 +729,7 @@ Manufacturer "HP" +@@ -738,7 +738,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" @@ -127,7 +127,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -749,7 +749,7 @@ Manufacturer "HP" +@@ -758,7 +758,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -136,7 +136,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -758,7 +758,7 @@ Manufacturer "HP" +@@ -767,7 +767,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -145,7 +145,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -792,7 +792,7 @@ Manufacturer "HP" +@@ -801,7 +801,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -154,7 +154,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -830,7 +830,7 @@ Manufacturer "HP" +@@ -839,7 +839,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -163,7 +163,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -838,7 +838,7 @@ Manufacturer "HP" +@@ -847,7 +847,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -172,7 +172,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -889,7 +889,7 @@ Manufacturer "HP" +@@ -898,7 +898,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" @@ -181,7 +181,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1085,7 +1085,7 @@ Manufacturer "HP" +@@ -1094,7 +1094,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, $Version" Attribute "ShortNickName" "" "HP 2000c" @@ -190,7 +190,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1527,7 +1527,7 @@ Manufacturer "HP" +@@ -1536,7 +1536,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, $Version" Attribute "ShortNickName" "" "HP Officejet D Series" @@ -199,7 +199,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -1550,7 +1550,7 @@ Manufacturer "HP" +@@ -1559,7 +1559,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -208,7 +208,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1560,7 +1560,7 @@ Manufacturer "HP" +@@ -1569,7 +1569,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -217,7 +217,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1569,7 +1569,7 @@ Manufacturer "HP" +@@ -1578,7 +1578,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -226,7 +226,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1632,7 +1632,7 @@ Manufacturer "HP" +@@ -1641,7 +1641,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -235,7 +235,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1640,7 +1640,7 @@ Manufacturer "HP" +@@ -1649,7 +1649,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" @@ -244,7 +244,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -1653,7 +1653,7 @@ Manufacturer "HP" +@@ -1662,7 +1662,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" @@ -253,7 +253,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1661,7 +1661,7 @@ Manufacturer "HP" +@@ -1670,7 +1670,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" @@ -262,7 +262,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -1698,7 +1698,7 @@ Manufacturer "HP" +@@ -1707,7 +1707,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -271,7 +271,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -1928,7 +1928,7 @@ Manufacturer "HP" +@@ -1937,7 +1937,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" @@ -280,7 +280,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1938,7 +1938,7 @@ Manufacturer "HP" +@@ -1947,7 +1947,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" @@ -289,7 +289,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1946,7 +1946,7 @@ Manufacturer "HP" +@@ -1955,7 +1955,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" @@ -298,7 +298,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1955,7 +1955,7 @@ Manufacturer "HP" +@@ -1964,7 +1964,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" @@ -307,7 +307,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2476,7 +2476,7 @@ Manufacturer "HP" +@@ -2485,7 +2485,7 @@ Manufacturer "HP" ModelName "HP PSC 1600 Series" Attribute "NickName" "" "HP PSC 1600 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1600 Series" @@ -316,7 +316,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -2492,7 +2492,7 @@ Manufacturer "HP" +@@ -2501,7 +2501,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -325,7 +325,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2510,7 +2510,7 @@ Manufacturer "HP" +@@ -2519,7 +2519,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -334,7 +334,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -2519,7 +2519,7 @@ Manufacturer "HP" +@@ -2528,7 +2528,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -343,7 +343,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -2536,7 +2536,7 @@ Manufacturer "HP" +@@ -2545,7 +2545,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" @@ -352,7 +352,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -2562,7 +2562,7 @@ Manufacturer "HP" +@@ -2571,7 +2571,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -361,7 +361,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -3023,7 +3023,7 @@ Manufacturer "HP" +@@ -3032,7 +3032,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -370,7 +370,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -3096,7 +3096,7 @@ Manufacturer "HP" +@@ -3105,7 +3105,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -379,7 +379,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -3151,7 +3151,7 @@ Manufacturer "HP" +@@ -3160,7 +3160,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" @@ -388,7 +388,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3320,7 +3320,7 @@ Manufacturer "HP" +@@ -3329,7 +3329,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -397,7 +397,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -3405,7 +3405,7 @@ Manufacturer "HP" +@@ -3414,7 +3414,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" @@ -406,7 +406,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -7327,7 +7327,7 @@ Manufacturer "HP" +@@ -7579,7 +7579,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -415,7 +415,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -7337,7 +7337,7 @@ Manufacturer "HP" +@@ -7589,7 +7589,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -424,7 +424,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -7520,7 +7520,7 @@ Manufacturer "HP" +@@ -7772,7 +7772,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" Attribute "NickName" "" "HP Deskjet 3940, $Version" Attribute "ShortNickName" "" "HP Deskjet 3940" @@ -433,7 +433,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_3940.ppd" Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" -@@ -7529,7 +7529,7 @@ Manufacturer "HP" +@@ -7781,7 +7781,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -442,7 +442,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -7556,7 +7556,7 @@ Manufacturer "HP" +@@ -7808,7 +7808,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -451,7 +451,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -7854,7 +7854,7 @@ Manufacturer "HP" +@@ -8114,7 +8114,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -460,7 +460,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -7925,7 +7925,7 @@ Manufacturer "HP" +@@ -8185,7 +8185,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -469,7 +469,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -8422,6 +8422,7 @@ Manufacturer "HP" +@@ -8682,6 +8682,7 @@ Manufacturer "HP" Attribute "NickName" "" "HP Photosmart 380 Series, $Version" Attribute "ShortNickName" "" "HP Photosmart 380 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" @@ -477,7 +477,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -8849,7 +8850,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9109,7 +9110,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" @@ -486,7 +486,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -8875,7 +8876,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9135,7 +9136,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" @@ -495,7 +495,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -8883,7 +8884,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9143,7 +9144,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -504,7 +504,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -8893,7 +8894,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9153,7 +9154,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -513,7 +513,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -8901,7 +8902,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9161,7 +9162,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -522,7 +522,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -8913,7 +8914,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9173,7 +9174,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -531,7 +531,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -8921,7 +8922,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9181,7 +9182,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -540,7 +540,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -8931,7 +8932,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9191,7 +9192,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -549,7 +549,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -8973,7 +8974,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9233,7 +9234,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -558,7 +558,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -8991,7 +8992,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9251,7 +9252,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -567,7 +567,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -9008,7 +9009,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9268,7 +9269,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" @@ -576,7 +576,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -9016,7 +9017,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9276,7 +9277,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -585,7 +585,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -9041,7 +9042,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9301,7 +9302,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -594,7 +594,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -9049,7 +9050,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9309,7 +9310,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -603,7 +603,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -9074,7 +9075,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9334,7 +9335,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" @@ -612,7 +612,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -9098,7 +9099,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9358,7 +9359,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" Attribute "NickName" "" "HP LaserJet 1320, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320" @@ -621,7 +621,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -9171,7 +9172,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9431,7 +9432,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.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -9247,7 +9248,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9507,7 +9508,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" @@ -639,7 +639,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -9263,7 +9264,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9523,7 +9524,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -648,7 +648,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -9276,7 +9277,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9536,7 +9537,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -657,7 +657,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -9289,7 +9290,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9549,7 +9550,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" @@ -666,7 +666,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -9305,7 +9306,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9565,7 +9566,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -675,7 +675,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -9316,7 +9317,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9576,7 +9577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -684,7 +684,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -9366,7 +9367,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9626,7 +9627,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -693,7 +693,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -9374,7 +9375,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9634,7 +9635,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -702,7 +702,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -9382,7 +9383,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9642,7 +9643,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" @@ -711,7 +711,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -9391,7 +9392,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9651,7 +9652,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -720,7 +720,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -9399,7 +9400,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9659,7 +9660,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -729,7 +729,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -9408,7 +9409,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9668,7 +9669,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -738,7 +738,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -9416,7 +9417,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9676,7 +9677,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -747,7 +747,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -9444,7 +9445,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9704,7 +9705,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -756,7 +756,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -9460,7 +9461,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9720,7 +9721,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -765,7 +765,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -9480,7 +9481,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9740,7 +9741,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -774,7 +774,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -9488,7 +9489,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9748,7 +9749,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -783,7 +783,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -9496,7 +9497,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9756,7 +9757,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -792,7 +792,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -9512,7 +9513,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9772,7 +9773,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" @@ -801,7 +801,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -9588,7 +9589,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9848,7 +9849,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" @@ -810,7 +810,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -9600,7 +9601,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9860,7 +9861,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" @@ -819,7 +819,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -9628,7 +9629,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9888,7 +9889,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -828,7 +828,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -9653,7 +9654,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9913,7 +9914,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -837,7 +837,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -9665,7 +9666,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9925,7 +9926,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -846,7 +846,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -9678,7 +9679,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9938,7 +9939,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" @@ -855,7 +855,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -9689,7 +9690,7 @@ Group "RLT/HP Real Life Technologies" +@@ -9949,7 +9950,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" @@ -864,7 +864,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -9760,7 +9761,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10020,7 +10021,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" @@ -873,7 +873,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -9870,7 +9871,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10130,7 +10131,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -882,7 +882,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -9906,7 +9907,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10166,7 +10167,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" @@ -891,7 +891,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -9927,7 +9928,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10187,7 +10188,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" @@ -900,7 +900,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -9935,7 +9936,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10195,7 +10196,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" @@ -909,7 +909,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -10004,7 +10005,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10264,7 +10265,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" @@ -918,7 +918,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -10217,7 +10218,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10477,7 +10478,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm1312nfi MFP" Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" @@ -927,7 +927,16 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } -@@ -10281,7 +10282,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10501,7 +10502,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" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1518ni;DES:hp color laserjet cp1518ni;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1518ni;DES:Hewlett-Packard Color LaserJet CP1518ni;" + PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" + } +@@ -10541,7 +10542,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" @@ -936,7 +945,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -10403,7 +10404,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10663,7 +10664,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" @@ -945,7 +954,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -10450,7 +10451,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10710,7 +10711,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" @@ -954,7 +963,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -10463,7 +10464,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10723,7 +10724,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" @@ -963,7 +972,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -10561,7 +10562,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10821,7 +10822,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" @@ -972,7 +981,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -10602,7 +10603,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10862,7 +10863,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" @@ -981,7 +990,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -10894,7 +10895,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11154,7 +11155,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -990,7 +999,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -10902,7 +10903,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11162,7 +11163,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -999,7 +1008,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -11110,7 +11111,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11370,7 +11371,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1008,7 +1017,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -11274,7 +11275,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11534,7 +11535,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" @@ -1017,7 +1026,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -11298,7 +11299,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11558,7 +11559,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -1026,7 +1035,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -11315,7 +11316,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11575,7 +11576,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -1035,7 +1044,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -11440,7 +11441,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11700,7 +11701,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1044,7 +1053,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -11456,7 +11457,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11716,7 +11717,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1053,7 +1062,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -11569,7 +11570,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11829,7 +11830,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1062,7 +1071,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -11591,7 +11592,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11851,7 +11852,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" @@ -1071,7 +1080,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_series_500.ppd" Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" } -@@ -11631,7 +11632,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11891,7 +11892,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" @@ -1080,7 +1089,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -11683,7 +11684,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11943,7 +11944,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1089,7 +1098,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -11835,7 +11836,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12095,7 +12096,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1098,7 +1107,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -11859,7 +11860,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12119,7 +12120,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1107,7 +1116,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -11879,7 +11880,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12139,7 +12140,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1116,7 +1125,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -11939,7 +11940,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12199,7 +12200,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" @@ -1125,7 +1134,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -12082,7 +12083,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12342,7 +12343,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" @@ -1134,7 +1143,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -12093,7 +12094,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12353,7 +12354,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1143,7 +1152,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -12117,7 +12118,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12377,7 +12378,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1152,7 +1161,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -12125,7 +12126,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12385,7 +12386,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1161,7 +1170,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -12141,7 +12142,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12401,7 +12402,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1170,7 +1179,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -12149,7 +12150,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12409,7 +12410,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1179,7 +1188,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -12166,7 +12167,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12426,7 +12427,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1188,7 +1197,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -12174,7 +12175,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12434,7 +12435,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1197,7 +1206,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -12206,7 +12207,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12466,7 +12467,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1206,7 +1215,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -12214,7 +12215,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12474,7 +12475,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1215,7 +1224,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -12230,7 +12231,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12490,7 +12491,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1224,7 +1233,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -12239,7 +12240,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12499,7 +12500,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1233,7 +1242,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -12255,7 +12256,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12515,7 +12516,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1242,7 +1251,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -12372,7 +12373,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12632,7 +12633,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1251,7 +1260,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -12381,7 +12382,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12641,7 +12642,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1260,7 +1269,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -12492,7 +12493,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12752,7 +12753,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1269,7 +1278,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -12511,7 +12512,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12771,7 +12772,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1278,7 +1287,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -12522,7 +12523,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12782,7 +12783,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" @@ -1287,7 +1296,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -12636,7 +12637,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12896,7 +12897,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1296,7 +1305,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -12645,7 +12646,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12905,7 +12906,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" @@ -1305,7 +1314,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.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)" -@@ -12787,7 +12788,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13047,7 +13048,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" @@ -1314,7 +1323,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1018.ppd" Attribute "Product" "" "(HP LaserJet 1018 Printer)" Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -12796,7 +12797,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13056,7 +13057,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" @@ -1323,7 +1332,16 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -13270,7 +13271,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13524,7 +13525,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" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2600n;DES:HP Color LaserJet 2600n;" + PCFileName "hp-color_laserjet_2600n.ppd" + Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" + } +@@ -13659,7 +13660,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" @@ -1332,7 +1350,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -13280,7 +13281,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13669,7 +13670,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" @@ -1341,7 +1359,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } -@@ -13574,7 +13575,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13963,7 +13964,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" @@ -1350,7 +1368,7 @@ diff -up hplip-3.10.5/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.5/prnt/drv PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } -@@ -13582,7 +13583,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13971,7 +13972,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-env-python.patch b/hplip-env-python.patch new file mode 100644 index 0000000..673165c --- /dev/null +++ b/hplip-env-python.patch @@ -0,0 +1,315 @@ +diff -up hplip-3.10.6/align.py.env_python hplip-3.10.6/align.py +--- hplip-3.10.6/align.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/align.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/check.py.env_python hplip-3.10.6/check.py +--- hplip-3.10.6/check.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/check.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/clean.py.env_python hplip-3.10.6/clean.py +--- hplip-3.10.6/clean.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/clean.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/colorcal.py.env_python hplip-3.10.6/colorcal.py +--- hplip-3.10.6/colorcal.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/colorcal.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/dat2drv.py.env_python hplip-3.10.6/dat2drv.py +--- hplip-3.10.6/dat2drv.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/dat2drv.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2008-9 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/devicesettings.py.env_python hplip-3.10.6/devicesettings.py +--- hplip-3.10.6/devicesettings.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/devicesettings.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/fab.py.env_python hplip-3.10.6/fab.py +--- hplip-3.10.6/fab.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/fab.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/fax/backend/hpfax.py.env_python hplip-3.10.6/fax/backend/hpfax.py +--- hplip-3.10.6/fax/backend/hpfax.py.env_python 2010-07-19 04:17:35.000000000 +0200 ++++ hplip-3.10.6/fax/backend/hpfax.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/faxsetup.py.env_python hplip-3.10.6/faxsetup.py +--- hplip-3.10.6/faxsetup.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/faxsetup.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/firmware.py.env_python hplip-3.10.6/firmware.py +--- hplip-3.10.6/firmware.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/firmware.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/hpdio.py.env_python hplip-3.10.6/hpdio.py +--- hplip-3.10.6/hpdio.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/hpdio.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/hpssd.py.env_python hplip-3.10.6/hpssd.py +--- hplip-3.10.6/hpssd.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/hpssd.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/info.py.env_python hplip-3.10.6/info.py +--- hplip-3.10.6/info.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/info.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/installer/text_install.py.env_python hplip-3.10.6/installer/text_install.py +--- hplip-3.10.6/installer/text_install.py.env_python 2010-07-19 04:17:37.000000000 +0200 ++++ hplip-3.10.6/installer/text_install.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/install.py.env_python hplip-3.10.6/install.py +--- hplip-3.10.6/install.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/install.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/levels.py.env_python hplip-3.10.6/levels.py +--- hplip-3.10.6/levels.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/levels.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/linefeedcal.py.env_python hplip-3.10.6/linefeedcal.py +--- hplip-3.10.6/linefeedcal.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/linefeedcal.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/makecopies.py.env_python hplip-3.10.6/makecopies.py +--- hplip-3.10.6/makecopies.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/makecopies.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/makeuri.py.env_python hplip-3.10.6/makeuri.py +--- hplip-3.10.6/makeuri.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/makeuri.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/pkservice.py.env_python hplip-3.10.6/pkservice.py +--- hplip-3.10.6/pkservice.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/pkservice.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/plugin.py.env_python hplip-3.10.6/plugin.py +--- hplip-3.10.6/plugin.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/plugin.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/pqdiag.py.env_python hplip-3.10.6/pqdiag.py +--- hplip-3.10.6/pqdiag.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/pqdiag.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/print.py.env_python hplip-3.10.6/print.py +--- hplip-3.10.6/print.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/print.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/printsettings.py.env_python hplip-3.10.6/printsettings.py +--- hplip-3.10.6/printsettings.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/printsettings.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/probe.py.env_python hplip-3.10.6/probe.py +--- hplip-3.10.6/probe.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/probe.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/query.py.env_python hplip-3.10.6/query.py +--- hplip-3.10.6/query.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/query.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/scan.py.env_python hplip-3.10.6/scan.py +--- hplip-3.10.6/scan.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/scan.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/scan/sane.py.env_python hplip-3.10.6/scan/sane.py +--- hplip-3.10.6/scan/sane.py.env_python 2010-07-19 04:16:05.000000000 +0200 ++++ hplip-3.10.6/scan/sane.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/sendfax.py.env_python hplip-3.10.6/sendfax.py +--- hplip-3.10.6/sendfax.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/sendfax.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/setup.py.env_python hplip-3.10.6/setup.py +--- hplip-3.10.6/setup.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/setup.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/testpage.py.env_python hplip-3.10.6/testpage.py +--- hplip-3.10.6/testpage.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/testpage.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2008 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/timedate.py.env_python hplip-3.10.6/timedate.py +--- hplip-3.10.6/timedate.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/timedate.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/toolbox.py.env_python hplip-3.10.6/toolbox.py +--- hplip-3.10.6/toolbox.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/toolbox.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/unload.py.env_python hplip-3.10.6/unload.py +--- hplip-3.10.6/unload.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/unload.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.10.6/wificonfig.py.env_python hplip-3.10.6/wificonfig.py +--- hplip-3.10.6/wificonfig.py.env_python 2010-07-19 04:17:45.000000000 +0200 ++++ hplip-3.10.6/wificonfig.py 2010-07-26 20:21:01.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. diff --git a/hplip.spec b/hplip.spec index 819046c..6fac4b7 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.10.5 -Release: 7%{?dist} +Version: 3.10.6 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,7 +26,7 @@ Patch9: hplip-snmp-quirks.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch -Patch13: hplip-bad-state-attr.patch +Patch13: hplip-env-python.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch @@ -145,6 +145,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # 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). %patch5 -p1 -b .deviceIDs-drv # Stopped hpcups pointlessly trying to read spool files @@ -170,8 +172,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Clear old printer-state-reasons we used to manage (bug #510926). %patch12 -p1 -b .clear-old-state-reasons -# Fixed marker-supply attributes in hpijs (bug #605269). -%patch13 -p1 -b .bad-state-attr +# Change shebang /usr/bin/env python -> /usr/bin/python (bug #618351). +%patch13 -p1 -b .env_python # Avoid busy loop in hpcups when backend has exited (bug #525944). %patch14 -p1 -b .hpcups-sigpipe @@ -444,6 +446,13 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Tue Jul 27 2010 Jiri Popelka - 3.10.6-1 +- 3.10.6. +- Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351). +- Corrected IEEE 1284 Device IDs: + - HP Color LaserJet CP1518ni (bug #613689). + - HP Color LaserJet 2600n (bug #613712). + * Mon Jun 24 2010 Jiri Popelka - 3.10.5-7 - Added COPYING to common sub-package. diff --git a/sources b/sources index c173d16..751bced 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4a3679d5987520226ef70d834b63b88 hplip-3.10.5.tar.gz +96c36e3baf35e93cf9436a772f0c9ef4 hplip-3.10.6.tar.gz