diff --git a/.gitignore b/.gitignore index 4cca431..c4b6297 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ hplip-3.10.6.tar.gz /hplip-3.11.5.tar.gz /hplip-3.11.7.tar.gz /hplip-3.11.10.tar.gz +/hplip-3.11.12.tar.gz diff --git a/hplip-3.11.10.tar.gz.asc b/hplip-3.11.10.tar.gz.asc deleted file mode 100644 index 83053e4..0000000 --- a/hplip-3.11.10.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAk6H1w0ACgkQc9dwzaWQR7nTGwCfdrOZAl0nguWBYFpEgWh4Vm5l -TIYAoJ/mlrUoMMeTnqZjTNs7NMyFu3lq -=DGE1 ------END PGP SIGNATURE----- diff --git a/hplip-3.11.12.tar.gz.asc b/hplip-3.11.12.tar.gz.asc new file mode 100644 index 0000000..2434f29 --- /dev/null +++ b/hplip-3.11.12.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAk7h8FQACgkQc9dwzaWQR7nygQCg0B80Q754Q71F38ucXMWW21U2 +Dr8AoNHIrsvkf/cLHJspn40w3rBEAFmn +=qCCO +-----END PGP SIGNATURE----- diff --git a/hplip-clear-old-state-reasons.patch b/hplip-clear-old-state-reasons.patch index 3d8852e..94c01ca 100644 --- a/hplip-clear-old-state-reasons.patch +++ b/hplip-clear-old-state-reasons.patch @@ -1,18 +1,17 @@ -diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons 2010-04-28 12:23:08.296730566 +0100 -+++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-28 12:25:25.493730293 +0100 -@@ -479,6 +479,14 @@ int HPCupsFilter::StartPrintJob(int arg - - signal(SIGTERM, HPCancelJob); - -+/* +diff -up hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons 2011-12-19 12:12:38.000000000 +0100 ++++ hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp 2011-12-19 12:16:06.524701093 +0100 +@@ -502,6 +502,13 @@ int HPCupsFilter::StartPrintJob(int arg + + signal(SIGTERM, HPCancelJob); + ++/* + * Prior to the re-write of hpcups, this filter managed the + * marker-supply-low-warning printer state reason. Make sure to + * clear that state reason so that upgrades work correctly. -+ */ -+ -+ fputs ("STATE: -marker-supply-low-warning\n", stderr); -+ - cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ); - - if (cups_raster == NULL) { ++ */ ++ fputs ("STATE: -marker-supply-low-warning\n", stderr); ++ + cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ); + + if (cups_raster == NULL) { diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch index 6cc1566..c0450a6 100644 --- a/hplip-dbglog-newline.patch +++ b/hplip-dbglog-newline.patch @@ -1,62 +1,45 @@ -diff -up hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2011-05-12 13:21:09.000000000 +0200 -+++ hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp 2011-05-12 13:21:10.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); - if (m_iLogLevel & BASIC_LOG) { -- dbglog("HPCUPS: found Printer Platform, it is - %s", attr->value); -+ dbglog("HPCUPS: found Printer Platform, it is - %s\n", attr->value); - } - if(strcmp(m_JA.printer_platform, "ljzjscolor") == 0) - { -@@ -370,7 +370,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu - } - strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1); - if (m_iLogLevel & BASIC_LOG) { -- dbglog("HPCUPS: found Printer Language, it is - %s", attr->value); -+ dbglog("HPCUPS: found Printer Language, it is - %s\n", attr->value); - } - - // Fill in the other PCL header info -@@ -415,14 +415,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu - { - if (err == PLUGIN_LIBRARY_MISSING) - fputs ("STATE: +hplip.plugin-error\n", stderr); -- dbglog ("m_Job initialization failed with error = %d", err); -+ dbglog ("m_Job initialization failed with error = %d\n", err); - ppdClose(m_ppd); - m_ppd = NULL; - return err; - } - - if (m_iLogLevel & BASIC_LOG) { -- dbglog("HPCUPS: returning NO_ERROR from startPage"); -+ dbglog("HPCUPS: returning NO_ERROR from startPage\n"); - } - - m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; -@@ -509,7 +509,7 @@ int HPCupsFilter::StartPrintJob(int arg - close(fd); - } - if (m_iLogLevel & BASIC_LOG) -- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err); -+ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err); - closeFilter(); - cupsRasterClose(cups_raster); - return 1; -@@ -519,7 +519,7 @@ int HPCupsFilter::StartPrintJob(int arg - close(fd); - } - if (m_iLogLevel & BASIC_LOG) -- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()"); -+ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n"); - closeFilter(); - cupsRasterClose(cups_raster); - return 0; -diff -up hplip-3.11.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.5/prnt/hpcups/Lidil.cpp ---- hplip-3.11.5/prnt/hpcups/Lidil.cpp.dbglog-newline 2011-05-09 02:59:11.000000000 +0200 -+++ hplip-3.11.5/prnt/hpcups/Lidil.cpp 2011-05-12 13:23:52.000000000 +0200 +diff -up hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2011-12-19 12:16:37.000000000 +0100 ++++ hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp 2011-12-19 12:22:02.957245073 +0100 +@@ -432,7 +432,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + m_DBusComm.sendEvent(EVENT_PRINT_FAILED_MISSING_PLUGIN, "Plugin missing", m_JA.job_id, m_JA.user_name); + + } +- dbglog ("m_Job initialization failed with error = %d", err); ++ dbglog ("m_Job initialization failed with error = %d\n", err); + ppdClose(m_ppd); + m_ppd = NULL; + return err; +@@ -525,7 +525,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err); ++ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err); + closeFilter(); + cupsRasterClose(cups_raster); + return 1; +@@ -535,7 +535,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()"); ++ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n"); + closeFilter(); + cupsRasterClose(cups_raster); + return 0; +@@ -670,7 +670,7 @@ int HPCupsFilter::processRasterData(cups + //Need to revisit to crosscheck if it is a firmware issue. + + *m_pPrinterBuffer = 0x01; +- dbglog("First raster data plane.." ); ++ dbglog("First raster data plane..\n" ); + } + + if (this->isBlankRaster((BYTE *) m_pPrinterBuffer, &cups_header)) { +diff -up hplip-3.11.12/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.12/prnt/hpcups/Lidil.cpp +--- hplip-3.11.12/prnt/hpcups/Lidil.cpp.dbglog-newline 2011-12-09 12:17:50.000000000 +0100 ++++ hplip-3.11.12/prnt/hpcups/Lidil.cpp 2011-12-19 12:16:39.063294307 +0100 @@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline * if (m_pPM->BaseResX != m_pQA->horizontal_resolution || m_pPM->BaseResY != m_pQA->vertical_resolution) @@ -111,9 +94,9 @@ diff -up hplip-3.11.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.5/prnt/hpc return false; } -diff -up hplip-3.11.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.11.5/prnt/hpcups/Pcl3.cpp ---- hplip-3.11.5/prnt/hpcups/Pcl3.cpp.dbglog-newline 2011-05-09 02:59:11.000000000 +0200 -+++ hplip-3.11.5/prnt/hpcups/Pcl3.cpp 2011-05-12 13:21:10.000000000 +0200 +diff -up hplip-3.11.12/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.11.12/prnt/hpcups/Pcl3.cpp +--- hplip-3.11.12/prnt/hpcups/Pcl3.cpp.dbglog-newline 2011-12-09 12:17:50.000000000 +0100 ++++ hplip-3.11.12/prnt/hpcups/Pcl3.cpp 2011-12-19 12:16:39.107293756 +0100 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** if (!selectPrintMode()) @@ -157,9 +140,9 @@ diff -up hplip-3.11.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.11.5/prnt/hpcu return false; } -diff -up hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp ---- hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2011-05-09 02:59:11.000000000 +0200 -+++ hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp 2011-05-12 13:21:10.000000000 +0200 +diff -up hplip-3.11.12/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.11.12/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.11.12/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2011-12-09 12:17:50.000000000 +0100 ++++ hplip-3.11.12/prnt/hpcups/Pcl3Gui.cpp 2011-12-19 12:16:39.156293143 +0100 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline if (!selectPrintMode()) diff --git a/hplip-dbus-threads.patch b/hplip-dbus-threads.patch deleted file mode 100644 index ceae607..0000000 --- a/hplip-dbus-threads.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up hplip-3.10.9/toolbox.py.dbus-threads hplip-3.10.9/toolbox.py ---- hplip-3.10.9/toolbox.py.dbus-threads 2010-12-15 10:54:17.178739842 +0000 -+++ hplip-3.10.9/toolbox.py 2010-12-15 10:57:09.923712662 +0000 -@@ -100,8 +100,11 @@ if ui_toolkit == 'qt3': - try: - from dbus import SessionBus - import dbus.service -- from dbus.mainloop.glib import DBusGMainLoop -+ from dbus.mainloop.glib import DBusGMainLoop, threads_init - from gobject import MainLoop -+ import glib -+ glib.threads_init(); -+ dbus.mainloop.glib.threads_init() - except ImportError: - log.error("Unable to load dbus - Automatic status updates in HPLIP Device Manager will be disabled.") - disable_dbus = True diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 1ee7b30..e3bee64 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/drv/hpcups.drv.in ---- hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv 2011-10-02 04:11:24.000000000 +0100 -+++ hplip-3.11.10/prnt/drv/hpcups.drv.in 2011-11-16 16:08:55.497192996 +0000 -@@ -458,7 +458,7 @@ Manufacturer "HP" +diff -up hplip-3.11.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.12/prnt/drv/hpcups.drv.in +--- hplip-3.11.12/prnt/drv/hpcups.drv.in.deviceIDs-drv 2011-12-09 12:23:33.000000000 +0100 ++++ hplip-3.11.12/prnt/drv/hpcups.drv.in 2011-12-19 11:40:07.712689960 +0100 +@@ -459,7 +459,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" Attribute "NickName" "" "HP Officejet v40xi, $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" @@ -10,7 +10,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -466,7 +466,7 @@ Manufacturer "HP" +@@ -467,7 +467,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" Attribute "NickName" "" "HP Officejet v40, $Version" Attribute "ShortNickName" "" "HP Officejet v40" @@ -19,7 +19,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -483,7 +483,7 @@ Manufacturer "HP" +@@ -484,7 +484,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" Attribute "NickName" "" "HP Officejet g55, $Version" Attribute "ShortNickName" "" "HP Officejet g55" @@ -28,7 +28,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -531,7 +531,7 @@ Manufacturer "HP" +@@ -532,7 +532,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" Attribute "NickName" "" "HP Officejet g85, $Version" Attribute "ShortNickName" "" "HP Officejet g85" @@ -37,7 +37,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -547,7 +547,7 @@ Manufacturer "HP" +@@ -548,7 +548,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" Attribute "NickName" "" "HP Officejet g95, $Version" Attribute "ShortNickName" "" "HP Officejet g95" @@ -46,7 +46,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -563,7 +563,7 @@ Manufacturer "HP" +@@ -564,7 +564,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" Attribute "NickName" "" "HP PSC 750xi, $Version" Attribute "ShortNickName" "" "HP PSC 750xi" @@ -55,7 +55,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -571,7 +571,7 @@ Manufacturer "HP" +@@ -572,7 +572,7 @@ Manufacturer "HP" ModelName "HP PSC 750" Attribute "NickName" "" "HP PSC 750, $Version" Attribute "ShortNickName" "" "HP PSC 750" @@ -64,7 +64,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -603,7 +603,7 @@ Manufacturer "HP" +@@ -604,7 +604,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" Attribute "NickName" "" "HP PSC 900 Series, $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" @@ -73,7 +73,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -619,7 +619,7 @@ Manufacturer "HP" +@@ -620,7 +620,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" Attribute "NickName" "" "HP Deskjet 920c, $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" @@ -82,7 +82,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -638,7 +638,7 @@ Manufacturer "HP" +@@ -639,7 +639,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" Attribute "NickName" "" "HP Deskjet 930c, $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" @@ -91,7 +91,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -679,7 +679,7 @@ Manufacturer "HP" +@@ -680,7 +680,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" Attribute "NickName" "" "HP Deskjet 940c, $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" @@ -100,7 +100,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -698,7 +698,7 @@ Manufacturer "HP" +@@ -699,7 +699,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" Attribute "NickName" "" "HP Deskjet 950c, $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" @@ -109,7 +109,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -755,7 +755,7 @@ Manufacturer "HP" +@@ -756,7 +756,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" Attribute "NickName" "" "HP Deskjet 959c, $Version" Attribute "ShortNickName" "" "HP Deskjet 959c" @@ -118,7 +118,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_959c.ppd" Attribute "Product" "" "(HP Deskjet 959c Printer)" } -@@ -763,7 +763,7 @@ Manufacturer "HP" +@@ -764,7 +764,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" Attribute "NickName" "" "HP Deskjet 970c, $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" @@ -127,7 +127,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -783,7 +783,7 @@ Manufacturer "HP" +@@ -784,7 +784,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -136,7 +136,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -792,7 +792,7 @@ Manufacturer "HP" +@@ -793,7 +793,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -145,7 +145,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -826,7 +826,7 @@ Manufacturer "HP" +@@ -827,7 +827,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -154,7 +154,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -864,7 +864,7 @@ Manufacturer "HP" +@@ -865,7 +865,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -163,7 +163,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -872,7 +872,7 @@ Manufacturer "HP" +@@ -873,7 +873,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -172,7 +172,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -923,7 +923,7 @@ Manufacturer "HP" +@@ -924,7 +924,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" @@ -181,7 +181,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1119,7 +1119,7 @@ Manufacturer "HP" +@@ -1120,7 +1120,7 @@ Manufacturer "HP" ModelName "HP 2000c" Attribute "NickName" "" "HP 2000c, $Version" Attribute "ShortNickName" "" "HP 2000c" @@ -190,7 +190,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1561,7 +1561,7 @@ Manufacturer "HP" +@@ -1562,7 +1562,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" Attribute "NickName" "" "HP Officejet D Series, $Version" Attribute "ShortNickName" "" "HP Officejet D Series" @@ -199,7 +199,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1584,7 +1584,7 @@ Manufacturer "HP" +@@ -1585,7 +1585,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -208,7 +208,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1594,7 +1594,7 @@ Manufacturer "HP" +@@ -1595,7 +1595,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -217,7 +217,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1603,7 +1603,7 @@ Manufacturer "HP" +@@ -1604,7 +1604,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -226,7 +226,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1666,7 +1666,7 @@ Manufacturer "HP" +@@ -1667,7 +1667,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -235,7 +235,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1674,7 +1674,7 @@ Manufacturer "HP" +@@ -1675,7 +1675,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" Attribute "NickName" "" "HP PSC 2100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" @@ -244,7 +244,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1687,7 +1687,7 @@ Manufacturer "HP" +@@ -1688,7 +1688,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" Attribute "NickName" "" "HP PSC 2150 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" @@ -253,7 +253,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1695,7 +1695,7 @@ Manufacturer "HP" +@@ -1696,7 +1696,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" Attribute "NickName" "" "HP PSC 2170 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" @@ -262,7 +262,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1732,7 +1732,7 @@ Manufacturer "HP" +@@ -1733,7 +1733,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -271,7 +271,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1962,7 +1962,7 @@ Manufacturer "HP" +@@ -1963,7 +1963,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" @@ -280,7 +280,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1972,7 +1972,7 @@ Manufacturer "HP" +@@ -1973,7 +1973,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" Attribute "NickName" "" "HP Business Inkjet 2230, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" @@ -289,7 +289,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1980,7 +1980,7 @@ Manufacturer "HP" +@@ -1981,7 +1981,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" @@ -298,7 +298,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1989,7 +1989,7 @@ Manufacturer "HP" +@@ -1990,7 +1990,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" @@ -307,7 +307,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2524,7 +2524,7 @@ Manufacturer "HP" +@@ -2525,7 +2525,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -316,7 +316,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2542,7 +2542,7 @@ Manufacturer "HP" +@@ -2543,7 +2543,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -325,7 +325,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_2300_series.ppd" Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2551,7 +2551,7 @@ Manufacturer "HP" +@@ -2552,7 +2552,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -334,7 +334,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2568,7 +2568,7 @@ Manufacturer "HP" +@@ -2569,7 +2569,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" Attribute "NickName" "" "HP PSC 2400 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" @@ -343,7 +343,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d 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)" -@@ -2594,7 +2594,7 @@ Manufacturer "HP" +@@ -2595,7 +2595,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -352,7 +352,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3055,7 +3055,7 @@ Manufacturer "HP" +@@ -3056,7 +3056,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -361,7 +361,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3128,7 +3128,7 @@ Manufacturer "HP" +@@ -3129,7 +3129,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -370,7 +370,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3183,7 +3183,7 @@ Manufacturer "HP" +@@ -3184,7 +3184,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" Attribute "NickName" "" "HP Officejet 6300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" @@ -379,7 +379,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3352,7 +3352,7 @@ Manufacturer "HP" +@@ -3353,7 +3353,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -388,7 +388,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3437,7 +3437,7 @@ Manufacturer "HP" +@@ -3438,7 +3438,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" Attribute "NickName" "" "HP Officejet 7400 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" @@ -397,7 +397,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -9194,7 +9194,7 @@ Manufacturer "HP" +@@ -9215,7 +9215,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -406,7 +406,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -9204,7 +9204,7 @@ Manufacturer "HP" +@@ -9225,7 +9225,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -415,7 +415,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -9387,7 +9387,7 @@ Manufacturer "HP" +@@ -9408,7 +9408,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" Attribute "NickName" "" "HP Deskjet 3940, $Version" Attribute "ShortNickName" "" "HP Deskjet 3940" @@ -424,7 +424,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_3940.ppd" Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" -@@ -9396,7 +9396,7 @@ Manufacturer "HP" +@@ -9417,7 +9417,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -433,7 +433,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d 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)" -@@ -9423,7 +9423,7 @@ Manufacturer "HP" +@@ -9444,7 +9444,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -442,7 +442,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -9739,7 +9739,7 @@ Manufacturer "HP" +@@ -9760,7 +9760,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -451,7 +451,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -9810,7 +9810,7 @@ Manufacturer "HP" +@@ -9831,7 +9831,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -460,7 +460,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -10317,6 +10317,7 @@ Manufacturer "HP" +@@ -10338,6 +10338,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;" @@ -468,7 +468,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -10744,7 +10745,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10765,7 +10766,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" @@ -477,16 +477,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -10770,7 +10771,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5mp" - Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" - Attribute "ShortNickName" "" "HP LaserJet 5mp" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;" - PCFileName "hp-laserjet_5mp-pcl3.ppd" - Attribute "Product" "" "(HP LaserJet 5mp Printer)" - } -@@ -10778,7 +10779,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10791,7 +10792,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" Attribute "NickName" "" "HP LaserJet 5l, $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" @@ -495,7 +486,16 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -10788,7 +10789,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10801,7 +10802,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5mp" + Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5mp" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;" + PCFileName "hp-laserjet_5mp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5mp Printer)" + } +@@ -10809,7 +10810,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" Attribute "NickName" "" "HP LaserJet 5p, $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" @@ -504,7 +504,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -10796,7 +10797,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10817,7 +10818,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" Attribute "NickName" "" "HP LaserJet 6l, $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" @@ -513,7 +513,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -10808,7 +10809,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10829,7 +10830,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" Attribute "NickName" "" "HP LaserJet 6p, $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" @@ -522,7 +522,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -10816,7 +10817,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10837,7 +10838,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" @@ -531,7 +531,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -10826,7 +10827,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10847,7 +10848,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" Attribute "NickName" "" "HP LaserJet 1015, $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" @@ -540,7 +540,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -10868,7 +10869,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10889,7 +10890,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" Attribute "NickName" "" "HP LaserJet 1100, $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" @@ -549,7 +549,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -10886,7 +10887,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10907,7 +10908,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" Attribute "NickName" "" "HP LaserJet 1150, $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" @@ -558,7 +558,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -10903,7 +10904,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10924,7 +10925,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" @@ -567,7 +567,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -10911,7 +10912,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10932,7 +10933,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" @@ -576,7 +576,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -10936,7 +10937,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10957,7 +10958,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" @@ -585,7 +585,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -10944,7 +10945,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10965,7 +10966,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" @@ -594,7 +594,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -10969,7 +10970,7 @@ Group "RLT/HP Real Life Technologies" +@@ -10990,7 +10991,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" @@ -603,7 +603,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -10993,7 +10994,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11014,7 +11015,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" Attribute "NickName" "" "HP LaserJet 1320, $Version" Attribute "ShortNickName" "" "HP LaserJet 1320" @@ -612,7 +612,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -11018,7 +11019,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11039,7 +11040,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1522nf MFP" Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" @@ -621,7 +621,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)" } -@@ -11026,7 +11027,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11047,7 +11048,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1536dnf MFP" Attribute "NickName" "" "HP LaserJet m1536dnf MFP pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet m1536dnf MFP" @@ -630,7 +630,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m1536dnf_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m1536dnf MFP)" } -@@ -11098,7 +11099,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11119,7 +11120,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" @@ -639,7 +639,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -11162,7 +11163,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11183,7 +11184,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100" Attribute "NickName" "" "HP LaserJet 2100, $Version" Attribute "ShortNickName" "" "HP LaserJet 2100" @@ -648,7 +648,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_2100.ppd" Attribute "Product" "" "(HP LaserJet 2100 Printer)" Attribute "Product" "" "(HP LaserJet 2100m Printer)" -@@ -11174,7 +11175,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11195,7 +11196,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" @@ -657,7 +657,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -11190,7 +11191,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11211,7 +11212,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" @@ -666,7 +666,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -11203,7 +11204,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11224,7 +11225,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" @@ -675,7 +675,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -11216,7 +11217,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11237,7 +11238,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" @@ -684,7 +684,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -11232,7 +11233,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11253,7 +11254,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" @@ -693,7 +693,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -11243,7 +11244,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11264,7 +11265,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" @@ -702,7 +702,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -11271,7 +11272,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11292,7 +11293,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3005" Attribute "NickName" "" "HP LaserJet p3005 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p3005" @@ -711,7 +711,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_p3005-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3005 Printer)" Attribute "Product" "" "(HP LaserJet p3005d Printer)" -@@ -11284,7 +11285,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11305,7 +11306,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3010 Series" Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet p3010 Series" @@ -720,7 +720,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_p3010_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3015 Printer)" Attribute "Product" "" "(HP LaserJet p3011 Printer)" -@@ -11293,7 +11294,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11314,7 +11315,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" @@ -729,7 +729,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -11301,7 +11302,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11322,7 +11323,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" @@ -738,7 +738,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -11309,7 +11310,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11330,7 +11331,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" @@ -747,7 +747,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -11318,7 +11319,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11339,7 +11340,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" @@ -756,7 +756,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -11326,7 +11327,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11347,7 +11348,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" @@ -765,7 +765,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -11335,7 +11336,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11356,7 +11357,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" @@ -774,7 +774,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -11343,7 +11344,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11364,7 +11365,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" Attribute "NickName" "" "HP LaserJet 3055, $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" @@ -783,7 +783,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -11371,7 +11372,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11392,7 +11393,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" @@ -792,7 +792,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -11387,7 +11388,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11408,7 +11409,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" Attribute "NickName" "" "HP LaserJet 3200, $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" @@ -801,7 +801,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -11407,7 +11408,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11428,7 +11429,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" Attribute "NickName" "" "HP LaserJet 3330, $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" @@ -810,7 +810,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -11415,7 +11416,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11436,7 +11437,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" @@ -819,7 +819,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -11423,7 +11424,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11444,7 +11445,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" @@ -828,7 +828,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -11439,7 +11440,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11460,7 +11461,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" @@ -837,7 +837,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -11467,7 +11468,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11488,7 +11489,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4014" Attribute "NickName" "" "HP LaserJet p4014, $Version" Attribute "ShortNickName" "" "HP LaserJet p4014" @@ -846,7 +846,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_p4014.ppd" Attribute "Product" "" "(HP LaserJet p4014 Printer)" } -@@ -11515,7 +11516,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11536,7 +11537,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" @@ -855,7 +855,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -11536,7 +11537,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11557,7 +11558,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" @@ -864,7 +864,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -11555,7 +11556,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11576,7 +11577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" @@ -873,7 +873,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -11580,7 +11581,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11601,7 +11602,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" @@ -882,7 +882,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -11592,7 +11593,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11613,7 +11614,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" @@ -891,7 +891,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -11605,7 +11606,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11626,7 +11627,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" @@ -900,7 +900,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -11616,7 +11617,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11637,7 +11638,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" @@ -909,7 +909,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -11635,7 +11636,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11656,7 +11657,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4350" Attribute "NickName" "" "HP LaserJet 4350 pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 4350" @@ -918,7 +918,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_4350-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4350 Printer)" Attribute "Product" "" "(HP LaserJet 4350dtn Printer)" -@@ -11671,7 +11672,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11692,7 +11693,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4515" Attribute "NickName" "" "HP LaserJet p4515, $Version" Attribute "ShortNickName" "" "HP LaserJet p4515" @@ -927,7 +927,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_p4515.ppd" Attribute "Product" "" "(HP LaserJet p4515 Printer)" } -@@ -11687,7 +11688,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11708,7 +11709,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" @@ -936,7 +936,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -11703,7 +11704,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11724,7 +11725,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000 Series" Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 8000 Series" @@ -945,7 +945,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_8000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8000 Series Printer)" } -@@ -11797,7 +11798,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11818,7 +11819,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" @@ -954,7 +954,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -11833,7 +11834,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11854,7 +11855,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" @@ -963,7 +963,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -11854,7 +11855,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11875,7 +11876,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" @@ -972,7 +972,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -11862,7 +11863,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11883,7 +11884,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" @@ -981,7 +981,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -11880,7 +11881,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11901,7 +11902,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5100 Series" Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, $Version" Attribute "ShortNickName" "" "HP LaserJet 5100 Series" @@ -990,7 +990,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_5100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5100 Printer)" Attribute "Product" "" "(HP LaserJet 5100le Printer)" -@@ -11911,7 +11912,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11932,7 +11933,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000" Attribute "NickName" "" "HP LaserJet 8000, $Version" Attribute "ShortNickName" "" "HP LaserJet 8000" @@ -999,7 +999,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_8000.ppd" Attribute "Product" "" "(HP LaserJet 8000 Printer)" Attribute "Product" "" "(HP LaserJet 8000dn Printer)" -@@ -11931,7 +11932,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11952,7 +11953,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" @@ -1008,187 +1008,187 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -12144,7 +12145,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm1312nfi MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;" - PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" - } -@@ -12224,7 +12225,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp1515n" - Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1515n;DES:hp color laserjet cp1515n;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1515n;DES:hp color laserjet cp1515n;" - PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" - } -@@ -12232,7 +12233,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp1518ni" - Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" -- 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)" - } -@@ -12240,7 +12241,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp2025dn" - Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025dn;DES:Hewlett-Packard Color LaserJet CP2025dn;" - PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" - } -@@ -12256,7 +12257,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp2025n" - Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025n;DES:hp color laserjet cp2025n;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025n;DES:hp color laserjet cp2025n;" - PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" - } -@@ -12272,7 +12273,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Business Inkjet 2300" - Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" - Attribute "ShortNickName" "" "HP Business Inkjet 2300" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" -+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2300;DES:Hewlett-Packard Business Inkjet 2300;" - PCFileName "hp-business_inkjet_2300-pcl3.ppd" - Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" - Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -12306,7 +12307,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm2320nf MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM2320nf MFP;DES:hp color laserjet cm2320nf mfp;" - PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" - } -@@ -12314,7 +12315,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 2500" - Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 2500" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500;DES:hp color laserjet 2500;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;DES:hp color laserjet 2500;" - PCFileName "hp-color_laserjet_2500-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" - } -@@ -12355,7 +12356,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp3525" - Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp3525" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3525;DES:hp color laserjet cp3525;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;DES:hp color laserjet cp3525;" - PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" - Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" -@@ -12366,7 +12367,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm3530 MFP" - Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;DES:hp color laserjet cm3530 mfp;" - PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" -@@ -12375,7 +12376,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3700" - Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 3700" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700;DES:hp color laserjet 3700;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;DES:hp color laserjet 3700;" - PCFileName "hp-color_laserjet_3700-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" - } -@@ -12394,7 +12395,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3800" - Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 3800" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;" - PCFileName "hp-color_laserjet_3800-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" - Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -12433,7 +12434,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp4520 Series" - Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4520 series;DES:hp color laserjet cp4520 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4520 Series;DES:hp color laserjet cp4520 series;" - PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" - } -@@ -12449,7 +12450,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4550" - Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4550" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;DES:Hewlett-Packard Color LaserJet 4550;" - PCFileName "hp-color_laserjet_4550-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" +@@ -12156,7 +12157,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" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;" + PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" + } +@@ -12244,7 +12245,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp1515n" + Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1515n;DES:hp color laserjet cp1515n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1515n;DES:hp color laserjet cp1515n;" + PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" + } +@@ -12252,7 +12253,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)" + } +@@ -12260,7 +12261,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp2025dn" + Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025dn;DES:Hewlett-Packard Color LaserJet CP2025dn;" + PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" + } +@@ -12276,7 +12277,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp2025n" + Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025n;DES:hp color laserjet cp2025n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025n;DES:hp color laserjet cp2025n;" + PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" + } +@@ -12292,7 +12293,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" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2300;DES:Hewlett-Packard Business Inkjet 2300;" + PCFileName "hp-business_inkjet_2300-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" +@@ -12302,7 +12303,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 2500" + Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 2500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500;DES:hp color laserjet 2500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;DES:hp color laserjet 2500;" + PCFileName "hp-color_laserjet_2500-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" + } +@@ -12343,7 +12344,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp3525" + Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp3525" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3525;DES:hp color laserjet cp3525;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;DES:hp color laserjet cp3525;" + PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" +@@ -12354,7 +12355,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm3530 MFP" + Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;DES:hp color laserjet cm3530 mfp;" + PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" +@@ -12363,7 +12364,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3700" + Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700;DES:hp color laserjet 3700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;DES:hp color laserjet 3700;" + PCFileName "hp-color_laserjet_3700-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" + } +@@ -12382,7 +12383,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" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;" + PCFileName "hp-color_laserjet_3800-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" +@@ -12421,7 +12422,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp4520 Series" + Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4520 series;DES:hp color laserjet cp4520 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4520 Series;DES:hp color laserjet cp4520 series;" + PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" + } +@@ -12437,7 +12438,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4550" + Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;DES:Hewlett-Packard Color LaserJet 4550;" + PCFileName "hp-color_laserjet_4550-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" +@@ -12450,7 +12451,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" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" + PCFileName "hp-color_laserjet_4600_series.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" @@ -12462,7 +12463,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4600 Series" - Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" - PCFileName "hp-color_laserjet_4600_series.ppd" - Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -12474,7 +12475,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4600" - Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4600" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600;DES:hp color laserjet 4600;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:hp color laserjet 4600;" - PCFileName "hp-color_laserjet_4600-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" - } + ModelName "HP Color LaserJet 4600" + Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600;DES:hp color laserjet 4600;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:hp color laserjet 4600;" + PCFileName "hp-color_laserjet_4600-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" + } +@@ -12478,7 +12479,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4650" + Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4650" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4650;DES:hp color laserjet 4650;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;DES:hp color laserjet 4650;" + PCFileName "hp-color_laserjet_4650-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" @@ -12490,7 +12491,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4650" - Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4650" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4650;DES:hp color laserjet 4650;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;DES:hp color laserjet 4650;" - PCFileName "hp-color_laserjet_4650-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" + ModelName "HP Color LaserJet 4700" + Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4700;DES:hp color laserjet 4700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;DES:hp color laserjet 4700;" + PCFileName "hp-color_laserjet_4700-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" @@ -12502,7 +12503,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4700" - Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet 4700" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4700;DES:hp color laserjet 4700;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;DES:hp color laserjet 4700;" - PCFileName "hp-color_laserjet_4700-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" - Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" -@@ -12514,7 +12515,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm4730 MFP" - Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4730 mfp;DES:hp color laserjet cm4730 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;DES:hp color laserjet cm4730 mfp;" - PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" - Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" -@@ -12568,7 +12569,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet 9100 Series" - Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" - Attribute "ShortNickName" "" "HP Officejet 9100 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 9100 series;DES:officejet 9100 series;" - 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)" -@@ -12609,7 +12610,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm4730 MFP" + Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4730 mfp;DES:hp color laserjet cm4730 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;DES:hp color laserjet cm4730 mfp;" + PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" +@@ -12556,7 +12557,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" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 9100 series;DES:officejet 9100 series;" + 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)" +@@ -12600,7 +12601,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm2320nf MFP" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM2320nf MFP;DES:hp color laserjet cm2320nf mfp;" + PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" + } +@@ -12640,7 +12641,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" @@ -1197,7 +1197,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -12644,7 +12645,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12675,7 +12676,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 5550" Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, $Version" Attribute "ShortNickName" "" "HP Color LaserJet 5550" @@ -1206,7 +1206,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-color_laserjet_5550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 5550n Printer)" Attribute "Product" "" "(HP Color LaserJet 5550 Printer)" -@@ -12901,7 +12902,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12932,7 +12933,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" Attribute "NickName" "" "HP LaserJet 1010, $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" @@ -1215,7 +1215,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -12909,7 +12910,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12940,7 +12941,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" Attribute "NickName" "" "HP LaserJet 1012, $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" @@ -1224,7 +1224,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -13117,7 +13118,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13148,7 +13149,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1233,7 +1233,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -13281,7 +13282,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13312,7 +13313,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" @@ -1242,7 +1242,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -13305,7 +13306,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13336,7 +13337,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -1251,7 +1251,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -13322,7 +13323,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13353,7 +13354,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -1260,7 +1260,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -13447,7 +13448,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13478,7 +13479,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1269,7 +1269,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -13463,7 +13464,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13494,7 +13495,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1278,7 +1278,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -13576,7 +13577,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13607,7 +13608,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1287,7 +1287,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -13598,7 +13599,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13629,7 +13630,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" @@ -1296,7 +1296,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_series_500.ppd" Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" } -@@ -13638,7 +13639,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13669,7 +13670,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" @@ -1305,7 +1305,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -13690,7 +13691,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13721,7 +13722,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1314,7 +1314,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -13842,7 +13843,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13873,7 +13874,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1323,7 +1323,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -13866,7 +13867,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13897,7 +13898,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1332,7 +1332,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -13886,7 +13887,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13917,7 +13918,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1341,7 +1341,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -13946,7 +13947,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13977,7 +13978,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" @@ -1350,7 +1350,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -14089,7 +14090,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14120,7 +14121,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" @@ -1359,7 +1359,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -14100,7 +14101,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14131,7 +14132,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" Attribute "NickName" "" "HP Officejet r40, $Version" Attribute "ShortNickName" "" "HP Officejet r40" @@ -1368,7 +1368,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -14124,7 +14125,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14155,7 +14156,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" Attribute "NickName" "" "HP Officejet r60, $Version" Attribute "ShortNickName" "" "HP Officejet r60" @@ -1377,7 +1377,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -14132,7 +14133,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14163,7 +14164,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" Attribute "NickName" "" "HP Officejet r65, $Version" Attribute "ShortNickName" "" "HP Officejet r65" @@ -1386,7 +1386,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -14148,7 +14149,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14179,7 +14180,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" Attribute "NickName" "" "HP Officejet r80, $Version" Attribute "ShortNickName" "" "HP Officejet r80" @@ -1395,7 +1395,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -14156,7 +14157,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14187,7 +14188,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" Attribute "NickName" "" "HP PSC 500, $Version" Attribute "ShortNickName" "" "HP PSC 500" @@ -1404,7 +1404,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -14173,7 +14174,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14204,7 +14205,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1413,7 +1413,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -14181,7 +14182,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14212,7 +14213,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1422,7 +1422,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -14213,7 +14214,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14244,7 +14245,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1431,7 +1431,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -14221,7 +14222,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14252,7 +14253,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1440,7 +1440,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -14237,7 +14238,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14268,7 +14269,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1449,7 +1449,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -14246,7 +14247,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14277,7 +14278,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1458,7 +1458,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -14262,7 +14263,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14293,7 +14294,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1467,7 +1467,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -14379,7 +14380,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14410,7 +14411,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1476,7 +1476,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -14388,7 +14389,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14419,7 +14420,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1485,7 +1485,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -14499,7 +14500,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14530,7 +14531,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" Attribute "NickName" "" "HP Deskjet 850c, $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" @@ -1494,7 +1494,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -14518,7 +14519,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14549,7 +14550,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" Attribute "NickName" "" "HP Deskjet 870c, $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" @@ -1503,7 +1503,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -14529,7 +14530,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14560,7 +14561,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" @@ -1512,7 +1512,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_pro_1150c.ppd" Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" -@@ -14643,7 +14644,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14674,7 +14675,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" Attribute "NickName" "" "HP Deskjet 890c, $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" @@ -1521,7 +1521,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -14652,7 +14653,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14683,7 +14684,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" @@ -1530,7 +1530,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-officejet_pro_1170c_series.ppd" Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" -@@ -14794,7 +14795,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14825,7 +14826,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" @@ -1539,7 +1539,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1018.ppd" Attribute "Product" "" "(HP LaserJet 1018 Printer)" Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -14803,7 +14804,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14834,7 +14835,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" @@ -1548,7 +1548,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -14837,7 +14838,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14868,7 +14869,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1120 MFP" Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" @@ -1557,7 +1557,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m1120_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)" } -@@ -14853,7 +14854,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14884,7 +14885,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1319f MFP" Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" @@ -1566,7 +1566,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_m1319f_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)" } -@@ -15001,7 +15002,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15032,7 +15033,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional m1212nf MFP" Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP" @@ -1575,7 +1575,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd" Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" } -@@ -15179,7 +15180,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15212,7 +15213,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1606dn" Attribute "NickName" "" "HP LaserJet Professional p1606dn, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional p1606dn" @@ -1584,7 +1584,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_professional_p1606dn.ppd" Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)" } -@@ -15321,7 +15322,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15354,7 +15355,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" @@ -1593,7 +1593,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-color_laserjet_2600n.ppd" Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" } -@@ -15521,7 +15522,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15554,7 +15555,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" @@ -1602,7 +1602,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -15531,7 +15532,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15564,7 +15565,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" @@ -1611,7 +1611,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } -@@ -15683,7 +15684,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15716,7 +15717,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1505" Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505" @@ -1620,7 +1620,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_p1505.ppd" Attribute "Product" "" "(HP LaserJet p1505 Printer)" } -@@ -15825,7 +15826,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15858,7 +15859,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" @@ -1629,7 +1629,7 @@ diff -up hplip-3.11.10/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.10/prnt/d PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } -@@ -15833,7 +15834,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15866,7 +15867,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-emit-SIGNAL.patch b/hplip-emit-SIGNAL.patch deleted file mode 100644 index aa72dce..0000000 --- a/hplip-emit-SIGNAL.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up hplip-3.10.9/ui4/setupdialog.py.emit-SIGNAL hplip-3.10.9/ui4/setupdialog.py ---- hplip-3.10.9/ui4/setupdialog.py.emit-SIGNAL 2010-12-14 15:51:43.579041162 +0000 -+++ hplip-3.10.9/ui4/setupdialog.py 2010-12-14 15:52:02.631111875 +0000 -@@ -867,8 +867,8 @@ class SetupDialog(QDialog, Ui_Dialog): - self.printer_fax_names_same = False - self.printer_name_ok = True - -- self.FaxNameLineEdit.emit(SIGNAL("textChanged(const QString &)"), -- (self.FaxNameLineEdit.text(),)) -+ self.FaxNameLineEdit.emit(SIGNAL("textEdited(const QString &)"), -+ self.FaxNameLineEdit.text()) - - self.setIndicators() - self.setAddPrinterButton() -@@ -899,8 +899,8 @@ class SetupDialog(QDialog, Ui_Dialog): - self.printer_fax_names_same = False - self.fax_name_ok = True - -- self.PrinterNameLineEdit.emit(SIGNAL("textChanged(const QString&)"), -- (self.PrinterNameLineEdit.text(),)) -+ self.PrinterNameLineEdit.emit(SIGNAL("textEdited(const QString &)"), -+ self.PrinterNameLineEdit.text()) - - self.setIndicators() - self.setAddPrinterButton() diff --git a/hplip-fab-root-crash.patch b/hplip-fab-root-crash.patch deleted file mode 100644 index a6e31d9..0000000 --- a/hplip-fab-root-crash.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up hplip-3.10.9/fax/fax.py.fab-root-crash hplip-3.10.9/fax/fax.py ---- hplip-3.10.9/fax/fax.py.fab-root-crash 2010-11-12 10:36:30.504796972 +0000 -+++ hplip-3.10.9/fax/fax.py 2010-11-12 10:38:39.906166234 +0000 -@@ -203,17 +203,19 @@ class FaxAddressBook(object): # Pickle b - self.load() - - def load(self): -- self._fab = os.path.join(prop.user_dir, "fab.pickle") -- #old_fab = os.path.join(prop.user_dir, "fab.db") -+ self._fab = "/dev/null" -+ if prop.user_dir != None: -+ self._fab = os.path.join(prop.user_dir, "fab.pickle") -+ #old_fab = os.path.join(prop.user_dir, "fab.db") -+ -+ # Load the existing pickle if present -+ if os.path.exists(self._fab): -+ pickle_file = open(self._fab, "r") -+ self._data = cPickle.load(pickle_file) -+ pickle_file.close() - -- # Load the existing pickle if present -- if os.path.exists(self._fab): -- pickle_file = open(self._fab, "r") -- self._data = cPickle.load(pickle_file) -- pickle_file.close() -- -- else: -- self.save() # save the empty file to create the file -+ else: -+ self.save() # save the empty file to create the file - - - def set(self, name, title, firstname, lastname, fax, groups, notes): diff --git a/hplip-hpaio-localonly.patch b/hplip-hpaio-localonly.patch index 44e3fc3..0a315ba 100644 --- a/hplip-hpaio-localonly.patch +++ b/hplip-hpaio-localonly.patch @@ -29,7 +29,7 @@ diff -up hplip-3.11.10/scan/sane/hpaio.c~ hplip-3.11.10/scan/sane/hpaio.c + } + else + { - DBG6("unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]); + DBG(6,"unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]); - } - free(cups_printer[i]); + } diff --git a/hplip-hpaio-segfault.patch b/hplip-hpaio-segfault.patch deleted file mode 100644 index 936c5d0..0000000 --- a/hplip-hpaio-segfault.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up hplip-3.10.9/io/hpmud/hpmud.c.hpaio-segfault hplip-3.10.9/io/hpmud/hpmud.c ---- hplip-3.10.9/io/hpmud/hpmud.c.hpaio-segfault 2010-12-13 16:53:16.470306314 +0000 -+++ hplip-3.10.9/io/hpmud/hpmud.c 2010-12-13 16:53:17.423332321 +0000 -@@ -305,6 +305,7 @@ static int new_device(const char *uri, e - { - BUG("invalid uri %s\n", uri); - *result = HPMUD_R_INVALID_URI; -+ index = 0; - goto bugout; - } - msp->device[i].io_mode = mode; diff --git a/hplip-makefile-chgrp.patch b/hplip-makefile-chgrp.patch new file mode 100644 index 0000000..a480050 --- /dev/null +++ b/hplip-makefile-chgrp.patch @@ -0,0 +1,16 @@ +diff -up hplip-3.11.12/Makefile.in.chgrp hplip-3.11.12/Makefile.in +--- hplip-3.11.12/Makefile.in.chgrp 2011-12-09 12:23:55.000000000 +0100 ++++ hplip-3.11.12/Makefile.in 2011-12-19 15:16:53.907090155 +0100 +@@ -8582,10 +8582,10 @@ uninstall-am: uninstall-binPROGRAMS unin + + install-dist_hplip_LogDATA: + @FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +-@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) ++#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) + @FULL_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) + @HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +-@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) ++#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) + @HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) + + install-data-hook: diff --git a/hplip-mucks-with-spooldir.patch b/hplip-mucks-with-spooldir.patch index d110ce7..1149fd0 100644 --- a/hplip-mucks-with-spooldir.patch +++ b/hplip-mucks-with-spooldir.patch @@ -1,30 +1,30 @@ -diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir 2010-02-26 12:07:47.170265651 +0000 -+++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-02-26 12:09:13.647265807 +0000 -@@ -443,26 +443,6 @@ int HPCupsFilter::StartPrintJob(int arg - - getLogLevel(); - m_JA.job_id = atoi(argv[1]); -- FILE *fp; -- char dFileName[32]; -- memset(dFileName, 0, sizeof(dFileName)); -- m_JA.job_id = atoi(argv[1]); -- snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id); -- if ((fp = fopen (dFileName, "r"))) -- { -- char line[258]; -- for (int i = 0; i < 10; i++) -- { -- fgets (line, 256, fp); -- if (!strncmp (line, "%%Pages:", 8)) -- { -- sscanf (line+9, "%d", &m_JA.total_pages); -- break; -- } -- } -- fclose (fp); -- } -- - m_ppd = ppdOpenFile(getenv("PPD")); - if (m_ppd == NULL) { - dbglog("DEBUG: ppdOpenFile failed for %s\n", getenv("PPD")); +diff -up hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir 2011-12-09 12:17:50.000000000 +0100 ++++ hplip-3.11.12/prnt/hpcups/HPCupsFilter.cpp 2011-12-19 12:02:03.581239338 +0100 +@@ -466,26 +466,6 @@ int HPCupsFilter::StartPrintJob(int arg + + getLogLevel(); + m_JA.job_id = atoi(argv[1]); +- FILE *fp; +- char dFileName[32]; +- memset(dFileName, 0, sizeof(dFileName)); +- m_JA.job_id = atoi(argv[1]); +- snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id); +- if ((fp = fopen (dFileName, "r"))) +- { +- char line[258]; +- for (int i = 0; i < 10; i++) +- { +- fgets (line, 256, fp); +- if (!strncmp (line, "%%Pages:", 8)) +- { +- sscanf (line+9, "%d", &m_JA.total_pages); +- break; +- } +- } +- fclose (fp); +- } +- + m_ppd = ppdOpenFile(getenv("PPD")); + if (m_ppd == NULL) { + dbglog("DEBUG: ppdOpenFile failed for %s\n", getenv("PPD")); diff --git a/hplip-newline.patch b/hplip-newline.patch deleted file mode 100644 index a690693..0000000 --- a/hplip-newline.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp.newline hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp.newline 2011-05-12 16:10:02.000000000 +0200 -+++ hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp 2011-05-12 16:13:06.000000000 +0200 -@@ -618,7 +618,7 @@ int HPCupsFilter::processRasterData(cups - dbglog("10......\n"); - } - -- fprintf(stderr, "PAGE: %d %s", current_page_number, m_argv[4]); -+ fprintf(stderr, "PAGE: %d %s\n", current_page_number, m_argv[4]); - // Iterating through the raster per page - for (int y = 0; y < (int) cups_header.cupsHeight; y++) { - cupsRasterReadPixels (cups_raster, m_pPrinterBuffer, cups_header.cupsBytesPerLine); diff --git a/hplip-top-margins-not-respected.patch b/hplip-top-margins-not-respected.patch deleted file mode 100644 index c11426c..0000000 --- a/hplip-top-margins-not-respected.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp.top-margins-not-respected hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp.top-margins-not-respected 2011-10-02 05:03:50.000000000 +0200 -+++ hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp 2011-11-14 16:49:39.073220429 +0100 -@@ -544,18 +544,10 @@ bool HPCupsFilter::isBlankRaster(BYTE *i - return true; - } - -- if(header->cupsColorSpace == CUPS_CSPACE_K){ -- if (*input_raster == 0x00 && -- !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) { -- return true; -- } -- } -- else{ - if (*input_raster == 0xFF && - !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) { - return true; - } -- } - return false; - } - diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index 6b79b06..f13189b 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,29 +1,23 @@ -diff -up hplip-3.11.7/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.7/data/rules/56-hpmud_support.rules ---- hplip-3.11.7/data/rules/56-hpmud_support.rules.udev-rules 2011-07-24 21:04:13.000000000 +0200 -+++ hplip-3.11.7/data/rules/56-hpmud_support.rules 2011-07-25 13:52:09.379058787 +0200 -@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul +diff -up hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.12/data/rules/56-hpmud_support.rules +--- hplip-3.11.12/data/rules/56-hpmud_support.rules.udev-rules 2011-12-09 12:19:54.000000000 +0100 ++++ hplip-3.11.12/data/rules/56-hpmud_support.rules 2011-12-19 17:23:29.769128810 +0100 +@@ -6,6 +6,7 @@ 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" -+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" + ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{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" -+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" -diff -up hplip-3.11.10/Makefile.in.udev-rules hplip-3.11.10/Makefile.in ---- hplip-3.11.10/Makefile.in.udev-rules 2011-10-02 05:11:49.000000000 +0200 -+++ hplip-3.11.10/Makefile.in 2011-10-24 14:23:17.336002785 +0200 -@@ -4093,7 +4093,7 @@ cups_drv = prnt/drv/hpcups.drv +diff -up hplip-3.11.12/Makefile.in.udev-rules hplip-3.11.12/Makefile.in +--- hplip-3.11.12/Makefile.in.udev-rules 2011-12-09 12:23:55.000000000 +0100 ++++ hplip-3.11.12/Makefile.in 2011-12-19 17:24:14.204573291 +0100 +@@ -4106,7 +4106,7 @@ cups_drv = prnt/drv/hpcups.drv @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" # hpmud.rules -@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d +@HPLIP_BUILD_TRUE@rulesdir = /lib/udev/rules.d @HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \ + @HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \ @HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3) - @HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor diff --git a/hplip.spec b/hplip.spec index e81adab..1eedb08 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.11.10 -Release: 11%{?dist} +Version: 3.11.12 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -34,21 +34,16 @@ Patch17: hplip-deviceIDs-ppd.patch Patch18: hplip-skip-blank-lines.patch Patch19: hplip-dbglog-newline.patch Patch20: hplip-no-system-tray.patch -Patch22: hplip-ppd-ImageableArea.patch -Patch25: hplip-raw_deviceID-traceback.patch -Patch26: hplip-UnicodeDecodeError.patch -Patch27: hplip-emit-SIGNAL.patch -Patch28: hplip-fab-root-crash.patch -Patch29: hplip-addprinter.patch -Patch30: hplip-dbus-exception.patch -Patch31: hplip-hpaio-segfault.patch -Patch32: hplip-newline.patch -Patch33: hplip-dbus-threads.patch -Patch34: hplip-notification-exception.patch -Patch35: hplip-CVE-2010-4267.patch -Patch36: hplip-wifisetup.patch -Patch37: hplip-hpaio-localonly.patch -Patch38: hplip-top-margins-not-respected.patch +Patch21: hplip-ppd-ImageableArea.patch +Patch22: hplip-raw_deviceID-traceback.patch +Patch23: hplip-UnicodeDecodeError.patch +Patch24: hplip-addprinter.patch +Patch25: hplip-dbus-exception.patch +Patch26: hplip-notification-exception.patch +Patch27: hplip-CVE-2010-4267.patch +Patch28: hplip-wifisetup.patch +Patch29: hplip-makefile-chgrp.patch +Patch30: hplip-hpaio-localonly.patch Requires(pre): /sbin/service Requires(post): /sbin/chkconfig @@ -257,59 +252,45 @@ done %patch20 -p1 -b .no-system-tray # Fix ImageableArea for Laserjet 8150/9000 (bug #596298). -for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4); +for ppd_file in $(grep '^diff' %{PATCH21} | cut -d " " -f 4); do gunzip ${ppd_file#*/}.gz done -%patch22 -p1 -b .ImageableArea -for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4); +%patch21 -p1 -b .ImageableArea +for ppd_file in $(grep '^diff' %{PATCH21} | cut -d " " -f 4); do gzip -n ${ppd_file#*/} done # Fixed traceback on error condition in device.py (bug #628125). -%patch25 -p1 -b .raw_deviceID-traceback +%patch22 -p1 -b .raw_deviceID-traceback # Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739). -%patch26 -p1 -b .UnicodeDecodeError - -# Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834). -%patch27 -p1 -b .emit-SIGNAL - -# Prevent hp-fab traceback when run as root. -%patch28 -p1 -b .fab-root-crash +%patch23 -p1 -b .UnicodeDecodeError # Call cupsSetUser in cupsext's addPrinter method before connecting so # that we can get an authentication callback (bug #538352). -%patch29 -p1 -b .addprinter +%patch24 -p1 -b .addprinter # Catch D-Bus exceptions in fax dialog (bug #645316). -%patch30 -p1 -b .dbus-exception - -# Prevent hpaio segfaulting on invalid URIs (bug #649092). -%patch31 -p1 -b .hpaio-segfault - -# Another missing newline in filter output (Ubuntu #418053). -%patch32 -p1 -b .newline - -# Enable D-Bus threading (and require pygobject2) (bug #600932). -%patch33 -p1 -b .dbus-threads +%patch25 -p1 -b .dbus-exception # Catch GError exception when notification showing failed (bug #665577). -%patch34 -p1 -b .notification-exception +%patch26 -p1 -b .notification-exception # Applied patch to fix CVE-2010-4267, remote stack overflow # vulnerability (bug #670252). -%patch35 -p1 -b .CVE-2010-4267 +%patch27 -p1 -b .CVE-2010-4267 # Avoid KeyError in ui4/wifisetupdialog.py (bug #680939). -%patch36 -p1 -b .wifisetup +%patch28 -p1 -b .wifisetup + +# Don't run 'chgrp lp /var/log/hp' in makefile +%patch29 -p1 -b .chgrp # Pay attention to the SANE localOnly flag in hpaio (bug #743593). -%patch37 -p1 -b .hpaio-localonly +%patch30 -p1 -b .hpaio-localonly -# revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089). -%patch38 -p1 -b .top-margins-not-respected sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ @@ -394,9 +375,11 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %defattr(-,root,root) %doc COPYING doc/* %{_bindir}/hp-align +%{_bindir}/hp-check-plugin %{_bindir}/hp-clean %{_bindir}/hp-colorcal %{_bindir}/hp-devicesettings +%{_bindir}/hp-diagnose_plugin %{_bindir}/hp-fab %{_bindir}/hp-faxsetup %{_bindir}/hp-firmware @@ -425,9 +408,11 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %{_datadir}/cups/mime/pstotiff.convs # Files %{_datadir}/hplip/align.py* +%{_datadir}/hplip/check-plugin* %{_datadir}/hplip/clean.py* %{_datadir}/hplip/colorcal.py* %{_datadir}/hplip/devicesettings.py* +%{_datadir}/hplip/diagnose_plugin* %{_datadir}/hplip/fab.py* %{_datadir}/hplip/fax %{_datadir}/hplip/faxsetup.py* @@ -465,6 +450,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %{_datadir}/hplip/prnt/plugins %{_datadir}/hplip/scan %{_localstatedir}/lib/hp +%dir %attr(0774,root,lp) %{_localstatedir}/log/hp %files common %defattr(-,root,root,-) @@ -537,6 +523,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Mon Dec 19 2011 Jiri Popelka 3.11.12-1 +- 3.11.12 + * Mon Nov 21 2011 Tim Waugh 3.11.10-11 - Added IEEE 1284 Device ID for Designjet T770 (bug #747957). diff --git a/sources b/sources index bc090c5..edea4f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6143f30f3b6905ef22105176a3b80db0 hplip-3.11.10.tar.gz +a29628107801f09161c57aa0515fe7f7 hplip-3.11.12.tar.gz