rpms/hplip/devel hplip-3.10.5.tar.gz.asc, NONE, 1.1 .cvsignore, 1.37, 1.38 hplip-bad-low-ink-warning.patch, 1.1, 1.2 hplip-dbglog-newline.patch, 1.1, 1.2 hplip-deviceIDs-drv.patch, 1.3, 1.4 hplip-no-system-tray.patch, 1.1, 1.2 hplip-pstotiff-is-rubbish.patch, 1.2, 1.3 hplip-udev-rules.patch, 1.7, 1.8 hplip.spec, 1.277, 1.278 sources, 1.38, 1.39 hplip-3.10.2.tar.gz.asc, 1.1, NONE hplip-tray-icon-crash.patch, 1.1, NONE
Jiří Popelka
jpopelka at fedoraproject.org
Mon May 17 14:19:54 UTC 2010
Author: jpopelka
Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18099
Modified Files:
.cvsignore hplip-bad-low-ink-warning.patch
hplip-dbglog-newline.patch hplip-deviceIDs-drv.patch
hplip-no-system-tray.patch hplip-pstotiff-is-rubbish.patch
hplip-udev-rules.patch hplip.spec sources
Added Files:
hplip-3.10.5.tar.gz.asc
Removed Files:
hplip-3.10.2.tar.gz.asc hplip-tray-icon-crash.patch
Log Message:
* Mon May 17 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.5-1
- 3.10.5. No longer need tray-icon-crash.patch
- Increase the timeout for system tray availability checking (bug #569969).
--- NEW FILE hplip-3.10.5.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkvrPtwACgkQc9dwzaWQR7kBQQCg5QMDPz05Oz1r9aQtk7drg8mQ
wxEAoMYrbJ7YkjqWyhsK/04y8tqZ022U
=H4Nc
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore 7 Apr 2010 14:37:11 -0000 1.37
+++ .cvsignore 17 May 2010 14:19:53 -0000 1.38
@@ -34,3 +34,4 @@ hplip-3.9.10.tar.gz
hplip-3.9.12.tar.gz
hplip-3.10.2.tar.gz
hpcups-update-ppds.sh
+hplip-3.10.5.tar.gz
hplip-bad-low-ink-warning.patch:
dj9xxvip.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: hplip-bad-low-ink-warning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-bad-low-ink-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-bad-low-ink-warning.patch 26 Nov 2009 14:33:07 -0000 1.1
+++ hplip-bad-low-ink-warning.patch 17 May 2010 14:19:54 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp
---- hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning 2009-11-26 14:30:31.325303260 +0000
-+++ hplip-3.9.10/prnt/hpijs/dj9xxvip.cpp 2009-11-26 14:31:10.125303367 +0000
-@@ -2222,7 +2222,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
+diff -up hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp
+--- hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning 2010-05-13 01:48:58.000000000 +0200
++++ hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp 2010-05-17 14:56:31.000000000 +0200
+@@ -2239,7 +2239,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
{
case '5':
{
@@ -10,7 +10,7 @@ diff -up hplip-3.9.10/prnt/hpijs/dj9xxvi
{
if (err != NO_ERROR)
{
-@@ -2237,7 +2237,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
+@@ -2254,7 +2254,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
}
case '6':
{
@@ -19,7 +19,7 @@ diff -up hplip-3.9.10/prnt/hpijs/dj9xxvi
{
if (err != NO_ERROR)
{
-@@ -2252,7 +2252,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
+@@ -2269,7 +2269,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
}
case '7':
{
@@ -28,7 +28,7 @@ diff -up hplip-3.9.10/prnt/hpijs/dj9xxvi
{
if (err != NO_ERROR)
{
-@@ -2268,7 +2268,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
+@@ -2285,7 +2285,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
}
case '8':
{
hplip-dbglog-newline.patch:
HPCupsFilter.cpp | 12 ++++++------
Lidil.cpp | 12 ++++++------
Pcl3.cpp | 10 +++++-----
Pcl3Gui.cpp | 10 +++++-----
4 files changed, 22 insertions(+), 22 deletions(-)
Index: hplip-dbglog-newline.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-dbglog-newline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-dbglog-newline.patch 27 Apr 2010 11:04:10 -0000 1.1
+++ hplip-dbglog-newline.patch 17 May 2010 14:19:54 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp
---- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-04-27 12:20:42.000000000 +0200
-+++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-27 12:38:09.000000000 +0200
+diff -up hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-05-17 15:00:02.000000000 +0200
++++ hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp 2010-05-17 15:00:02.000000000 +0200
@@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
(attr->value != NULL)) {
strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1);
@@ -36,7 +36,7 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCups
}
m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32];
-@@ -495,7 +495,7 @@ int HPCupsFilter::StartPrintJob(int arg
+@@ -503,7 +503,7 @@ int HPCupsFilter::StartPrintJob(int arg
close(fd);
}
if (m_iLogLevel & BASIC_LOG)
@@ -45,7 +45,7 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCups
closeFilter();
cupsRasterClose(cups_raster);
return 1;
-@@ -505,7 +505,7 @@ int HPCupsFilter::StartPrintJob(int arg
+@@ -513,7 +513,7 @@ int HPCupsFilter::StartPrintJob(int arg
close(fd);
}
if (m_iLogLevel & BASIC_LOG)
@@ -54,9 +54,9 @@ diff -up hplip-3.10.2/prnt/hpcups/HPCups
closeFilter();
cupsRasterClose(cups_raster);
return 0;
-diff -up hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Lidil.cpp
---- hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100
-+++ hplip-3.10.2/prnt/hpcups/Lidil.cpp 2010-04-27 12:38:08.000000000 +0200
+diff -up hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Lidil.cpp
+--- hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200
++++ hplip-3.10.5/prnt/hpcups/Lidil.cpp 2010-05-17 15:00:02.000000000 +0200
@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline *
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
m_pPM->BaseResY != m_pQA->vertical_resolution)
@@ -109,9 +109,9 @@ diff -up hplip-3.10.2/prnt/hpcups/Lidil.
return false;
}
-diff -up hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3.cpp
---- hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100
-+++ hplip-3.10.2/prnt/hpcups/Pcl3.cpp 2010-04-27 12:38:07.000000000 +0200
+diff -up hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Pcl3.cpp
+--- hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200
++++ hplip-3.10.5/prnt/hpcups/Pcl3.cpp 2010-05-17 15:00:02.000000000 +0200
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline **
if (!selectPrintMode())
@@ -155,9 +155,9 @@ diff -up hplip-3.10.2/prnt/hpcups/Pcl3.c
return false;
}
-diff -up hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp
---- hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100
-+++ hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp 2010-04-27 12:38:06.000000000 +0200
+diff -up hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp
+--- hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200
++++ hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp 2010-05-17 15:00:02.000000000 +0200
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline
if (!selectPrintMode())
hplip-deviceIDs-drv.patch:
hpcups.drv.in | 301 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 151 insertions(+), 150 deletions(-)
Index: hplip-deviceIDs-drv.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-deviceIDs-drv.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hplip-deviceIDs-drv.patch 12 May 2010 10:27:41 -0000 1.3
+++ hplip-deviceIDs-drv.patch 17 May 2010 14:19:54 -0000 1.4
@@ -1,7 +1,7 @@
-diff -up hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.2/prnt/drv/hpcups.drv.in
---- hplip-3.10.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-02-24 23:09:42.000000000 +0000
-+++ hplip-3.10.2/prnt/drv/hpcups.drv.in 2010-04-16 22:20:26.664147525 +0100
-@@ -421,7 +421,7 @@ Manufacturer "HP"
+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"
ModelName "HP Officejet v40xi"
Attribute "NickName" "" "HP Officejet v40xi, $Version"
Attribute "ShortNickName" "" "HP Officejet v40xi"
@@ -10,7 +10,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_v40xi.ppd"
Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)"
}
-@@ -429,7 +429,7 @@ Manufacturer "HP"
+@@ -432,7 +432,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_v40.ppd"
Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)"
-@@ -446,7 +446,7 @@ Manufacturer "HP"
+@@ -449,7 +449,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_g55.ppd"
Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)"
}
-@@ -494,7 +494,7 @@ Manufacturer "HP"
+@@ -497,7 +497,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_g85.ppd"
Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)"
}
-@@ -510,7 +510,7 @@ Manufacturer "HP"
+@@ -513,7 +513,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_g95.ppd"
Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)"
}
-@@ -526,7 +526,7 @@ Manufacturer "HP"
+@@ -529,7 +529,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_750xi.ppd"
Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)"
}
-@@ -534,7 +534,7 @@ Manufacturer "HP"
+@@ -537,7 +537,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_750.ppd"
Attribute "Product" "" "(HP PSC 750 All-in-one Printer)"
}
-@@ -566,7 +566,7 @@ Manufacturer "HP"
+@@ -569,7 +569,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_900_series.ppd"
Attribute "Product" "" "(HP PSC 900 All-in-one Printer)"
}
-@@ -582,7 +582,7 @@ Manufacturer "HP"
+@@ -585,7 +585,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_920c.ppd"
Attribute "Product" "" "(HP Deskjet 920c Printer)"
Attribute "Product" "" "(HP Deskjet 920cvr Printer)"
-@@ -601,7 +601,7 @@ Manufacturer "HP"
+@@ -604,7 +604,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_930c.ppd"
Attribute "Product" "" "(HP Deskjet 930c Printer)"
Attribute "Product" "" "(HP Deskjet 930cm Printer)"
-@@ -642,7 +642,7 @@ Manufacturer "HP"
+@@ -645,7 +645,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_940c.ppd"
Attribute "Product" "" "(HP Deskjet 940cvr Printer)"
Attribute "Product" "" "(HP Deskjet 940c Printer)"
-@@ -661,7 +661,7 @@ Manufacturer "HP"
+@@ -664,7 +664,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_950c.ppd"
Attribute "Product" "" "(HP Deskjet 950c Printer)"
}
-@@ -718,7 +718,7 @@ Manufacturer "HP"
+@@ -721,7 +721,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_959c.ppd"
Attribute "Product" "" "(HP Deskjet 959c Printer)"
}
-@@ -726,7 +726,7 @@ Manufacturer "HP"
+@@ -729,7 +729,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_970c.ppd"
Attribute "Product" "" "(HP Deskjet 970cxi Printer)"
Attribute "Product" "" "(HP Deskjet 970cse Printer)"
-@@ -746,7 +746,7 @@ Manufacturer "HP"
+@@ -749,7 +749,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.2/prnt/drv/hpcups.dr
PCFileName "hp-photosmart_p1000.ppd"
Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)"
Attribute "Product" "" "(HP Photosmart p1000xi Printer)"
-@@ -755,7 +755,7 @@ Manufacturer "HP"
+@@ -758,7 +758,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.2/prnt/drv/hpcups.dr
PCFileName "hp-photosmart_p1100.ppd"
Attribute "Product" "" "(HP Photosmart p1100 Printer)"
Attribute "Product" "" "(HP Photosmart p1100xi Printer)"
-@@ -789,7 +789,7 @@ Manufacturer "HP"
+@@ -792,7 +792,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_3820.ppd"
Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)"
Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)"
-@@ -827,7 +827,7 @@ Manufacturer "HP"
+@@ -830,7 +830,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_5105.ppd"
Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)"
}
-@@ -835,7 +835,7 @@ Manufacturer "HP"
+@@ -838,7 +838,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_5110v.ppd"
Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)"
}
-@@ -886,7 +886,7 @@ Manufacturer "HP"
+@@ -889,7 +889,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_1220c.ppd"
Attribute "Product" "" "(HP Deskjet 1220c Printer)"
Attribute "Product" "" "(HP Deskjet 1220cse Printer)"
-@@ -1082,7 +1082,7 @@ Manufacturer "HP"
+@@ -1085,7 +1085,7 @@ Manufacturer "HP"
ModelName "HP 2000c"
Attribute "NickName" "" "HP 2000c, $Version"
Attribute "ShortNickName" "" "HP 2000c"
@@ -190,7 +190,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-2000c.ppd"
Attribute "Product" "" "(HP 2000cse Printer)"
Attribute "Product" "" "(HP 2000c Printer)"
-@@ -1524,7 +1524,7 @@ Manufacturer "HP"
+@@ -1527,7 +1527,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_d_series.ppd"
Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)"
Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)"
-@@ -1547,7 +1547,7 @@ Manufacturer "HP"
+@@ -1550,7 +1550,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_960c.ppd"
Attribute "Product" "" "(HP Deskjet 960cse Printer)"
Attribute "Product" "" "(HP Deskjet 960cxi Printer)"
-@@ -1557,7 +1557,7 @@ Manufacturer "HP"
+@@ -1560,7 +1560,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_980c.ppd"
Attribute "Product" "" "(HP Deskjet 980cxi Printer)"
Attribute "Product" "" "(HP Deskjet 980c Printer)"
-@@ -1566,7 +1566,7 @@ Manufacturer "HP"
+@@ -1569,7 +1569,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_990c.ppd"
Attribute "Product" "" "(HP Deskjet 990cxi Printer)"
Attribute "Product" "" "(HP Deskjet 990cse Printer)"
-@@ -1629,7 +1629,7 @@ Manufacturer "HP"
+@@ -1632,7 +1632,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.2/prnt/drv/hpcups.dr
PCFileName "hp-color_inkjet_cp1700.ppd"
Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
}
-@@ -1637,7 +1637,7 @@ Manufacturer "HP"
+@@ -1640,7 +1640,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_2100_series.ppd"
Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)"
Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)"
-@@ -1650,7 +1650,7 @@ Manufacturer "HP"
+@@ -1653,7 +1653,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_2150_series.ppd"
Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)"
}
-@@ -1658,7 +1658,7 @@ Manufacturer "HP"
+@@ -1661,7 +1661,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_2170_series.ppd"
Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)"
Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)"
-@@ -1695,7 +1695,7 @@ Manufacturer "HP"
+@@ -1698,7 +1698,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_7100_series.ppd"
Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)"
-@@ -1925,7 +1925,7 @@ Manufacturer "HP"
+@@ -1928,7 +1928,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.2/prnt/drv/hpcups.dr
PCFileName "hp-business_inkjet_2200.ppd"
Attribute "Product" "" "(HP Business Inkjet 2200 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2200se Printer)"
-@@ -1935,7 +1935,7 @@ Manufacturer "HP"
+@@ -1938,7 +1938,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.2/prnt/drv/hpcups.dr
PCFileName "hp-business_inkjet_2230.ppd"
Attribute "Product" "" "(HP Business Inkjet 2230 Printer)"
}
-@@ -1943,7 +1943,7 @@ Manufacturer "HP"
+@@ -1946,7 +1946,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.2/prnt/drv/hpcups.dr
PCFileName "hp-business_inkjet_2250-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2250 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)"
-@@ -1952,7 +1952,7 @@ Manufacturer "HP"
+@@ -1955,7 +1955,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.2/prnt/drv/hpcups.dr
PCFileName "hp-business_inkjet_2280-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2280 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)"
-@@ -2465,7 +2465,7 @@ Manufacturer "HP"
+@@ -2476,7 +2476,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_1600_series.ppd"
Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)"
Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)"
-@@ -2481,7 +2481,7 @@ Manufacturer "HP"
+@@ -2492,7 +2492,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_2200_series.ppd"
Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)"
}
-@@ -2499,7 +2499,7 @@ Manufacturer "HP"
+@@ -2510,7 +2510,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.2/prnt/drv/hpcups.dr
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)"
-@@ -2508,7 +2508,7 @@ Manufacturer "HP"
+@@ -2519,7 +2519,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_2350_series.ppd"
Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)"
Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)"
-@@ -2525,7 +2525,7 @@ Manufacturer "HP"
+@@ -2536,7 +2536,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.2/prnt/drv/hpcups.dr
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)"
-@@ -2551,7 +2551,7 @@ Manufacturer "HP"
+@@ -2562,7 +2562,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.2/prnt/drv/hpcups.dr
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)"
-@@ -3012,7 +3012,7 @@ Manufacturer "HP"
+@@ -3023,7 +3023,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_j5700_series.ppd"
Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)"
-@@ -3085,7 +3085,7 @@ Manufacturer "HP"
+@@ -3096,7 +3096,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_6100_series.ppd"
Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)"
-@@ -3140,7 +3140,7 @@ Manufacturer "HP"
+@@ -3151,7 +3151,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_6300_series.ppd"
Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)"
-@@ -3309,7 +3309,7 @@ Manufacturer "HP"
+@@ -3320,7 +3320,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_7200_series.ppd"
Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)"
-@@ -3394,7 +3394,7 @@ Manufacturer "HP"
+@@ -3405,7 +3405,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_7400_series.ppd"
Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)"
-@@ -7292,7 +7292,7 @@ Manufacturer "HP"
+@@ -7327,7 +7327,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_1100_series.ppd"
Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)"
Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)"
-@@ -7302,7 +7302,7 @@ Manufacturer "HP"
+@@ -7337,7 +7337,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.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_1200_series.ppd"
Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)"
Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)"
-@@ -7485,7 +7485,7 @@ Manufacturer "HP"
+@@ -7520,7 +7520,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.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_3940.ppd"
Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)"
Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)"
-@@ -7494,7 +7494,7 @@ Manufacturer "HP"
+@@ -7529,7 +7529,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.2/prnt/drv/hpcups.dr
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)"
-@@ -7521,7 +7521,7 @@ Manufacturer "HP"
+@@ -7556,7 +7556,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_4300_series.ppd"
Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)"
-@@ -7819,7 +7819,7 @@ Manufacturer "HP"
+@@ -7854,7 +7854,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_j3600_series.ppd"
Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)"
-@@ -7890,7 +7890,7 @@ Manufacturer "HP"
+@@ -7925,7 +7925,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.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_4200_series.ppd"
Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)"
-@@ -8387,6 +8387,7 @@ Manufacturer "HP"
+@@ -8422,6 +8422,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.2/prnt/drv/hpcups.dr
PCFileName "hp-photosmart_380_series.ppd"
Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)"
Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)"
-@@ -8814,7 +8815,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8849,7 +8850,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_4_plus-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4 Plus Printer)"
Attribute "Product" "" "(HP LaserJet 4m Plus Printer)"
-@@ -8840,7 +8841,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8875,7 +8876,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_5mp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 5mp Printer)"
}
-@@ -8848,7 +8849,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8883,7 +8884,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_5l.ppd"
Attribute "Product" "" "(HP LaserJet 5l Printer)"
Attribute "Product" "" "(HP LaserJet 5l-fs Printer)"
-@@ -8858,7 +8859,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8893,7 +8894,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_5p.ppd"
Attribute "Product" "" "(HP LaserJet 5p Printer)"
}
-@@ -8866,7 +8867,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8901,7 +8902,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_6l.ppd"
Attribute "Product" "" "(HP LaserJet 6l Printer)"
Attribute "Product" "" "(HP LaserJet 6lse Printer)"
-@@ -8878,7 +8879,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8913,7 +8914,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_6p.ppd"
Attribute "Product" "" "(HP LaserJet 6p Printer)"
}
-@@ -8886,7 +8887,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8921,7 +8922,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_6mp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 6mp Printer)"
Attribute "Product" "" "(HP LaserJet 6mp Se Printer)"
-@@ -8896,7 +8897,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8931,7 +8932,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1015.ppd"
Attribute "Product" "" "(HP LaserJet 1015 Printer)"
}
-@@ -8938,7 +8939,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8973,7 +8974,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1100.ppd"
Attribute "Product" "" "(HP LaserJet 1100 Printer)"
Attribute "Product" "" "(HP LaserJet 1100se Printer)"
-@@ -8956,7 +8957,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -8991,7 +8992,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1150.ppd"
Attribute "Product" "" "(HP LaserJet 1150 Printer)"
}
-@@ -8973,7 +8974,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9008,7 +9009,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1160_series.ppd"
Attribute "Product" "" "(HP LaserJet 1160 Series Printer)"
}
-@@ -8981,7 +8982,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9016,7 +9017,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1200-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 1200 Printer)"
Attribute "Product" "" "(HP LaserJet 1200se Printer)"
-@@ -9006,7 +9007,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9041,7 +9042,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1220-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)"
}
-@@ -9014,7 +9015,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9049,7 +9050,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1300-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 1300 Printer)"
Attribute "Product" "" "(HP LaserJet 1300t Printer)"
-@@ -9039,7 +9040,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9074,7 +9075,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1320_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 1320 Series Printer)"
}
-@@ -9063,7 +9064,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9098,7 +9099,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1320.ppd"
Attribute "Product" "" "(HP LaserJet 1320 Printer)"
Attribute "Product" "" "(HP LaserJet 1320t Printer)"
-@@ -9136,7 +9137,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9171,7 +9172,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_p2015_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet p2015 Printer)"
}
-@@ -9212,7 +9213,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9247,7 +9248,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_2100_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2100 Series Printer)"
}
-@@ -9228,7 +9229,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9263,7 +9264,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_2200-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2200 Printer)"
Attribute "Product" "" "(HP LaserJet 2200d Printer)"
-@@ -9241,7 +9242,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9276,7 +9277,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_2300-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2300 Printer)"
Attribute "Product" "" "(HP LaserJet 2300n Printer)"
-@@ -9254,7 +9255,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9289,7 +9290,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_2300_series.ppd"
Attribute "Product" "" "(HP LaserJet 2300 Series Printer)"
}
-@@ -9270,7 +9271,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9305,7 +9306,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_2420-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2420 Printer)"
Attribute "Product" "" "(HP LaserJet 2420d Printer)"
-@@ -9281,7 +9282,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9316,7 +9317,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_2430-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 2430t Printer)"
Attribute "Product" "" "(HP LaserJet 2430 Printer)"
-@@ -9331,7 +9332,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9366,7 +9367,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3015-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)"
}
-@@ -9339,7 +9340,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9374,7 +9375,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3020-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)"
}
-@@ -9347,7 +9348,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9382,7 +9383,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)"
-@@ -9356,7 +9357,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9391,7 +9392,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3030-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)"
}
-@@ -9364,7 +9365,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9399,7 +9400,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3050-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)"
Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)"
-@@ -9373,7 +9374,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9408,7 +9409,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3052-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)"
}
-@@ -9381,7 +9382,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9416,7 +9417,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3055.ppd"
Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)"
}
-@@ -9409,7 +9410,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9444,7 +9445,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3200m-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)"
}
-@@ -9425,7 +9426,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9460,7 +9461,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3200.ppd"
Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)"
}
-@@ -9445,7 +9446,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9480,7 +9481,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3330.ppd"
Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)"
}
-@@ -9453,7 +9454,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9488,7 +9489,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3380-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)"
}
-@@ -9461,7 +9462,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9496,7 +9497,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_3390-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)"
}
-@@ -9477,7 +9478,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9512,7 +9513,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_4000_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4000 Printer)"
Attribute "Product" "" "(HP LaserJet 4000n Printer)"
-@@ -9553,7 +9554,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9588,7 +9589,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_4050_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4050 Printer)"
Attribute "Product" "" "(HP LaserJet 4050n Printer)"
-@@ -9565,7 +9566,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9600,7 +9601,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_4100_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 410dtn Printer)"
Attribute "Product" "" "(HP LaserJet 4100tn Printer)"
-@@ -9593,7 +9594,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9628,7 +9629,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_4200-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4200 Printer)"
Attribute "Product" "" "(HP LaserJet 4200l Printer)"
-@@ -9618,7 +9619,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9653,7 +9654,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_4250-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4250 Printer)"
Attribute "Product" "" "(HP LaserJet 4250dtn Printer)"
-@@ -9630,7 +9631,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9665,7 +9666,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_4300-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4300 Printer)"
Attribute "Product" "" "(HP LaserJet 4300dtn Printer)"
-@@ -9643,7 +9644,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9678,7 +9679,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_4345_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)"
-@@ -9654,7 +9655,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9689,7 +9690,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)"
-@@ -9725,7 +9726,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9760,7 +9761,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_5000_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 5000 Series Printer)"
}
-@@ -9835,7 +9836,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9870,7 +9871,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_5si-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 5si Printer)"
Attribute "Product" "" "(HP LaserJet 5si Hm Printer)"
-@@ -9871,7 +9872,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9906,7 +9907,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)"
-@@ -9892,7 +9893,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9927,7 +9928,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)"
}
-@@ -9900,7 +9901,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9935,7 +9936,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)"
Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)"
-@@ -9961,7 +9962,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10004,7 +10005,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.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_8150_series-pcl3.ppd"
Attribute "Product" "" "(HP LaserJet 8150 Printer)"
Attribute "Product" "" "(HP LaserJet 8150n Printer)"
-@@ -10174,7 +10175,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10217,7 +10218,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,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)"
}
-@@ -10238,7 +10239,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10281,7 +10282,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 +936,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-business_inkjet_2300-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2300 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2300n Printer)"
-@@ -10360,7 +10361,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10403,7 +10404,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 +945,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-color_laserjet_3800-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 3800 Printer)"
Attribute "Product" "" "(HP Color LaserJet 3800n Printer)"
-@@ -10407,7 +10408,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10450,7 +10451,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 +954,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-color_laserjet_4550-pcl3.ppd"
Attribute "Product" "" "(HP Color LaserJet 4550 Printer)"
Attribute "Product" "" "(HP Color LaserJet 4550n Printer)"
-@@ -10420,7 +10421,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10463,7 +10464,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 +963,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-color_laserjet_4600_series.ppd"
Attribute "Product" "" "(HP Color LaserJet 4600 Printer)"
Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)"
-@@ -10518,7 +10519,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10561,7 +10562,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 +972,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
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)"
-@@ -10559,7 +10560,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10602,7 +10603,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 +981,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-business_inkjet_2800-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2800 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)"
-@@ -10851,7 +10852,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10894,7 +10895,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1010"
Attribute "NickName" "" "HP LaserJet 1010, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1010"
@@ -990,7 +990,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1010.ppd"
Attribute "Product" "" "(HP LaserJet 1010 Printer)"
}
-@@ -10859,7 +10860,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10902,7 +10903,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP LaserJet 1012"
Attribute "NickName" "" "HP LaserJet 1012, $Version"
Attribute "ShortNickName" "" "HP LaserJet 1012"
@@ -999,7 +999,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1012.ppd"
Attribute "Product" "" "(HP LaserJet 1012 Printer)"
}
-@@ -11067,7 +11068,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11110,7 +11111,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet Lx"
Attribute "NickName" "" "HP Officejet Lx, $Version"
Attribute "ShortNickName" "" "HP Officejet Lx"
@@ -1008,7 +1008,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_lx.ppd"
Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)"
}
-@@ -11231,7 +11232,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11274,7 +11275,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 +1017,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_series_300.ppd"
Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)"
}
-@@ -11255,7 +11256,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11298,7 +11299,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 400"
Attribute "NickName" "" "HP Deskjet 400, $Version"
Attribute "ShortNickName" "" "HP Deskjet 400"
@@ -1026,7 +1026,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_400.ppd"
Attribute "Product" "" "(HP Deskjet 400 Printer)"
Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)"
-@@ -11272,7 +11273,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11315,7 +11316,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 540"
Attribute "NickName" "" "HP Deskjet 540, $Version"
Attribute "ShortNickName" "" "HP Deskjet 540"
@@ -1035,7 +1035,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_540.ppd"
Attribute "Product" "" "(HP Deskjet 540 Printer)"
}
-@@ -11397,7 +11398,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11440,7 +11441,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 630c"
Attribute "NickName" "" "HP Deskjet 630c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 630c"
@@ -1044,7 +1044,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_630c.ppd"
Attribute "Product" "" "(HP Deskjet 630c Printer)"
}
-@@ -11413,7 +11414,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11456,7 +11457,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 656c"
Attribute "NickName" "" "HP Deskjet 656c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 656c"
@@ -1053,7 +1053,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_656c.ppd"
Attribute "Product" "" "(HP Deskjet 656c Printer)"
Attribute "Product" "" "(HP Deskjet 656cvr Printer)"
-@@ -11526,7 +11527,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11569,7 +11570,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 600"
Attribute "NickName" "" "HP Deskjet 600, $Version"
Attribute "ShortNickName" "" "HP Deskjet 600"
@@ -1062,7 +1062,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_600.ppd"
Attribute "Product" "" "(HP Deskjet 600c Printer)"
Attribute "Product" "" "(HP Deskjet 600 Printer)"
-@@ -11548,7 +11549,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11591,7 +11592,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 +1071,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_series_500.ppd"
Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)"
}
-@@ -11588,7 +11589,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11631,7 +11632,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 +1080,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_series_600.ppd"
Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)"
}
-@@ -11640,7 +11641,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11683,7 +11684,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 670c"
Attribute "NickName" "" "HP Deskjet 670c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 670c"
@@ -1089,7 +1089,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_670c.ppd"
Attribute "Product" "" "(HP Deskjet 670c)"
}
-@@ -11792,7 +11793,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11835,7 +11836,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 610c"
Attribute "NickName" "" "HP Deskjet 610c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 610c"
@@ -1098,7 +1098,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_610c.ppd"
Attribute "Product" "" "(HP Deskjet 610c Printer)"
}
-@@ -11816,7 +11817,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11859,7 +11860,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 640c"
Attribute "NickName" "" "HP Deskjet 640c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 640c"
@@ -1107,7 +1107,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_640c.ppd"
Attribute "Product" "" "(HP Deskjet 640c Lite Printer)"
Attribute "Product" "" "(HP Deskjet 640c Printer)"
-@@ -11836,7 +11837,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11879,7 +11880,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 690c"
Attribute "NickName" "" "HP Deskjet 690c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 690c"
@@ -1116,7 +1116,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_690c.ppd"
Attribute "Product" "" "(HP Deskjet 690c Plus Printer)"
Attribute "Product" "" "(HP Deskjet 690c Printer)"
-@@ -11896,7 +11897,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11939,7 +11940,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 +1125,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_series_700.ppd"
Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)"
}
-@@ -12039,7 +12040,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12082,7 +12083,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 +1134,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_t_series.ppd"
Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)"
-@@ -12050,7 +12051,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12093,7 +12094,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r40"
Attribute "NickName" "" "HP Officejet r40, $Version"
Attribute "ShortNickName" "" "HP Officejet r40"
@@ -1143,7 +1143,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_r40.ppd"
Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)"
}
-@@ -12074,7 +12075,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12117,7 +12118,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r60"
Attribute "NickName" "" "HP Officejet r60, $Version"
Attribute "ShortNickName" "" "HP Officejet r60"
@@ -1152,7 +1152,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_r60.ppd"
Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)"
}
-@@ -12082,7 +12083,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12125,7 +12126,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r65"
Attribute "NickName" "" "HP Officejet r65, $Version"
Attribute "ShortNickName" "" "HP Officejet r65"
@@ -1161,7 +1161,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_r65.ppd"
Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)"
}
-@@ -12098,7 +12099,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12141,7 +12142,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r80"
Attribute "NickName" "" "HP Officejet r80, $Version"
Attribute "ShortNickName" "" "HP Officejet r80"
@@ -1170,7 +1170,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-officejet_r80.ppd"
Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)"
}
-@@ -12106,7 +12107,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12149,7 +12150,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP PSC 500"
Attribute "NickName" "" "HP PSC 500, $Version"
Attribute "ShortNickName" "" "HP PSC 500"
@@ -1179,7 +1179,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-psc_500.ppd"
Attribute "Product" "" "(HP PSC 500 All-in-one Printer)"
Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)"
-@@ -12123,7 +12124,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12166,7 +12167,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 812c"
Attribute "NickName" "" "HP Deskjet 812c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 812c"
@@ -1188,7 +1188,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_812c.ppd"
Attribute "Product" "" "(HP Deskjet 812c Printer)"
}
-@@ -12131,7 +12132,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12174,7 +12175,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 815c"
Attribute "NickName" "" "HP Deskjet 815c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 815c"
@@ -1197,7 +1197,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_815c.ppd"
Attribute "Product" "" "(HP Deskjet 815c Printer)"
}
-@@ -12163,7 +12164,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12206,7 +12207,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 840c"
Attribute "NickName" "" "HP Deskjet 840c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 840c"
@@ -1206,7 +1206,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_840c.ppd"
Attribute "Product" "" "(HP Deskjet 840c Printer)"
}
-@@ -12171,7 +12172,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12214,7 +12215,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 841c"
Attribute "NickName" "" "HP Deskjet 841c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 841c"
@@ -1215,7 +1215,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_841c.ppd"
Attribute "Product" "" "(HP Deskjet 841c Printer)"
}
-@@ -12187,7 +12188,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12230,7 +12231,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 843c"
Attribute "NickName" "" "HP Deskjet 843c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 843c"
@@ -1224,7 +1224,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_843c.ppd"
Attribute "Product" "" "(HP Deskjet 843c Printer)"
Attribute "Product" "" "(HP Deskjet 843cxe Printer)"
-@@ -12196,7 +12197,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12239,7 +12240,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 880c"
Attribute "NickName" "" "HP Deskjet 880c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 880c"
@@ -1233,7 +1233,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_880c.ppd"
Attribute "Product" "" "(HP Deskjet 880c Printer)"
}
-@@ -12212,7 +12213,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12255,7 +12256,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 895c"
Attribute "NickName" "" "HP Deskjet 895c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 895c"
@@ -1242,7 +1242,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_895c.ppd"
Attribute "Product" "" "(HP Deskjet 895cse Printer)"
Attribute "Product" "" "(HP Deskjet 895c Printer)"
-@@ -12329,7 +12330,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12372,7 +12373,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 825c"
Attribute "NickName" "" "HP Deskjet 825c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 825c"
@@ -1251,7 +1251,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_825c.ppd"
Attribute "Product" "" "(HP Deskjet 825cvr Printer)"
Attribute "Product" "" "(HP Deskjet 825c Printer)"
-@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12381,7 +12382,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 845c"
Attribute "NickName" "" "HP Deskjet 845c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 845c"
@@ -1260,7 +1260,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_845c.ppd"
Attribute "Product" "" "(HP Deskjet 845c Printer)"
Attribute "Product" "" "(HP Deskjet 845cvr Printer)"
-@@ -12449,7 +12450,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12492,7 +12493,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 850c"
Attribute "NickName" "" "HP Deskjet 850c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 850c"
@@ -1269,7 +1269,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_850c.ppd"
Attribute "Product" "" "(HP Deskjet 850k Printer)"
Attribute "Product" "" "(HP Deskjet 850c Printer)"
-@@ -12468,7 +12469,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12511,7 +12512,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 870c"
Attribute "NickName" "" "HP Deskjet 870c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 870c"
@@ -1278,7 +1278,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_870c.ppd"
Attribute "Product" "" "(HP Deskjet 870k Printer)"
Attribute "Product" "" "(HP Deskjet 870c Printer)"
-@@ -12479,7 +12480,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12522,7 +12523,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 +1287,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
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)"
-@@ -12593,7 +12594,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12636,7 +12637,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 890c"
Attribute "NickName" "" "HP Deskjet 890c, $Version"
Attribute "ShortNickName" "" "HP Deskjet 890c"
@@ -1296,7 +1296,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-deskjet_890c.ppd"
Attribute "Product" "" "(HP Deskjet 890cse Printer)"
Attribute "Product" "" "(HP Deskjet 890c Printer)"
-@@ -12602,7 +12603,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12645,7 +12646,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 +1305,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
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)"
-@@ -12744,7 +12745,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12787,7 +12788,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 +1314,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1018.ppd"
Attribute "Product" "" "(HP LaserJet 1018 Printer)"
Attribute "Product" "" "(HP LaserJet 1018s Printer)"
-@@ -12753,7 +12754,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12796,7 +12797,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 +1323,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_1020.ppd"
Attribute "Product" "" "(HP LaserJet 1020 Printer)"
Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)"
-@@ -13095,7 +13096,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13270,7 +13271,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 +1332,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-color_laserjet_3500.ppd"
Attribute "Product" "" "(HP Color LaserJet 3500 Printer)"
Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)"
-@@ -13105,7 +13106,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13280,7 +13281,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 +1341,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-color_laserjet_3550.ppd"
Attribute "Product" "" "(HP Color LaserJet 3550 Printer)"
}
-@@ -13399,7 +13400,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13574,7 +13575,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 +1350,7 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
PCFileName "hp-laserjet_p1006.ppd"
Attribute "Product" "" "(HP LaserJet p1006 Printer)"
}
-@@ -13407,7 +13408,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13582,7 +13583,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"
hplip-no-system-tray.patch:
systemtray.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: hplip-no-system-tray.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-system-tray.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-no-system-tray.patch 12 May 2010 08:26:53 -0000 1.1
+++ hplip-no-system-tray.patch 17 May 2010 14:19:54 -0000 1.2
@@ -1,20 +1,20 @@
-diff -up hplip-3.10.2/ui4/systemtray.py.no-system-tray hplip-3.10.2/ui4/systemtray.py
---- hplip-3.10.2/ui4/systemtray.py.no-system-tray 2010-05-11 14:40:57.000000000 +0200
-+++ hplip-3.10.2/ui4/systemtray.py 2010-05-11 15:25:20.000000000 +0200
+diff -up hplip-3.10.5/ui4/systemtray.py.no-system-tray hplip-3.10.5/ui4/systemtray.py
+--- hplip-3.10.5/ui4/systemtray.py.no-system-tray 2010-05-13 01:45:04.000000000 +0200
++++ hplip-3.10.5/ui4/systemtray.py 2010-05-17 15:03:12.000000000 +0200
@@ -74,6 +74,7 @@ HIDE_INACTIVE_DELAY = 5000
BLIP_DELAY = 2000
SET_MENU_DELAY = 1000
MAX_MENU_EVENTS = 10
-+TRAY_AVAILABLE_DELAY = 30
++TRAY_AVAILABLE_TIMEOUT = 180
ERROR_STATE_TO_ICON = {
ERROR_STATE_CLEAR: QSystemTrayIcon.Information,
-@@ -707,7 +708,7 @@ def run(read_pipe):
+@@ -706,7 +707,7 @@ def run(read_pipe):
app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app
i = 0
- while i < 10:
-+ while i < TRAY_AVAILABLE_DELAY:
++ while i < TRAY_AVAILABLE_TIMEOUT:
if QSystemTrayIcon.isSystemTrayAvailable():
break
time.sleep(1.0)
hplip-pstotiff-is-rubbish.patch:
pstotiff | 56 ++++++++++++++++----------------------------------------
1 file changed, 16 insertions(+), 40 deletions(-)
Index: hplip-pstotiff-is-rubbish.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-pstotiff-is-rubbish.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hplip-pstotiff-is-rubbish.patch 1 Mar 2010 11:37:23 -0000 1.2
+++ hplip-pstotiff-is-rubbish.patch 17 May 2010 14:19:54 -0000 1.3
@@ -1,7 +1,7 @@
-diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/filters/pstotiff
---- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish 2010-02-24 23:07:09.000000000 +0000
-+++ hplip-3.10.2/fax/filters/pstotiff 2010-03-01 09:52:50.676611385 +0000
-@@ -1,43 +1,16 @@
+diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/filters/pstotiff
+--- hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish 2010-05-13 01:44:57.000000000 +0200
++++ hplip-3.10.5/fax/filters/pstotiff 2010-05-17 14:39:55.000000000 +0200
+@@ -1,40 +1,16 @@
-#!/usr/bin/env python
-
-import os
@@ -21,14 +21,11 @@ diff -up hplip-3.10.2/fax/filters/pstoti
-temp_out_handle, temp_out_fname = tempfile.mkstemp()
-
-font = "-I/usr/share/cups/fonts"
--device = "-sDEVICE=tiffg4 -dDEBUG -dNOPAUSE -dBATCH -dSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file
+-device = "-sDEVICE=tiffg4 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file
-
-gs_command = "/usr/bin/gs" + " " + font + " " + device
-
-exit_code = os.system(gs_command)
--#if exit_code != 0:
--# print("Ghostscript returned error (error code %d)!" % exit_code)
--# sys.exit(exit_code)
-
-file_len = os.stat(temp_out_fname).st_size
-if (file_len < READ_SIZE):
hplip-udev-rules.patch:
56-hpmud_support.rules | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
Index: hplip-udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-udev-rules.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- hplip-udev-rules.patch 1 Mar 2010 11:37:23 -0000 1.7
+++ hplip-udev-rules.patch 17 May 2010 14:19:54 -0000 1.8
@@ -1,15 +1,18 @@
-diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules
---- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules 2010-03-01 11:21:01.049740484 +0000
-+++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-01 11:21:07.288609454 +0000
-@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
+diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules
+--- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules 2010-05-13 01:44:22.000000000 +0200
++++ hplip-3.10.5/data/rules/56-hpmud_support.rules 2010-05-17 16:12:42.000000000 +0200
+@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
+
LABEL="pid_test"
++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
# Check for LaserJet products (0x03f0xx17).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
-+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
-
+ # Check for LaserJet products (0x03f0xx2a).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
-ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
+ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
-LABEL="hpmud_rules_end"
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- hplip.spec 12 May 2010 15:44:36 -0000 1.277
+++ hplip.spec 17 May 2010 14:19:54 -0000 1.278
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
-Version: 3.10.2
-Release: 16%{?dist}
+Version: 3.10.5
+Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -22,7 +22,6 @@ Patch5: hplip-deviceIDs-drv.patch
Patch6: hplip-mucks-with-spooldir.patch
Patch7: hplip-udev-rules.patch
Patch8: hplip-retry-open.patch
-Patch9: hplip-tray-icon-crash.patch
Patch10: hplip-discovery-method.patch
Patch11: hplip-device-reconnected.patch
Patch12: hplip-clear-old-state-reasons.patch
@@ -155,9 +154,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Retry when connecting to device fails (bug #532112).
%patch8 -p1 -b .retry-open
-# Explicitly destroy tray icon on exit (bug #543286).
-%patch9 -p1 -b .tray-icon-crash
-
# Fixed hp-setup traceback when discovery page is skipped (bug #523685).
%patch10 -p1 -b .discovery-method
@@ -198,7 +194,7 @@ done
# Added missing newline to string argument in dbglog() call (bug #585275).
%patch19 -p1 -b .dbglog-newline
-# Wait for max 30s to see if a system tray becomes available (bug #569969).
+# Wait longer to see if a system tray becomes available (bug #569969).
%patch20 -p1 -b .no-system-tray
# Prevent segfault in cupsext when opening PPD file (bug #572775).
@@ -425,6 +421,10 @@ fi
%{_bindir}/hpcups-update-ppds &>/dev/null ||:
%changelog
+* Mon May 17 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.5-1
+- 3.10.5. No longer need tray-icon-crash.patch
+- Increase the timeout for system tray availability checking (bug #569969).
+
* Wed May 12 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-16
- Prevent segfault in cupsext when opening PPD file (bug #572775).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources 7 Apr 2010 15:25:42 -0000 1.38
+++ sources 17 May 2010 14:19:54 -0000 1.39
@@ -1 +1 @@
-4df6f16c47ae7edd015bf2cf5155f26f hplip-3.10.2.tar.gz
+a4a3679d5987520226ef70d834b63b88 hplip-3.10.5.tar.gz
--- hplip-3.10.2.tar.gz.asc DELETED ---
--- hplip-tray-icon-crash.patch DELETED ---
More information about the scm-commits
mailing list