diff --git a/.gitignore b/.gitignore index 5a37f94..480f366 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ hplip-3.10.6.tar.gz /hplip-3.12.11.tar.gz /hplip-3.13.2.tar.gz /hplip-3.13.3.tar.gz +/hplip-3.13.4.tar.gz diff --git a/hplip-3.13.3.tar.gz.asc b/hplip-3.13.3.tar.gz.asc deleted file mode 100644 index ef698f0..0000000 --- a/hplip-3.13.3.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlE5kPoACgkQc9dwzaWQR7m4mwCfbJgo3GNIBg7Dmkcm7jLmmbfE -Uu0An0u9w+hysqpgGz6Qd4jjQoIhpo2c -=/sA6 ------END PGP SIGNATURE----- diff --git a/hplip-3.13.4.tar.gz.asc b/hplip-3.13.4.tar.gz.asc new file mode 100644 index 0000000..0d95441 --- /dev/null +++ b/hplip-3.13.4.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlFilg8ACgkQc9dwzaWQR7mjyQCeOrk6FE3i3zZXxPbL2MrxcbOq +MR4AniFyO5jFPdrtC05y9zMnIbM5nxH/ +=qCIl +-----END PGP SIGNATURE----- diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch index c962ff4..a221e96 100644 --- a/hplip-dbglog-newline.patch +++ b/hplip-dbglog-newline.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2012-06-19 11:01:38.000000000 +0200 -+++ hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp 2012-06-19 11:02:52.150529477 +0200 -@@ -440,7 +440,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu +diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2013-04-09 12:26:18.750566175 +0200 ++++ hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp 2013-04-09 12:27:07.525884647 +0200 +@@ -452,7 +452,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu m_DBusComm.sendEvent(EVENT_PRINT_FAILED_MISSING_PLUGIN, "Plugin missing", m_JA.job_id, m_JA.user_name); } @@ -10,7 +10,7 @@ diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.12.6/p ppdClose(m_ppd); m_ppd = NULL; return err; -@@ -533,7 +533,7 @@ int HPCupsFilter::StartPrintJob(int arg +@@ -545,7 +545,7 @@ int HPCupsFilter::StartPrintJob(int arg close(fd); } if (m_iLogLevel & BASIC_LOG) @@ -19,7 +19,7 @@ diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.12.6/p closeFilter(); cupsRasterClose(cups_raster); return 1; -@@ -543,7 +543,7 @@ int HPCupsFilter::StartPrintJob(int arg +@@ -555,7 +555,7 @@ int HPCupsFilter::StartPrintJob(int arg close(fd); } if (m_iLogLevel & BASIC_LOG) @@ -28,18 +28,18 @@ diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.12.6/p closeFilter(); cupsRasterClose(cups_raster); return 0; -@@ -678,7 +678,7 @@ int HPCupsFilter::processRasterData(cups +@@ -705,7 +705,7 @@ int HPCupsFilter::processRasterData(cups //Need to revisit to crosscheck if it is a firmware issue. - - *m_pPrinterBuffer = 0x01; + + *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.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Lidil.cpp ---- hplip-3.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200 -+++ hplip-3.12.6/prnt/hpcups/Lidil.cpp 2012-06-19 11:01:39.598521705 +0200 +diff -up hplip-3.13.4/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.13.4/prnt/hpcups/Lidil.cpp +--- hplip-3.13.4/prnt/hpcups/Lidil.cpp.dbglog-newline 2013-04-08 11:52:06.000000000 +0200 ++++ hplip-3.13.4/prnt/hpcups/Lidil.cpp 2013-04-09 12:26:19.400557093 +0200 @@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline * if (m_pPM->BaseResX != m_pQA->horizontal_resolution || m_pPM->BaseResY != m_pQA->vertical_resolution) @@ -94,9 +94,9 @@ diff -up hplip-3.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.12.6/prnt/hpc return false; } -diff -up hplip-3.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Pcl3.cpp ---- hplip-3.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200 -+++ hplip-3.12.6/prnt/hpcups/Pcl3.cpp 2012-06-19 11:01:39.599521691 +0200 +diff -up hplip-3.13.4/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.13.4/prnt/hpcups/Pcl3.cpp +--- hplip-3.13.4/prnt/hpcups/Pcl3.cpp.dbglog-newline 2013-04-08 11:52:06.000000000 +0200 ++++ hplip-3.13.4/prnt/hpcups/Pcl3.cpp 2013-04-09 12:26:19.400557093 +0200 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** if (!selectPrintMode()) @@ -140,9 +140,9 @@ diff -up hplip-3.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.12.6/prnt/hpcu return false; } -diff -up hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp ---- hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200 -+++ hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp 2012-06-19 11:01:39.599521691 +0200 +diff -up hplip-3.13.4/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.13.4/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.13.4/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2013-04-08 11:52:06.000000000 +0200 ++++ hplip-3.13.4/prnt/hpcups/Pcl3Gui.cpp 2013-04-09 12:26:19.400557093 +0200 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline if (!selectPrintMode()) diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 5a440e1..ed83ca9 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,1043 +1,1043 @@ -diff -up hplip-3.12.11/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.11/prnt/drv/hpcups.drv.in ---- hplip-3.12.11/prnt/drv/hpcups.drv.in.deviceIDs-drv 2012-11-20 10:55:29.000000000 +0100 -+++ hplip-3.12.11/prnt/drv/hpcups.drv.in 2012-11-27 10:04:50.798926885 +0100 -@@ -467,7 +467,7 @@ Manufacturer "HP" +diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv/hpcups.drv.in +--- hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv 2013-04-08 11:59:00.000000000 +0200 ++++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-09 12:09:48.375405551 +0200 +@@ -473,7 +473,7 @@ Manufacturer "HP" ModelName "HP Officejet v40xi" - Attribute "NickName" "" "HP Officejet v40xi, $Version" + Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet v40xi" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" PCFileName "hp-officejet_v40xi.ppd" Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" } -@@ -475,7 +475,7 @@ Manufacturer "HP" +@@ -481,7 +481,7 @@ Manufacturer "HP" ModelName "HP Officejet v40" - Attribute "NickName" "" "HP Officejet v40, $Version" + Attribute "NickName" "" "HP Officejet v40, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet v40" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" PCFileName "hp-officejet_v40.ppd" Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" -@@ -492,7 +492,7 @@ Manufacturer "HP" +@@ -498,7 +498,7 @@ Manufacturer "HP" ModelName "HP Officejet g55" - Attribute "NickName" "" "HP Officejet g55, $Version" + Attribute "NickName" "" "HP Officejet g55, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet g55" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" PCFileName "hp-officejet_g55.ppd" Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" } -@@ -540,7 +540,7 @@ Manufacturer "HP" +@@ -546,7 +546,7 @@ Manufacturer "HP" ModelName "HP Officejet g85" - Attribute "NickName" "" "HP Officejet g85, $Version" + Attribute "NickName" "" "HP Officejet g85, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet g85" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" PCFileName "hp-officejet_g85.ppd" Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" } -@@ -556,7 +556,7 @@ Manufacturer "HP" +@@ -562,7 +562,7 @@ Manufacturer "HP" ModelName "HP Officejet g95" - Attribute "NickName" "" "HP Officejet g95, $Version" + Attribute "NickName" "" "HP Officejet g95, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet g95" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" PCFileName "hp-officejet_g95.ppd" Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" } -@@ -572,7 +572,7 @@ Manufacturer "HP" +@@ -578,7 +578,7 @@ Manufacturer "HP" ModelName "HP PSC 750xi" - Attribute "NickName" "" "HP PSC 750xi, $Version" + Attribute "NickName" "" "HP PSC 750xi, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 750xi" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" PCFileName "hp-psc_750xi.ppd" Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" } -@@ -580,7 +580,7 @@ Manufacturer "HP" +@@ -586,7 +586,7 @@ Manufacturer "HP" ModelName "HP PSC 750" - Attribute "NickName" "" "HP PSC 750, $Version" + Attribute "NickName" "" "HP PSC 750, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 750" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" PCFileName "hp-psc_750.ppd" Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" } -@@ -612,7 +612,7 @@ Manufacturer "HP" +@@ -618,7 +618,7 @@ Manufacturer "HP" ModelName "HP PSC 900 Series" - Attribute "NickName" "" "HP PSC 900 Series, $Version" + Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 900 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" PCFileName "hp-psc_900_series.ppd" Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" } -@@ -628,7 +628,7 @@ Manufacturer "HP" +@@ -634,7 +634,7 @@ Manufacturer "HP" ModelName "HP Deskjet 920c" - Attribute "NickName" "" "HP Deskjet 920c, $Version" + Attribute "NickName" "" "HP Deskjet 920c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 920c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 920c;DES:deskjet 920c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;" PCFileName "hp-deskjet_920c.ppd" Attribute "Product" "" "(HP Deskjet 920c Printer)" Attribute "Product" "" "(HP Deskjet 920cvr Printer)" -@@ -647,7 +647,7 @@ Manufacturer "HP" +@@ -653,7 +653,7 @@ Manufacturer "HP" ModelName "HP Deskjet 930c" - Attribute "NickName" "" "HP Deskjet 930c, $Version" + Attribute "NickName" "" "HP Deskjet 930c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 930c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 930c;DES:deskjet 930c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;" PCFileName "hp-deskjet_930c.ppd" Attribute "Product" "" "(HP Deskjet 930c Printer)" Attribute "Product" "" "(HP Deskjet 930cm Printer)" -@@ -688,7 +688,7 @@ Manufacturer "HP" +@@ -694,7 +694,7 @@ Manufacturer "HP" ModelName "HP Deskjet 940c" - Attribute "NickName" "" "HP Deskjet 940c, $Version" + Attribute "NickName" "" "HP Deskjet 940c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 940c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 940c;DES:deskjet 940c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;" PCFileName "hp-deskjet_940c.ppd" Attribute "Product" "" "(HP Deskjet 940cvr Printer)" Attribute "Product" "" "(HP Deskjet 940c Printer)" -@@ -707,7 +707,7 @@ Manufacturer "HP" +@@ -713,7 +713,7 @@ Manufacturer "HP" ModelName "HP Deskjet 950c" - Attribute "NickName" "" "HP Deskjet 950c, $Version" + Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 950c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" PCFileName "hp-deskjet_950c.ppd" Attribute "Product" "" "(HP Deskjet 950c Printer)" } -@@ -764,7 +764,7 @@ Manufacturer "HP" +@@ -770,7 +770,7 @@ Manufacturer "HP" ModelName "HP Deskjet 959c" - Attribute "NickName" "" "HP Deskjet 959c, $Version" + Attribute "NickName" "" "HP Deskjet 959c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 959c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 959c;DES:deskjet 959c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" PCFileName "hp-deskjet_959c.ppd" Attribute "Product" "" "(HP Deskjet 959c Printer)" } -@@ -772,7 +772,7 @@ Manufacturer "HP" +@@ -778,7 +778,7 @@ Manufacturer "HP" ModelName "HP Deskjet 970c" - Attribute "NickName" "" "HP Deskjet 970c, $Version" + Attribute "NickName" "" "HP Deskjet 970c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 970c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 970c;DES:deskjet 970c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;" PCFileName "hp-deskjet_970c.ppd" Attribute "Product" "" "(HP Deskjet 970cxi Printer)" Attribute "Product" "" "(HP Deskjet 970cse Printer)" -@@ -792,7 +792,7 @@ Manufacturer "HP" +@@ -798,7 +798,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" - Attribute "NickName" "" "HP Photosmart p1000, $Version" + Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" - Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;" PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -801,7 +801,7 @@ Manufacturer "HP" +@@ -807,7 +807,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" - Attribute "NickName" "" "HP Photosmart p1100, $Version" + Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" - Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;" PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -835,7 +835,7 @@ Manufacturer "HP" +@@ -841,7 +841,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" - Attribute "NickName" "" "HP Deskjet 3820, $Version" + Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3820;DES:deskjet 3820;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;" PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -873,7 +873,7 @@ Manufacturer "HP" +@@ -879,7 +879,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" - Attribute "NickName" "" "HP Officejet 5105, $Version" + Attribute "NickName" "" "HP Officejet 5105, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 5105" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;" PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -881,7 +881,7 @@ Manufacturer "HP" +@@ -887,7 +887,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" - Attribute "NickName" "" "HP Officejet 5110v, $Version" + Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;" PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } -@@ -932,7 +932,7 @@ Manufacturer "HP" +@@ -938,7 +938,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" - Attribute "NickName" "" "HP Deskjet 1220c, $Version" + Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 1220c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1220c;DES:deskjet 1220c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;" PCFileName "hp-deskjet_1220c.ppd" Attribute "Product" "" "(HP Deskjet 1220c Printer)" Attribute "Product" "" "(HP Deskjet 1220cse Printer)" -@@ -1128,7 +1128,7 @@ Manufacturer "HP" +@@ -1134,7 +1134,7 @@ Manufacturer "HP" ModelName "HP 2000c" - Attribute "NickName" "" "HP 2000c, $Version" + Attribute "NickName" "" "HP 2000c, hpcups $Version" Attribute "ShortNickName" "" "HP 2000c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp 2000c;DES:hp 2000c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP 2000C;DES:hp 2000c;" PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1570,7 +1570,7 @@ Manufacturer "HP" +@@ -1576,7 +1576,7 @@ Manufacturer "HP" ModelName "HP Officejet D Series" - Attribute "NickName" "" "HP Officejet D Series, $Version" + Attribute "NickName" "" "HP Officejet D Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet D Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet d series;DES:officejet d series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet d series;DES:officejet d series;" PCFileName "hp-officejet_d_series.ppd" Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" -@@ -1593,7 +1593,7 @@ Manufacturer "HP" +@@ -1599,7 +1599,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" - Attribute "NickName" "" "HP Deskjet 960c, $Version" + Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 960c;DES:deskjet 960c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;" PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1603,7 +1603,7 @@ Manufacturer "HP" +@@ -1609,7 +1609,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" - Attribute "NickName" "" "HP Deskjet 980c, $Version" + Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 980c;DES:deskjet 980c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;" PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1612,7 +1612,7 @@ Manufacturer "HP" +@@ -1618,7 +1618,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" - Attribute "NickName" "" "HP Deskjet 990c, $Version" + Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 990c;DES:deskjet 990c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;" PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1675,7 +1675,7 @@ Manufacturer "HP" +@@ -1681,7 +1681,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" - Attribute "NickName" "" "HP Color Inkjet cp1700, $Version" + Attribute "NickName" "" "HP Color Inkjet cp1700, hpcups $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1683,7 +1683,7 @@ Manufacturer "HP" +@@ -1689,7 +1689,7 @@ Manufacturer "HP" ModelName "HP PSC 2100 Series" - Attribute "NickName" "" "HP PSC 2100 Series, $Version" + Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2100 series;DES:psc 2100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2100 Series;DES:psc 2100 series;" PCFileName "hp-psc_2100_series.ppd" Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" -@@ -1696,7 +1696,7 @@ Manufacturer "HP" +@@ -1702,7 +1702,7 @@ Manufacturer "HP" ModelName "HP PSC 2150 Series" - Attribute "NickName" "" "HP PSC 2150 Series, $Version" + Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2150 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2150 series;DES:psc 2150 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2150 Series;DES:psc 2150 series;" PCFileName "hp-psc_2150_series.ppd" Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" } -@@ -1704,7 +1704,7 @@ Manufacturer "HP" +@@ -1710,7 +1710,7 @@ Manufacturer "HP" ModelName "HP PSC 2170 Series" - Attribute "NickName" "" "HP PSC 2170 Series, $Version" + Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2170 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2170 series;DES:psc 2170 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2170 Series;DES:psc 2170 series;" PCFileName "hp-psc_2170_series.ppd" Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" -@@ -1741,7 +1741,7 @@ Manufacturer "HP" +@@ -1747,7 +1747,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" - Attribute "NickName" "" "HP Officejet 7100 Series, $Version" + Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7100 series;DES:officejet 7100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7100 series;DES:officejet 7100 series;" PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" -@@ -1971,7 +1971,7 @@ Manufacturer "HP" +@@ -1977,7 +1977,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" - Attribute "NickName" "" "HP Business Inkjet 2200, $Version" + Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2200;DES:hp business inkjet 2200;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;" PCFileName "hp-business_inkjet_2200.ppd" Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" -@@ -1981,7 +1981,7 @@ Manufacturer "HP" +@@ -1987,7 +1987,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2230" - Attribute "NickName" "" "HP Business Inkjet 2230, $Version" + Attribute "NickName" "" "HP Business Inkjet 2230, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2230" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2230;DES:hp business inkjet 2230;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;" PCFileName "hp-business_inkjet_2230.ppd" Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" } -@@ -1989,7 +1989,7 @@ Manufacturer "HP" +@@ -1995,7 +1995,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2250" - Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $Version" + Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2250" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2250;DES:hp business inkjet 2250;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;" PCFileName "hp-business_inkjet_2250-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" -@@ -1998,7 +1998,7 @@ Manufacturer "HP" +@@ -2004,7 +2004,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2280" - Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $Version" + Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2280" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2280;DES:hp business inkjet 2280;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;" PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2533,7 +2533,7 @@ Manufacturer "HP" +@@ -2539,7 +2539,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" - Attribute "NickName" "" "HP PSC 2200 Series, $Version" + Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;" PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2551,7 +2551,7 @@ Manufacturer "HP" +@@ -2557,7 +2557,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" - Attribute "NickName" "" "HP PSC 2300 Series, $Version" + Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;" 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)" -@@ -2560,7 +2560,7 @@ Manufacturer "HP" +@@ -2566,7 +2566,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" - Attribute "NickName" "" "HP PSC 2350 Series, $Version" + Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;" PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2577,7 +2577,7 @@ Manufacturer "HP" +@@ -2583,7 +2583,7 @@ Manufacturer "HP" ModelName "HP PSC 2400 Series" - Attribute "NickName" "" "HP PSC 2400 Series, $Version" + Attribute "NickName" "" "HP PSC 2400 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2400 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;" + Attribute "1284DeviceID" "" "MFG:hp;MDL:psc 2400 series;" PCFileName "hp-psc_2400_series.ppd" Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" -@@ -2603,7 +2603,7 @@ Manufacturer "HP" +@@ -2609,7 +2609,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" - Attribute "NickName" "" "HP PSC 2500 Series, $Version" + Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;" 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)" -@@ -3064,7 +3064,7 @@ Manufacturer "HP" +@@ -3070,7 +3070,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" - Attribute "NickName" "" "HP Officejet j5700 Series, $Version" + Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;" PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3137,7 +3137,7 @@ Manufacturer "HP" +@@ -3143,7 +3143,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" - Attribute "NickName" "" "HP Officejet 6100 Series, $Version" + Attribute "NickName" "" "HP Officejet 6100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100 series;DES:officejet 6100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;" PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3192,7 +3192,7 @@ Manufacturer "HP" +@@ -3198,7 +3198,7 @@ Manufacturer "HP" ModelName "HP Officejet 6300 Series" - Attribute "NickName" "" "HP Officejet 6300 Series, $Version" + Attribute "NickName" "" "HP Officejet 6300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 6300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6300 series;DES:officejet 6300 series;" + Attribute "1284DeviceID" "" "MFG:HP;MDL:Officejet 6300 series;" PCFileName "hp-officejet_6300_series.ppd" Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" -@@ -3361,7 +3361,7 @@ Manufacturer "HP" +@@ -3367,7 +3367,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" - Attribute "NickName" "" "HP Officejet 7200 Series, $Version" + Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7200 series;DES:officejet 7200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7200 series;DES:officejet 7200 series;" PCFileName "hp-officejet_7200_series.ppd" Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" -@@ -3446,7 +3446,7 @@ Manufacturer "HP" +@@ -3452,7 +3452,7 @@ Manufacturer "HP" ModelName "HP Officejet 7400 Series" - Attribute "NickName" "" "HP Officejet 7400 Series, $Version" + Attribute "NickName" "" "HP Officejet 7400 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7400 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7400 series;DES:officejet 7400 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7400 series;DES:officejet 7400 series;" PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -10117,7 +10117,7 @@ Manufacturer "HP" +@@ -10154,7 +10154,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" - Attribute "NickName" "" "HP PSC 1100 Series, $Version" + Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;" PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -10127,7 +10127,7 @@ Manufacturer "HP" +@@ -10164,7 +10164,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" - Attribute "NickName" "" "HP PSC 1200 Series, $Version" + Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;" PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -10310,7 +10310,7 @@ Manufacturer "HP" +@@ -10347,7 +10347,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3940" - Attribute "NickName" "" "HP Deskjet 3940, $Version" + Attribute "NickName" "" "HP Deskjet 3940, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 3940" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3940;DES:deskjet 3940;" + Attribute "1284DeviceID" "" "MFG:HP;MDL:Deskjet 3900;DES:3940;" PCFileName "hp-deskjet_3940.ppd" Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" -@@ -10319,7 +10319,7 @@ Manufacturer "HP" +@@ -10356,7 +10356,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" - Attribute "NickName" "" "HP Officejet 4100 Series, $Version" + Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4100 series;DES:officejet 4100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-packard;MDL:officejet 4100 series;DES:officejet 4100 series;" 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)" -@@ -10346,7 +10346,7 @@ Manufacturer "HP" +@@ -10383,7 +10383,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" - Attribute "NickName" "" "HP Officejet 4300 Series, $Version" + Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4300 series;DES:officejet 4300 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet 4300 series;DES:officejet 4300 series;" PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -10662,7 +10662,7 @@ Manufacturer "HP" +@@ -10699,7 +10699,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" - Attribute "NickName" "" "HP Officejet j3600 Series, $Version" + Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;" PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -10733,7 +10733,7 @@ Manufacturer "HP" +@@ -10770,7 +10770,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" - Attribute "NickName" "" "HP Officejet 4200 Series, $Version" + Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4200 series;DES:officejet 4200 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 4200 series;DES:officejet 4200 series;" PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -11240,6 +11240,7 @@ Manufacturer "HP" - Attribute "NickName" "" "HP Photosmart 380 Series, $Version" +@@ -11277,6 +11277,7 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart 380 Series" Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" + Attribute "1284DeviceID" "" "MFG:HP;MDL:Photosmart 380 series_BT;DES:385;" PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -11667,7 +11668,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11703,7 +11704,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4 Plus" - Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4 Plus" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4 plus;DES:hp laserjet 4 plus;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4 Plus;DES:hp laserjet 4 plus;" PCFileName "hp-laserjet_4_plus-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" -@@ -11693,7 +11694,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11729,7 +11730,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5l" - Attribute "NickName" "" "HP LaserJet 5l, $Version" + Attribute "NickName" "" "HP LaserJet 5l, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5l" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5l;DES:hp laserjet 5l;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5L;DES:Hewlett-Packard LaserJet 5L Printer;" PCFileName "hp-laserjet_5l.ppd" Attribute "Product" "" "(HP LaserJet 5l Printer)" Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" -@@ -11703,7 +11704,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11739,7 +11740,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5mp" - Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 5mp pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5mp" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;" PCFileName "hp-laserjet_5mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5mp Printer)" } -@@ -11711,7 +11712,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11747,7 +11748,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5p" - Attribute "NickName" "" "HP LaserJet 5p, $Version" + Attribute "NickName" "" "HP LaserJet 5p, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5p" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5p;DES:hp laserjet 5p;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5P;DES:Hewlett-Packard LaserJet 5P Printer;" PCFileName "hp-laserjet_5p.ppd" Attribute "Product" "" "(HP LaserJet 5p Printer)" } -@@ -11719,7 +11720,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11755,7 +11756,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6l" - Attribute "NickName" "" "HP LaserJet 6l, $Version" + Attribute "NickName" "" "HP LaserJet 6l, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6l" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6l;DES:hp laserjet 6l;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6L;DES:hp laserjet 6l;" PCFileName "hp-laserjet_6l.ppd" Attribute "Product" "" "(HP LaserJet 6l Printer)" Attribute "Product" "" "(HP LaserJet 6lse Printer)" -@@ -11731,7 +11732,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11767,7 +11768,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6p" - Attribute "NickName" "" "HP LaserJet 6p, $Version" + Attribute "NickName" "" "HP LaserJet 6p, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6p" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6p;DES:hp laserjet 6p;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6P;DES:Hewlett-Packard LaserJet 6P Printer;" PCFileName "hp-laserjet_6p.ppd" Attribute "Product" "" "(HP LaserJet 6p Printer)" } -@@ -11739,7 +11740,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11775,7 +11776,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 6mp" - Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 6mp pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 6mp" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6mp;DES:hp laserjet 6mp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6MP;DES:Hewlett-Packard LaserJet 6MP Printer;" PCFileName "hp-laserjet_6mp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 6mp Printer)" Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" -@@ -11749,7 +11750,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11785,7 +11786,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1015" - Attribute "NickName" "" "HP LaserJet 1015, $Version" + Attribute "NickName" "" "HP LaserJet 1015, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1015" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1015;DES:hp laserjet 1015;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1015;DES:hp laserjet 1015;" PCFileName "hp-laserjet_1015.ppd" Attribute "Product" "" "(HP LaserJet 1015 Printer)" } -@@ -11791,7 +11792,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11835,7 +11836,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1100" - Attribute "NickName" "" "HP LaserJet 1100, $Version" + Attribute "NickName" "" "HP LaserJet 1100, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1100" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1100;DES:hp laserjet 1100;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100 Printer;" PCFileName "hp-laserjet_1100.ppd" Attribute "Product" "" "(HP LaserJet 1100 Printer)" Attribute "Product" "" "(HP LaserJet 1100se Printer)" -@@ -11809,7 +11810,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11845,7 +11846,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1150" - Attribute "NickName" "" "HP LaserJet 1150, $Version" + Attribute "NickName" "" "HP LaserJet 1150, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1150" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1150;DES:hp laserjet 1150;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1150;DES:Hewlett-Packard LaserJet 1150;" PCFileName "hp-laserjet_1150.ppd" Attribute "Product" "" "(HP LaserJet 1150 Printer)" } -@@ -11826,7 +11827,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11862,7 +11863,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1160 Series" - Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" + Attribute "NickName" "" "HP LaserJet 1160 Series, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1160 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1160 series;DES:hp laserjet 1160 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1160 series;DES:Hewlett-Packard LaserJet 1160 series;" PCFileName "hp-laserjet_1160_series.ppd" Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" } -@@ -11834,7 +11835,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11870,7 +11871,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1200" - Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 1200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1200;DES:hp laserjet 1200;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:hp laserjet 1200;" PCFileName "hp-laserjet_1200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1200 Printer)" Attribute "Product" "" "(HP LaserJet 1200se Printer)" -@@ -11859,7 +11860,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11895,7 +11896,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1220" - Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 1220 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1220" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1220;DES:hp laserjet 1220;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1220;DES:Hewlett-Packard LaserJet 1220;" PCFileName "hp-laserjet_1220-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" } -@@ -11867,7 +11868,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11903,7 +11904,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1300" - Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 1300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1300;DES:hp laserjet 1300;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" PCFileName "hp-laserjet_1300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1300 Printer)" Attribute "Product" "" "(HP LaserJet 1300t Printer)" -@@ -11892,7 +11893,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11928,7 +11929,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320 Series" - Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1320 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320 series;DES:hp laserjet 1320 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" PCFileName "hp-laserjet_1320_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" } -@@ -11916,7 +11917,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11952,7 +11953,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1320" - Attribute "NickName" "" "HP LaserJet 1320, $Version" + Attribute "NickName" "" "HP LaserJet 1320, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1320" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320;DES:hp laserjet 1320;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" PCFileName "hp-laserjet_1320.ppd" Attribute "Product" "" "(HP LaserJet 1320 Printer)" Attribute "Product" "" "(HP LaserJet 1320t Printer)" -@@ -11941,7 +11942,7 @@ Group "RLT/HP Real Life Technologies" +@@ -11977,7 +11978,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1522nf MFP" - Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1522nf mfp;DES:hewlett-packard laserjet m1522nf mfp;" PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)" } -@@ -12013,7 +12014,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12049,7 +12050,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2015 Series" - Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p2015 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2015 series;DES:hp laserjet p2015 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" PCFileName "hp-laserjet_p2015_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2015 Printer)" } -@@ -12037,7 +12038,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12073,7 +12074,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet p2035 pcl3, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2035;" PCFileName "hp-laserjet_p2035-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p2035 Printer)" } -@@ -12077,7 +12078,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12113,7 +12114,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100" - Attribute "NickName" "" "HP LaserJet 2100, $Version" + Attribute "NickName" "" "HP LaserJet 2100, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2100" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100;DES:hp laserjet 2100;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:hp laserjet 2100;" PCFileName "hp-laserjet_2100.ppd" Attribute "Product" "" "(HP LaserJet 2100 Printer)" Attribute "Product" "" "(HP LaserJet 2100m Printer)" -@@ -12089,7 +12090,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12125,7 +12126,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2100 Series" - Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100 series;DES:hp laserjet 2100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;" PCFileName "hp-laserjet_2100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" } -@@ -12105,7 +12106,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12141,7 +12142,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2200" - Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 2200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200;DES:hp laserjet 2200;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;" PCFileName "hp-laserjet_2200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2200 Printer)" Attribute "Product" "" "(HP LaserJet 2200d Printer)" -@@ -12118,7 +12119,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12154,7 +12155,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300" - Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 2300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300;DES:hp laserjet 2300;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" PCFileName "hp-laserjet_2300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2300 Printer)" Attribute "Product" "" "(HP LaserJet 2300n Printer)" -@@ -12131,7 +12132,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12167,7 +12168,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2300 Series" - Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" + Attribute "NickName" "" "HP LaserJet 2300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2300 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300 series;DES:hp laserjet 2300 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" PCFileName "hp-laserjet_2300_series.ppd" Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" } -@@ -12147,7 +12148,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12183,7 +12184,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2420" - Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 2420 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2420" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2420;DES:hp laserjet 2420;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;DES:Hewlett-Packard LaserJet 2420;" PCFileName "hp-laserjet_2420-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2420 Printer)" Attribute "Product" "" "(HP LaserJet 2420d Printer)" -@@ -12158,7 +12159,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12194,7 +12195,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 2430" - Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 2430 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 2430" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2430;DES:hp laserjet 2430;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2430;DES:Hewlett-Packard LaserJet 2430;" PCFileName "hp-laserjet_2430-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 2430t Printer)" Attribute "Product" "" "(HP LaserJet 2430 Printer)" -@@ -12186,7 +12187,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12222,7 +12223,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3005" - Attribute "NickName" "" "HP LaserJet p3005 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p3005 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p3005" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p3005;DES:hp laserjet p3005;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;DES:hp laserjet p3005;" PCFileName "hp-laserjet_p3005-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3005 Printer)" Attribute "Product" "" "(HP LaserJet p3005d Printer)" -@@ -12199,7 +12200,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12235,7 +12236,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p3010 Series" - Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p3010 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p3010 series;DES:hp laserjet p3010 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;DES:hp laserjet p3010 series;" PCFileName "hp-laserjet_p3010_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet p3015 Printer)" Attribute "Product" "" "(HP LaserJet p3011 Printer)" -@@ -12208,7 +12209,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12244,7 +12245,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3015" - Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 3015 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3015" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3015;DES:hp laserjet 3015;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3015;DES:Hewlett-Packard LaserJet 3015;" PCFileName "hp-laserjet_3015-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" } -@@ -12216,7 +12217,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12252,7 +12253,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3020" - Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 3020 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3020" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3020;DES:hp laserjet 3020;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 3020;DES:Hewlett-Packard LaserJet 3020;" PCFileName "hp-laserjet_3020-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" } -@@ -12224,7 +12225,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12260,7 +12261,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3027 MFP" - Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3027 mfp;DES:hp laserjet m3027 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;DES:Hewlett-Packard LaserJet M3027 MFP;" PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" -@@ -12233,7 +12234,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12269,7 +12270,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3030" - Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 3030 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3030" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3030;DES:hp laserjet 3030;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3030;DES:Hewlett-Packard LaserJet 3030;" PCFileName "hp-laserjet_3030-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" } -@@ -12241,7 +12242,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12277,7 +12278,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3050" - Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 3050 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3050" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3050;DES:hp laserjet 3050;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3050;DES:Hewlett-Packard LaserJet 3050;" PCFileName "hp-laserjet_3050-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" -@@ -12250,7 +12251,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12286,7 +12287,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3052" - Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 3052 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3052" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3052;DES:hp laserjet 3052;" + Attribute "1284DeviceID" "" "MFG:HEwlett-Packard;MDL:HP LaserJet 3052;DES:Hewlett-Packard LaserJet 3052;" PCFileName "hp-laserjet_3052-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" } -@@ -12258,7 +12259,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12294,7 +12295,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3055" - Attribute "NickName" "" "HP LaserJet 3055, $Version" + Attribute "NickName" "" "HP LaserJet 3055, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3055" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3055;DES:hp laserjet 3055;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3055;DES:Hewlett-Packard LaserJet 3055;" PCFileName "hp-laserjet_3055.ppd" Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" } -@@ -12286,7 +12287,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12322,7 +12323,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200m" - Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 3200m pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3200m" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200m;DES:hp laserjet 3200m;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200M;DES:Hewlett-Packard LaserJet 3200M;" PCFileName "hp-laserjet_3200m-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" } -@@ -12302,7 +12303,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3200" - Attribute "NickName" "" "HP LaserJet 3200, $Version" + Attribute "NickName" "" "HP LaserJet 3200, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200;DES:hp laserjet 3200;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200;DES:Hewlett-Packard LaserJet 3200;" PCFileName "hp-laserjet_3200.ppd" Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" } -@@ -12322,7 +12323,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12358,7 +12359,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3330" - Attribute "NickName" "" "HP LaserJet 3330, $Version" + Attribute "NickName" "" "HP LaserJet 3330, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3330" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3330;DES:hp laserjet 3330;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3330;DES:Hewlett-Packard LaserJet 3330;" PCFileName "hp-laserjet_3330.ppd" Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" } -@@ -12330,7 +12331,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12366,7 +12367,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3380" - Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 3380 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3380" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3380;DES:hp laserjet 3380;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3380;DES:Hewlett-Packard LaserJet 3380;" PCFileName "hp-laserjet_3380-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" } -@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12374,7 +12375,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 3390" - Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 3390 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 3390" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3390;DES:hp laserjet 3390;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;" PCFileName "hp-laserjet_3390-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" } -@@ -12354,7 +12355,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12390,7 +12391,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4000 Series" - Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4000 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4000 series;DES:hp laserjet 4000 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;" PCFileName "hp-laserjet_4000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4000 Printer)" Attribute "Product" "" "(HP LaserJet 4000n Printer)" -@@ -12374,7 +12375,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12410,7 +12411,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4014" - Attribute "NickName" "" "HP LaserJet p4014, $Version" + Attribute "NickName" "" "HP LaserJet p4014, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4014" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014;DES:hp laserjet p4014;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P4014;DES:hp laserjet p4014;" PCFileName "hp-laserjet_p4014.ppd" Attribute "Product" "" "(HP LaserJet p4014 Printer)" } -@@ -12430,7 +12431,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12466,7 +12467,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4050 Series" - Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4050 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4050 series;DES:hp laserjet 4050 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;DES:Hewlett-Packard LaserJet 4050 Series;" PCFileName "hp-laserjet_4050_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4050 Printer)" Attribute "Product" "" "(HP LaserJet 4050n Printer)" -@@ -12451,7 +12452,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12487,7 +12488,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4100 Series" - Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4100 series;DES:hp laserjet 4100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;DES:Hewlett-Packard LaserJet 4100 Series;" PCFileName "hp-laserjet_4100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 410dtn Printer)" Attribute "Product" "" "(HP LaserJet 4100tn Printer)" -@@ -12470,7 +12471,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12506,7 +12507,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4200" - Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4200 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4200" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4200;DES:hp laserjet 4200;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;DES:Hewlett-Packard LaserJet 4200;" PCFileName "hp-laserjet_4200-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4200 Printer)" Attribute "Product" "" "(HP LaserJet 4200l Printer)" -@@ -12495,7 +12496,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12531,7 +12532,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4250" - Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4250 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4250" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4250;DES:hp laserjet 4250;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" PCFileName "hp-laserjet_4250-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4250 Printer)" Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" -@@ -12507,7 +12508,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12543,7 +12544,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4300" - Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4300;DES:hp laserjet 4300;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;DES:hp laserjet 4300;" PCFileName "hp-laserjet_4300-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4300 Printer)" Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" -@@ -12520,7 +12521,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12556,7 +12557,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4345 MFP" - Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4345 mfp;DES:hp laserjet 4345 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4345 mfp;DES:hp laserjet 4345 mfp;" PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" -@@ -12531,7 +12532,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12567,7 +12568,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m4345 MFP" - Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m4345 mfp;DES:hp laserjet m4345 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M4345 MFP;DES:Hewlett-Packard LaserJet M4345 MFP;" PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" -@@ -12550,7 +12551,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12586,7 +12587,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 4350" - Attribute "NickName" "" "HP LaserJet 4350 pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 4350 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 4350" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4350;DES:hp laserjet 4350;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;DES:hp laserjet 4350;" PCFileName "hp-laserjet_4350-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 4350 Printer)" Attribute "Product" "" "(HP LaserJet 4350dtn Printer)" -@@ -12586,7 +12587,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12622,7 +12623,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p4515" - Attribute "NickName" "" "HP LaserJet p4515, $Version" + Attribute "NickName" "" "HP LaserJet p4515, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet p4515" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4515;DES:hp laserjet p4515;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P4515;DES:hp laserjet p4515;" PCFileName "hp-laserjet_p4515.ppd" Attribute "Product" "" "(HP LaserJet p4515 Printer)" } -@@ -12602,7 +12603,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12638,7 +12639,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5000 Series" - Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5000 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5000 series;DES:hp laserjet 5000 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5000 Series;DES:Hewlett-Packard LaserJet 5000 Series;" PCFileName "hp-laserjet_5000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" } -@@ -12618,7 +12619,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12654,7 +12655,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000 Series" - Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8000 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8000 series;DES:hp laserjet 8000 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;DES:hp laserjet 8000 series;" PCFileName "hp-laserjet_8000_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8000 Series Printer)" } -@@ -12712,7 +12713,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12748,7 +12749,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5si" - Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 5si pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5si" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5si;DES:hp laserjet 5si;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5Si;DES:;" PCFileName "hp-laserjet_5si-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5si Printer)" Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" -@@ -12748,7 +12749,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12784,7 +12785,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m3035 MFP" - Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3035 mfp;DES:hp laserjet m3035 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;DES:Hewlett-Packard LaserJet M3035 MFP;" PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" -@@ -12769,7 +12770,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12805,7 +12806,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5025 MFP" - Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5025 mfp;DES:hp laserjet m5025 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5025 MFP;DES:Hewlett-Packard LaserJet M5025 MFP;" PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" } -@@ -12777,7 +12778,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12813,7 +12814,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m5035 MFP" - Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" + Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5035 mfp;DES:hp laserjet m5035 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5035 MFP;DES:Hewlett-Packard LaserJet M5035 MFP;" PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" -@@ -12795,7 +12796,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12831,7 +12832,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 5100 Series" - Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 5100 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5100 series;DES:hp laserjet 5100 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;DES:hp laserjet 5100 series;" PCFileName "hp-laserjet_5100_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 5100 Printer)" Attribute "Product" "" "(HP LaserJet 5100le Printer)" -@@ -12826,7 +12827,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12862,7 +12863,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8000" - Attribute "NickName" "" "HP LaserJet 8000, $Version" + Attribute "NickName" "" "HP LaserJet 8000, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8000" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8000;DES:hp laserjet 8000;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;DES:hp laserjet 8000;" PCFileName "hp-laserjet_8000.ppd" Attribute "Product" "" "(HP LaserJet 8000 Printer)" Attribute "Product" "" "(HP LaserJet 8000dn Printer)" -@@ -12846,7 +12847,7 @@ Group "RLT/HP Real Life Technologies" +@@ -12882,7 +12883,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 8150 Series" - Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" + Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 8150 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8150 series;DES:hp laserjet 8150 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;" PCFileName "hp-laserjet_8150_series-pcl3.ppd" Attribute "Product" "" "(HP LaserJet 8150 Printer)" Attribute "Product" "" "(HP LaserJet 8150n Printer)" -@@ -13050,7 +13051,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13086,7 +13087,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm1312nfi MFP" - Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;" PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" } -@@ -13138,7 +13139,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13174,7 +13175,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1515n" - Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1515n;DES:hp color laserjet cp1515n;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1515n;DES:hp color laserjet cp1515n;" PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" } -@@ -13146,7 +13147,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13182,7 +13183,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp1518ni" - Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1518ni;DES:hp color laserjet cp1518ni;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1518ni;DES:Hewlett-Packard Color LaserJet CP1518ni;" PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" } -@@ -13154,7 +13155,9 @@ Group "RLT/HP Real Life Technologies" +@@ -13190,7 +13191,9 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp2025dn" - Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025dn;DES:Hewlett-Packard Color LaserJet CP2025dn;" @@ -1046,603 +1046,603 @@ diff -up hplip-3.12.11/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.11/prnt/d PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" } -@@ -13170,7 +13173,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13206,7 +13209,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp2025n" - Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025n;DES:hp color laserjet cp2025n;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025n;DES:hp color laserjet cp2025n;" PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" } -@@ -13186,7 +13189,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13222,7 +13225,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" - Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version" + Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, hpcups $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)" -@@ -13196,7 +13199,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13232,7 +13235,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2500" - Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 2500" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500;DES:hp color laserjet 2500;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;DES:hp color laserjet 2500;" PCFileName "hp-color_laserjet_2500-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" } -@@ -13237,7 +13240,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13273,7 +13276,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp3525" - Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp3525" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3525;DES:hp color laserjet cp3525;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;DES:hp color laserjet cp3525;" PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" -@@ -13248,7 +13251,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13284,7 +13287,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm3530 MFP" - Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;DES:hp color laserjet cm3530 mfp;" PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" -@@ -13257,7 +13260,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13293,7 +13296,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3700" - Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700;DES:hp color laserjet 3700;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;DES:hp color laserjet 3700;" PCFileName "hp-color_laserjet_3700-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" } -@@ -13276,7 +13279,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13312,7 +13315,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3800" - Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 3800" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;" PCFileName "hp-color_laserjet_3800-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" -@@ -13315,7 +13318,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13351,7 +13354,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cp4520 Series" - Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4520 series;DES:hp color laserjet cp4520 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4520 Series;DES:hp color laserjet cp4520 series;" PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" } -@@ -13331,7 +13334,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13367,7 +13370,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4550" - Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4550" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;DES:Hewlett-Packard Color LaserJet 4550;" PCFileName "hp-color_laserjet_4550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" -@@ -13344,7 +13347,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13380,7 +13383,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600 Series" - Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" + Attribute "NickName" "" "HP Color LaserJet 4600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" PCFileName "hp-color_laserjet_4600_series.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" -@@ -13356,7 +13359,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13392,7 +13395,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4600" - Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600;DES:hp color laserjet 4600;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:hp color laserjet 4600;" PCFileName "hp-color_laserjet_4600-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" } -@@ -13372,7 +13375,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13408,7 +13411,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4650" - Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4650" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4650;DES:hp color laserjet 4650;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;DES:hp color laserjet 4650;" PCFileName "hp-color_laserjet_4650-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" -@@ -13384,7 +13387,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13420,7 +13423,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 4700" - Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 4700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4700;DES:hp color laserjet 4700;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;DES:hp color laserjet 4700;" PCFileName "hp-color_laserjet_4700-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" -@@ -13396,7 +13399,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13432,7 +13435,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm4730 MFP" - Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4730 mfp;DES:hp color laserjet cm4730 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;DES:hp color laserjet cm4730 mfp;" PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" -@@ -13450,7 +13453,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13486,7 +13489,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" - Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version" + Attribute "NickName" "" "HP Officejet 9100 Series pcl3, hpcups $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)" -@@ -13478,7 +13481,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13514,7 +13517,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet cm2320nf MFP" - Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM2320nf MFP;DES:hp color laserjet cm2320nf mfp;" PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" } -@@ -13534,7 +13537,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13570,7 +13573,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" - Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version" + Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2800;DES:hp business inkjet 2800;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2800;DES:Hewlett-Packard Business Inkjet 2800;" PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -13569,7 +13572,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13605,7 +13608,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 5550" - Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, $Version" + Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Color LaserJet 5550" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 5550;DES:hp color laserjet 5550;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 5550 ;DES:hp color laserjet 5550;" PCFileName "hp-color_laserjet_5550-pcl3.ppd" Attribute "Product" "" "(HP Color LaserJet 5550n Printer)" Attribute "Product" "" "(HP Color LaserJet 5550 Printer)" -@@ -13826,7 +13829,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13862,7 +13865,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1010" - Attribute "NickName" "" "HP LaserJet 1010, $Version" + Attribute "NickName" "" "HP LaserJet 1010, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1010" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1010;DES:hp laserjet 1010;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1010;DES:Hewlett-Packard LaserJet 1010;" PCFileName "hp-laserjet_1010.ppd" Attribute "Product" "" "(HP LaserJet 1010 Printer)" } -@@ -13834,7 +13837,7 @@ Group "RLT/HP Real Life Technologies" +@@ -13870,7 +13873,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1012" - Attribute "NickName" "" "HP LaserJet 1012, $Version" + Attribute "NickName" "" "HP LaserJet 1012, hpcups $Version" Attribute "ShortNickName" "" "HP LaserJet 1012" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1012;DES:hp laserjet 1012;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1012;DES:hp laserjet 1012;" PCFileName "hp-laserjet_1012.ppd" Attribute "Product" "" "(HP LaserJet 1012 Printer)" } -@@ -14042,7 +14045,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14078,7 +14081,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" - Attribute "NickName" "" "HP Officejet Lx, $Version" + Attribute "NickName" "" "HP Officejet Lx, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Lx" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet lx;DES:officejet lx;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet;DES:officejet lx;" PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -14206,7 +14209,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14242,7 +14245,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" - Attribute "NickName" "" "HP Officejet Series 300, $Version" + Attribute "NickName" "" "HP Officejet Series 300, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;" PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -14230,7 +14233,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14266,7 +14269,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" - Attribute "NickName" "" "HP Deskjet 400, $Version" + Attribute "NickName" "" "HP Deskjet 400, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 400" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;" PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -14247,7 +14250,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14283,7 +14286,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" - Attribute "NickName" "" "HP Deskjet 540, $Version" + Attribute "NickName" "" "HP Deskjet 540, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 540" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 540;DES:deskjet 540;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 540;DES:Hewlett-Packard DeskJet 540;" PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -14372,7 +14375,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14408,7 +14411,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" - Attribute "NickName" "" "HP Deskjet 630c, $Version" + Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 630c;DES:deskjet 630c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 630C;DES:Hewlett-Packard DeskJet 630C;" PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -14388,7 +14391,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14424,7 +14427,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" - Attribute "NickName" "" "HP Deskjet 656c, $Version" + Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 656c;DES:deskjet 656c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 656C;DES:DESKJET 656C;" PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -14501,7 +14504,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14537,7 +14540,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" - Attribute "NickName" "" "HP Deskjet 600, $Version" + Attribute "NickName" "" "HP Deskjet 600, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 600;DES:deskjet 600;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;" PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -14555,7 +14558,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14591,7 +14594,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" - Attribute "NickName" "" "HP Officejet Series 600, $Version" + Attribute "NickName" "" "HP Officejet Series 600, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 600;DES:officejet series 600;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 600;DES:officejet series 600;" PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -14607,7 +14610,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14643,7 +14646,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" - Attribute "NickName" "" "HP Deskjet 670c, $Version" + Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;" PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -14759,7 +14762,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14795,7 +14798,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" - Attribute "NickName" "" "HP Deskjet 610c, $Version" + Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 610c;DES:deskjet 610c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;" PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -14783,7 +14786,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14819,7 +14822,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" - Attribute "NickName" "" "HP Deskjet 640c, $Version" + Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 640c;DES:deskjet 640c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;" PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -14803,7 +14806,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14839,7 +14842,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" - Attribute "NickName" "" "HP Deskjet 690c, $Version" + Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 690c;DES:deskjet 690c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;" PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -14863,7 +14866,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14899,7 +14902,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" - Attribute "NickName" "" "HP Officejet Series 700, $Version" + Attribute "NickName" "" "HP Officejet Series 700, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 700;DES:officejet series 700;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 700;DES:officejet series 700;" PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -15006,7 +15009,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15042,7 +15045,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet T Series" - Attribute "NickName" "" "HP Officejet T Series, $Version" + Attribute "NickName" "" "HP Officejet T Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet T Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet t series;DES:officejet t series;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;" PCFileName "hp-officejet_t_series.ppd" Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" -@@ -15017,7 +15020,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15053,7 +15056,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r40" - Attribute "NickName" "" "HP Officejet r40, $Version" + Attribute "NickName" "" "HP Officejet r40, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r40" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r40;DES:officejet r40;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;" PCFileName "hp-officejet_r40.ppd" Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" } -@@ -15041,7 +15044,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15077,7 +15080,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r60" - Attribute "NickName" "" "HP Officejet r60, $Version" + Attribute "NickName" "" "HP Officejet r60, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r60" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r60;DES:officejet r60;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;" PCFileName "hp-officejet_r60.ppd" Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" } -@@ -15049,7 +15052,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15085,7 +15088,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r65" - Attribute "NickName" "" "HP Officejet r65, $Version" + Attribute "NickName" "" "HP Officejet r65, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r65" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r65;DES:officejet r65;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;" PCFileName "hp-officejet_r65.ppd" Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" } -@@ -15065,7 +15068,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15101,7 +15104,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet r80" - Attribute "NickName" "" "HP Officejet r80, $Version" + Attribute "NickName" "" "HP Officejet r80, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet r80" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r80;DES:officejet r80;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;" PCFileName "hp-officejet_r80.ppd" Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" } -@@ -15073,7 +15076,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15109,7 +15112,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP PSC 500" - Attribute "NickName" "" "HP PSC 500, $Version" + Attribute "NickName" "" "HP PSC 500, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 500" - Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 500;DES:psc 500;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;" PCFileName "hp-psc_500.ppd" Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" -@@ -15090,7 +15093,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15126,7 +15129,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" - Attribute "NickName" "" "HP Deskjet 812c, $Version" + Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 812c;DES:deskjet 812c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;" PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -15098,7 +15101,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15134,7 +15137,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" - Attribute "NickName" "" "HP Deskjet 815c, $Version" + Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 815c;DES:deskjet 815c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;" PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -15130,7 +15133,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15166,7 +15169,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" - Attribute "NickName" "" "HP Deskjet 840c, $Version" + Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 840c;DES:deskjet 840c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 840C;DES:deskjet 840c;" PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -15138,7 +15141,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15174,7 +15177,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" - Attribute "NickName" "" "HP Deskjet 841c, $Version" + Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 841c;DES:deskjet 841c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 841C;DES:deskjet 841c;" PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -15154,7 +15157,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15190,7 +15193,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" - Attribute "NickName" "" "HP Deskjet 843c, $Version" + Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 843c;DES:deskjet 843c;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 843C;DES:deskjet 843c;" PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -15163,7 +15166,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15199,7 +15202,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" - Attribute "NickName" "" "HP Deskjet 880c, $Version" + Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 880c;DES:deskjet 880c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;" PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -15179,7 +15182,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15215,7 +15218,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" - Attribute "NickName" "" "HP Deskjet 895c, $Version" + Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 895c;DES:deskjet 895c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;" PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -15296,7 +15299,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15332,7 +15335,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" - Attribute "NickName" "" "HP Deskjet 825c, $Version" + Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 825c;DES:deskjet 825c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;" PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -15305,7 +15308,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15341,7 +15344,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" - Attribute "NickName" "" "HP Deskjet 845c, $Version" + Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 845c;DES:deskjet 845c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;" PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -15416,7 +15419,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15452,7 +15455,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 850c" - Attribute "NickName" "" "HP Deskjet 850c, $Version" + Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 850c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 850c;DES:deskjet 850c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;" PCFileName "hp-deskjet_850c.ppd" Attribute "Product" "" "(HP Deskjet 850k Printer)" Attribute "Product" "" "(HP Deskjet 850c Printer)" -@@ -15435,7 +15438,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15471,7 +15474,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 870c" - Attribute "NickName" "" "HP Deskjet 870c, $Version" + Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 870c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 870c;DES:deskjet 870c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;" PCFileName "hp-deskjet_870c.ppd" Attribute "Product" "" "(HP Deskjet 870k Printer)" Attribute "Product" "" "(HP Deskjet 870c Printer)" -@@ -15446,7 +15449,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15482,7 +15485,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" - Attribute "NickName" "" "HP Officejet Pro 1150c, $Version" + Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;" 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)" -@@ -15560,7 +15563,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15596,7 +15599,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 890c" - Attribute "NickName" "" "HP Deskjet 890c, $Version" + Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 890c" - Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 890c;DES:deskjet 890c;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;" PCFileName "hp-deskjet_890c.ppd" Attribute "Product" "" "(HP Deskjet 890cse Printer)" Attribute "Product" "" "(HP Deskjet 890c Printer)" -@@ -15569,7 +15572,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15605,7 +15608,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" - Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version" + Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" - Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;" + Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;" 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)" -@@ -15711,7 +15714,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15747,7 +15750,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1018" - Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet 1018, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1018" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1018;DES:HP LaserJet 1018;" PCFileName "hp-laserjet_1018.ppd" Attribute "Product" "" "(HP LaserJet 1018 Printer)" Attribute "Product" "" "(HP LaserJet 1018s Printer)" -@@ -15720,7 +15723,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15756,7 +15759,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet 1020" - Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet 1020, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet 1020" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1020;DES:HP LaserJet 1020;" PCFileName "hp-laserjet_1020.ppd" Attribute "Product" "" "(HP LaserJet 1020 Printer)" Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" -@@ -15754,7 +15757,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15790,7 +15793,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1120 MFP" - Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet m1120 MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1120 MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;" PCFileName "hp-laserjet_m1120_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)" } -@@ -15770,7 +15773,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15806,7 +15809,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet m1319f MFP" - Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet m1319f MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet m1319f MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;" PCFileName "hp-laserjet_m1319f_mfp.ppd" Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)" } -@@ -15786,7 +15789,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15822,7 +15825,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p2035" - Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet p2035 zjs, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p2035" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2035;" PCFileName "hp-laserjet_p2035-zjs.ppd" Attribute "Product" "" "(HP LaserJet p2035 Printer)" } -@@ -15878,7 +15881,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15914,7 +15917,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1102w" - Attribute "NickName" "" "HP LaserJet Professional p1102w, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet Professional p1102w" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;" PCFileName "hp-laserjet_professional_p1102w.ppd" Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)" } -@@ -16008,7 +16011,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16044,7 +16047,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 "NickName" "" "HP LaserJet Professional m1212nf MFP, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional m1212nf mfp;DES:hp laserjet professional m1212nf mfp;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet Professional M1212nf MFP;" PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd" Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)" } -@@ -16244,7 +16247,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16280,7 +16283,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet Professional p1606dn" - Attribute "NickName" "" "HP LaserJet Professional p1606dn, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet Professional p1606dn, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LJ Professional p1606dn" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1606dn;DES:hp laserjet professional p1606dn;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet Professional P1606dn;" PCFileName "hp-laserjet_professional_p1606dn.ppd" Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)" } -@@ -16418,7 +16421,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16454,7 +16457,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 2600n" - Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP Color LaserJet 2600n, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 2600n" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2600n;DES:HP Color LaserJet 2600n;" PCFileName "hp-color_laserjet_2600n.ppd" Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" } -@@ -16594,7 +16597,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16631,7 +16634,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3500" - Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP Color LaserJet 3500, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3500" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3500;DES:hp color laserjet 3500;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3500;DES:Hewlett-Packard color LaserJet 3500;" PCFileName "hp-color_laserjet_3500.ppd" Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" -@@ -16604,7 +16607,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16641,7 +16644,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Color LaserJet 3550" - Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP Color LaserJet 3550, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP Color LaserJet 3550" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3550;DES:hp color laserjet 3550;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3550;DES:Hewlett-Packard color LaserJet 3550;" PCFileName "hp-color_laserjet_3550.ppd" Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" } -@@ -16756,7 +16759,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16793,7 +16796,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1505" - Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet p1505, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1505" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1505;DES:HP LaserJet P1505;" PCFileName "hp-laserjet_p1505.ppd" Attribute "Product" "" "(HP LaserJet p1505 Printer)" } -@@ -16898,7 +16901,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16935,7 +16938,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1006" - Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet p1006, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1006" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1006;DES:HP LaserJet P1006;" PCFileName "hp-laserjet_p1006.ppd" Attribute "Product" "" "(HP LaserJet p1006 Printer)" } -@@ -16906,7 +16909,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16943,7 +16946,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP LaserJet p1007" - Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" + Attribute "NickName" "" "HP LaserJet p1007, hpcups $Version, requires proprietary plugin" Attribute "ShortNickName" "" "HP LaserJet p1007" - Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1007;DES:HP LaserJet P1007;" diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch index c6b9008..e41e8ff 100644 --- a/hplip-deviceIDs-ppd.patch +++ b/hplip-deviceIDs-ppd.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd 2011-11-21 15:56:33.120335351 +0000 -@@ -44,6 +44,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd 2013-04-09 12:24:19.815228054 +0200 +@@ -42,6 +42,7 @@ *% Product Name and Version Information @@ -9,10 +9,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip *Manufacturer: "HP" *Product: "(hp color LaserJet 2500)" *Product: "(Hewlett-Packard hp color LaserJet 2500)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd 2011-11-21 15:56:33.123335298 +0000 -@@ -44,6 +44,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd 2013-04-09 12:24:19.816228040 +0200 +@@ -42,6 +42,7 @@ *% Product Name and Version Information @@ -20,10 +20,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-pp *Manufacturer: "HP" *Product: "(hp color LaserJet 2500)" *Product: "(Hewlett-Packard hp color LaserJet 2500)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd 2011-11-21 15:56:33.128335209 +0000 -@@ -44,6 +44,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd 2013-04-09 12:24:19.817228026 +0200 +@@ -42,6 +42,7 @@ *% Product Name and Version Information @@ -31,10 +31,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-pp *Manufacturer: "HP" *Product: "(hp color LaserJet 2550 series)" *Product: "(Hewlett-Packard hp color LaserJet 2550 series)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd 2011-11-21 15:56:33.014337244 +0000 -@@ -50,6 +50,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd 2013-04-09 12:24:19.818228012 +0200 +@@ -46,6 +46,7 @@ *% Product Name and Version Information *Manufacturer: "HP" @@ -42,10 +42,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hpl *Product: "(HP Color LaserJet 2605)" *Product: "(Hewlett-Packard HP Color LaserJet 2605)" *Product: "(HP Color LaserJet 2605dn)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd 2011-11-21 15:56:33.019337154 +0000 -@@ -46,6 +46,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd 2013-04-09 12:24:19.819227998 +0200 +@@ -43,6 +43,7 @@ *% Product Name and Version Information *Manufacturer: "HP" @@ -53,10 +53,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip *Product: "(HP Color LaserJet 2820)" *Product: "(Hewlett-Packard HP Color LaserJet 2820)" *Product: "(HP Color LaserJet 2830)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd 2011-11-21 15:56:33.134335101 +0000 -@@ -43,6 +43,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd 2013-04-09 12:24:19.820227984 +0200 +@@ -41,6 +41,7 @@ *% Product Name and Version Information @@ -64,10 +64,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hpli *Manufacturer: "HP" *Product: "(hp color LaserJet 3700)" *Product: "(Hewlett-Packard hp color LaserJet 3700)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd 2011-11-21 15:56:33.140334995 +0000 -@@ -43,6 +43,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd 2013-04-09 12:24:19.822227956 +0200 +@@ -41,6 +41,7 @@ *% Product Name and Version Information @@ -75,10 +75,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip *Manufacturer: "HP" *Product: "(hp color LaserJet 3700)" *Product: "(Hewlett-Packard hp color LaserJet 3700)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd 2011-11-21 15:56:33.027337012 +0000 -@@ -51,6 +51,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd 2013-04-09 12:24:19.823227942 +0200 +@@ -47,6 +47,7 @@ *% Product Name and Version Information *Manufacturer: "HP" @@ -86,10 +86,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip *Product: "(HP Color LaserJet 3800)" *Product: "(Hewlett-Packard HP Color LaserJet 3800)" *ModelName: "HP Color LaserJet 3800" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd 2011-11-21 15:56:33.145334905 +0000 -@@ -43,6 +43,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd 2013-04-09 12:24:19.824227928 +0200 +@@ -40,6 +40,7 @@ *% Product Name and Version Information @@ -97,10 +97,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip *Manufacturer: "HP" *Product: "(HP Color LaserJet 4550 )" *Product: "(Hewlett-Packard HP Color LaserJet 4550 )" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd 2011-11-21 15:56:33.151334799 +0000 -@@ -44,6 +44,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd 2013-04-09 12:24:19.826227900 +0200 +@@ -41,6 +41,7 @@ *% Product Name and Version Information @@ -108,10 +108,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip *Manufacturer: "HP" *Product: "(hp color LaserJet 4600)" *Product: "(Hewlett-Packard hp color LaserJet 4600)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd 2011-11-21 15:56:33.156334709 +0000 -@@ -44,6 +44,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd 2013-04-09 12:24:19.827227886 +0200 +@@ -41,6 +41,7 @@ *% Product Name and Version Information @@ -119,10 +119,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-pp *Manufacturer: "HP" *Product: "(hp color LaserJet 4600)" *Product: "(Hewlett-Packard hp color LaserJet 4600)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd 2011-11-21 15:56:33.164334567 +0000 -@@ -47,6 +47,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:24.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd 2013-04-09 12:24:19.828227872 +0200 +@@ -43,6 +43,7 @@ *% Product Name and Version Information @@ -130,10 +130,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip *Manufacturer: "HP" *Product: "(hp color LaserJet 4650)" *Product: "(Hewlett-Packard hp color LaserJet 4650)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd 2011-11-21 15:56:33.172334423 +0000 -@@ -49,6 +49,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:25.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd 2013-04-09 12:24:19.830227844 +0200 +@@ -45,6 +45,7 @@ *% Product Name and Version Information @@ -141,10 +141,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip *Manufacturer: "HP" *Product: "(HP Color LaserJet 4700)" *Product: "(Hewlett-Packard HP Color LaserJet 4700)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:37.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd 2011-11-21 15:56:33.183334227 +0000 -@@ -46,6 +46,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:25.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd 2013-04-09 12:24:19.831227830 +0200 +@@ -43,6 +43,7 @@ *% Product Name and Version Information @@ -152,65 +152,65 @@ diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip *Manufacturer: "HP" *Product: "(hp color LaserJet 5550 )" *Product: "(Hewlett-Packard hp color LaserJet 5550 )" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:38.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd 2011-11-21 15:56:33.346331319 +0000 -@@ -51,6 +51,7 @@ - *%== Mac OS X specific end == +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:25.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd 2013-04-09 12:24:19.832227816 +0200 +@@ -44,6 +44,7 @@ + *% Product Name and Version Information +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;" *Manufacturer: "HP" *Product: "(HP Color LaserJet CM3530 MFP)" *Product: "(Hewlett-Packard HP Color LaserJet CM3530 MFP)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:38.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd 2011-11-21 15:56:33.194334031 +0000 -@@ -49,6 +49,7 @@ - *%== Mac OS X specific end == +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:25.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd 2013-04-09 12:24:19.834227788 +0200 +@@ -43,6 +43,7 @@ + *% Product Name and Version Information +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;" *Manufacturer: "HP" *Product: "(HP Color LaserJet CM4730 MFP)" *Product: "(Hewlett-Packard HP Color LaserJet CM4730 MFP)" -diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_cp3525-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:38.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-color_laserjet_cp3525-ps.ppd 2011-11-21 15:56:33.202333888 +0000 -@@ -51,6 +51,7 @@ - *%== Mac OS X specific end == +diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:25.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd 2013-04-09 12:24:19.836227760 +0200 +@@ -44,6 +44,7 @@ + *% Product Name and Version Information +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;" *Manufacturer: "HP" *Product: "(HP Color LaserJet CP3525)" *Product: "(Hewlett-Packard HP Color LaserJet CP3525)" -diff -up hplip-3.11.10/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-designjet_t770_postscript-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd 2011-11-21 15:58:21.095199630 +0000 -+++ hplip-3.11.10/prnt/ps/hp-designjet_t770_postscript-ps.ppd 2011-11-21 16:01:46.968516936 +0000 +diff -up hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd 2013-04-09 12:24:19.836227760 +0200 @@ -38,6 +38,7 @@ *ShortNickName: "HP Designjet T770 PostScript" - *NickName: "HP Designjet T770ps 44in" + *NickName: "HP Designjet T770ps 44in Postscript (recommended)" *Manufacturer: "HP" +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;" *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== -diff -up hplip-3.11.10/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-designjet_t770ps_24in-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd 2011-11-21 15:58:27.126091749 +0000 -+++ hplip-3.11.10/prnt/ps/hp-designjet_t770ps_24in-ps.ppd 2011-11-21 16:02:01.227261873 +0000 +diff -up hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd 2013-04-09 12:24:19.837227746 +0200 @@ -38,6 +38,7 @@ *ShortNickName: "HP Designjet T770ps 24in" - *NickName: "HP Designjet T770ps 24in" + *NickName: "HP Designjet T770ps 24in Postscript (recommended)" *Manufacturer: "HP" +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;" *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd 2011-11-21 15:56:33.032336922 +0000 -@@ -56,6 +56,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd 2013-04-09 12:24:19.838227732 +0200 +@@ -54,6 +54,7 @@ *Product: "(HP LaserJet 1200)" *Product: "(Hewlett-Packard HP LaserJet 1200)" *Manufacturer: "HP" @@ -218,10 +218,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.11 *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd 2011-11-21 15:56:33.036336850 +0000 -@@ -56,6 +56,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd 2013-04-09 12:24:19.838227732 +0200 +@@ -54,6 +54,7 @@ *Product: "(HP LaserJet 1200)" *Product: "(Hewlett-Packard HP LaserJet 1200)" *Manufacturer: "HP" @@ -229,10 +229,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.11. *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd 2011-11-21 15:56:33.039336798 +0000 -@@ -60,6 +60,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd 2013-04-09 12:24:19.839227718 +0200 +@@ -58,6 +58,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1300n)" *Product: "(HP LaserJet 1300n)" *Manufacturer: "HP" @@ -240,10 +240,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.11 *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1300-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1300-ps.ppd 2011-11-21 15:56:33.043336726 +0000 -@@ -60,6 +60,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd 2013-04-09 12:24:19.840227704 +0200 +@@ -58,6 +58,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1300n)" *Product: "(HP LaserJet 1300n)" *Manufacturer: "HP" @@ -251,10 +251,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.11. *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1300xi-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1300xi-ps.ppd 2011-11-21 15:56:33.047336654 +0000 -@@ -60,6 +60,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd 2013-04-09 12:24:19.841227690 +0200 +@@ -58,6 +58,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1300n)" *Product: "(HP LaserJet 1300n)" *Manufacturer: "HP" @@ -262,10 +262,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.1 *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320n-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1320n-ps.ppd 2011-11-21 15:56:33.051336583 +0000 -@@ -57,6 +57,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd 2013-04-09 12:24:19.842227677 +0200 +@@ -55,6 +55,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" *Manufacturer: "HP" @@ -273,10 +273,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.11 *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd 2011-11-21 15:56:33.056336493 +0000 -@@ -57,6 +57,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd 2013-04-09 12:24:19.843227663 +0200 +@@ -55,6 +55,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" *Manufacturer: "HP" @@ -284,10 +284,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.1 *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd 2011-11-21 15:56:33.061336404 +0000 -@@ -57,6 +57,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd 2013-04-09 12:24:19.844227649 +0200 +@@ -55,6 +55,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" *Manufacturer: "HP" @@ -295,10 +295,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.11. *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd 2011-11-21 15:56:33.066336315 +0000 -@@ -57,6 +57,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd 2013-04-09 12:24:19.845227635 +0200 +@@ -55,6 +55,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" *Manufacturer: "HP" @@ -306,10 +306,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hpli *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd 2011-11-21 15:56:33.081336049 +0000 -@@ -57,6 +57,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd 2013-04-09 12:24:19.846227621 +0200 +@@ -55,6 +55,7 @@ *Product: "(Hewlett-Packard hp LaserJet 1320 series)" *Product: "(HP LaserJet 1320 series)" *Manufacturer: "HP" @@ -317,10 +317,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.1 *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd 2011-11-21 15:56:33.212333710 +0000 -@@ -56,6 +56,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd 2013-04-09 12:24:19.847227607 +0200 +@@ -54,6 +54,7 @@ *Product: "(HP LaserJet 2100 Series)" *Product: "(Hewlett-Packard HP LaserJet 2100 Series)" *Manufacturer: "HP" @@ -328,10 +328,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.11. *PSVersion: "(2014.111) 1" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd 2011-11-21 15:56:33.215333656 +0000 -@@ -56,6 +56,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd 2013-04-09 12:24:19.847227607 +0200 +@@ -54,6 +54,7 @@ *Product: "(HP LaserJet 2100 Series)" *Product: "(Hewlett-Packard HP LaserJet 2100 Series)" *Manufacturer: "HP" @@ -339,10 +339,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hpli *PSVersion: "(2014.111) 1" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd 2011-11-21 15:56:33.085335977 +0000 -@@ -61,6 +61,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd 2013-04-09 12:24:19.848227593 +0200 +@@ -59,6 +59,7 @@ *Product: "(Hewlett-Packard hp LaserJet 2300L)" *Product: "(HP LaserJet 2300L)" *Manufacturer: "HP" @@ -350,10 +350,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.11. *PSVersion: "(3010.107) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd 2011-11-21 15:56:33.094335816 +0000 -@@ -61,6 +61,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd 2013-04-09 12:24:19.849227579 +0200 +@@ -59,6 +59,7 @@ *Product: "(Hewlett-Packard hp LaserJet 2300L)" *Product: "(HP LaserJet 2300L)" *Manufacturer: "HP" @@ -361,10 +361,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hpli *PSVersion: "(3010.107) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd 2011-11-21 15:56:33.221333549 +0000 -@@ -60,6 +60,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd 2013-04-09 12:24:19.851227551 +0200 +@@ -57,6 +57,7 @@ *Product: "(Hewlett-Packard hp LaserJet 2420)" *Product: "(HP LaserJet 2420)" *Manufacturer: "HP" @@ -372,10 +372,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.11. *PSVersion: "(3010.107) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd 2011-11-21 15:56:33.109335547 +0000 -@@ -62,6 +62,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd 2013-04-09 12:24:19.852227537 +0200 +@@ -58,6 +58,7 @@ *Product: "(HP LaserJet 3390)" *Product: "(Hewlett-Packard HP LaserJet 3390)" *Manufacturer: "HP" @@ -383,10 +383,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.11. *PSVersion: "(2014.116) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd 2011-11-21 15:56:33.114335459 +0000 -@@ -51,6 +51,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd 2013-04-09 12:24:19.853227523 +0200 +@@ -49,6 +49,7 @@ *% Product Version Information @@ -394,10 +394,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hpli *Product: "(HP LaserJet 4000 Series)" *Product: "(Hewlett-Packard HP LaserJet 4000 Series)" *ModelName: "HP LaserJet 4000 Series" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd 2011-11-21 15:56:33.226333460 +0000 -@@ -52,6 +52,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd 2013-04-09 12:24:19.854227509 +0200 +@@ -49,6 +49,7 @@ *% Product Version Information @@ -405,10 +405,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hpli *Product: "(HP LaserJet 4050 Series )" *Product: "(Hewlett-Packard HP LaserJet 4050 Series )" *Product: "(HP LaserJet 4050 Series)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd 2011-11-21 15:56:33.232333352 +0000 -@@ -51,6 +51,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd 2013-04-09 12:24:19.855227495 +0200 +@@ -48,6 +48,7 @@ *% Product Version Information @@ -416,10 +416,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hpli *Product: "(HP LaserJet 4100 Series )" *Product: "(Hewlett-Packard HP LaserJet 4100 Series )" *Product: "(HP LaserJet 4100 Series)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd 2011-11-21 15:56:33.238333246 +0000 -@@ -52,6 +52,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd 2013-04-09 12:24:19.856227481 +0200 +@@ -49,6 +49,7 @@ *% Product Version Information @@ -427,21 +427,21 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.11. *Product: "(hp LaserJet 4200)" *Product: "(Hewlett-Packard hp LaserJet 4200)" *Product: "(HP LaserJet 4200)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4250-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_4250-ps.ppd 2011-11-21 15:56:33.008337350 +0000 -@@ -53,6 +53,7 @@ - *HPPDEPanel: "HPImagingOptions" +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd 2013-04-09 12:24:19.857227467 +0200 +@@ -50,6 +50,7 @@ + *% Product Version Information +*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" *Product: "(hp LaserJet 4250)" *Product: "(Hewlett-Packard hp LaserJet 4250)" *Product: "(HP LaserJet 4250)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd 2011-11-21 15:56:33.244333138 +0000 -@@ -52,6 +52,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd 2013-04-09 12:24:19.859227439 +0200 +@@ -49,6 +49,7 @@ *% Product Version Information @@ -449,21 +449,21 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.11. *Product: "(hp LaserJet 4300)" *Product: "(Hewlett-Packard hp LaserJet 4300)" *Product: "(HP LaserJet 4300)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4350-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:39.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_4350-ps.ppd 2011-11-21 15:56:33.257332906 +0000 -@@ -53,6 +53,7 @@ - *HPPDEPanel: "HPImagingOptions" +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:26.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd 2013-04-09 12:24:19.860227425 +0200 +@@ -50,6 +50,7 @@ + *% Product Version Information +*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;" *Product: "(hp LaserJet 4350)" *Product: "(Hewlett-Packard hp LaserJet 4350)" *Product: "(HP LaserJet 4350)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:40.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd 2011-11-21 15:56:33.264332782 +0000 -@@ -53,6 +53,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:27.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd 2013-04-09 12:24:19.861227411 +0200 +@@ -50,6 +50,7 @@ *% Product Version Information @@ -471,10 +471,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hpli *Product: "(HP LaserJet 5100 Series)" *Product: "(Hewlett-Packard HP LaserJet 5100 Series)" *ModelName: "HP LaserJet 5100 Series" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:40.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd 2011-11-21 15:56:33.270332674 +0000 -@@ -55,6 +55,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:27.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd 2013-04-09 12:24:19.863227383 +0200 +@@ -52,6 +52,7 @@ *%================================================= *% Product Version Information *%================================================= @@ -482,10 +482,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.11. *ModelName: "HP LaserJet 8000 Series" *ShortNickName: "HP LaserJet 8000 Series" *NickName: "HP LaserJet 8000 Series Postscript (recommended)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:40.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd 2011-11-21 15:56:33.281332478 +0000 -@@ -55,6 +55,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:27.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd 2013-04-09 12:24:19.864227369 +0200 +@@ -52,6 +52,7 @@ *%================================================= *% Product Version Information *%================================================= @@ -493,10 +493,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hpli *ModelName: "HP LaserJet 8000 Series" *ShortNickName: "HP LaserJet 8000 Series" *NickName: "HP LaserJet 8000 Series Postscript (recommended)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:40.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd 2011-11-21 15:56:33.290332317 +0000 -@@ -56,6 +56,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:27.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd 2013-04-09 12:24:19.865227355 +0200 +@@ -51,6 +51,7 @@ *%================================================= *% Product Version Information *%================================================= @@ -504,10 +504,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip- *ModelName: "HP LaserJet M3027 MFP" *ShortNickName: "HP LaserJet M3027 MFP" *NickName: "HP LaserJet M3027 MFP Postscript (recommended)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:40.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd 2011-11-21 15:56:33.298332175 +0000 -@@ -56,6 +56,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:27.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd 2013-04-09 12:24:19.866227341 +0200 +@@ -52,6 +52,7 @@ *%================================================= *% Product Version Information *%================================================= @@ -515,10 +515,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip- *ModelName: "HP LaserJet M3035 MFP" *ShortNickName: "HP LaserJet M3035 MFP" *NickName: "HP LaserJet M3035 MFP Postscript (recommended)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:40.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2011-11-21 15:56:33.101335690 +0000 -@@ -64,6 +64,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:28.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2013-04-09 12:24:19.867227327 +0200 +@@ -58,6 +58,7 @@ *Product: "(HP LaserJet P2015 Series)" *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" *Manufacturer: "HP" @@ -526,10 +526,10 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hpl *PSVersion: "(3010.107) 0" *%================================================= -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:40.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd 2011-11-21 15:56:33.309331978 +0000 -@@ -57,6 +57,7 @@ +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:28.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd 2013-04-09 12:24:19.868227313 +0200 +@@ -50,6 +50,7 @@ *%================================================= *% Product Version Information *%================================================= @@ -537,11 +537,11 @@ diff -up hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.11 *ModelName: "HP LaserJet P3005" *ShortNickName: "HP LaserJet P3005" *NickName: "HP LaserJet P3005 Postscript (recommended)" -diff -up hplip-3.11.10/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_p3010_series-ps.ppd ---- hplip-3.11.10/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd 2011-10-02 04:11:40.000000000 +0100 -+++ hplip-3.11.10/prnt/ps/hp-laserjet_p3010_series-ps.ppd 2011-11-21 15:56:33.329331621 +0000 -@@ -51,6 +51,7 @@ - *%== Mac OS X specific end == +diff -up hplip-3.13.4/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_p3010_series-ps.ppd +--- hplip-3.13.4/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd 2013-04-08 11:59:28.000000000 +0200 ++++ hplip-3.13.4/prnt/ps/hp-laserjet_p3010_series-ps.ppd 2013-04-09 12:24:19.870227285 +0200 +@@ -45,6 +45,7 @@ + *% Product Version Information +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;" diff --git a/hplip-logdir.patch b/hplip-logdir.patch index ec1c92d..df4d45b 100644 --- a/hplip-logdir.patch +++ b/hplip-logdir.patch @@ -1,6 +1,6 @@ -diff -up hplip-3.13.2/fax/backend/hpfax.py.logdir hplip-3.13.2/fax/backend/hpfax.py ---- hplip-3.13.2/fax/backend/hpfax.py.logdir 2013-02-13 17:38:40.000000000 +0100 -+++ hplip-3.13.2/fax/backend/hpfax.py 2013-02-14 11:41:25.147140459 +0100 +diff -up hplip-3.13.4/fax/backend/hpfax.py.logdir hplip-3.13.4/fax/backend/hpfax.py +--- hplip-3.13.4/fax/backend/hpfax.py.logdir 2013-04-08 11:58:34.000000000 +0200 ++++ hplip-3.13.4/fax/backend/hpfax.py 2013-04-09 12:12:18.485307795 +0200 @@ -244,7 +244,7 @@ else: input_fd = 0 @@ -10,9 +10,9 @@ diff -up hplip-3.13.2/fax/backend/hpfax.py.logdir hplip-3.13.2/fax/backend/hpfax pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id) -diff -up hplip-3.13.2/logcapture.py.logdir hplip-3.13.2/logcapture.py ---- hplip-3.13.2/logcapture.py.logdir 2013-02-13 17:38:51.000000000 +0100 -+++ hplip-3.13.2/logcapture.py 2013-02-14 11:43:52.314127962 +0100 +diff -up hplip-3.13.4/logcapture.py.logdir hplip-3.13.4/logcapture.py +--- hplip-3.13.4/logcapture.py.logdir 2013-04-08 11:58:45.000000000 +0200 ++++ hplip-3.13.4/logcapture.py 2013-04-09 12:12:18.485307795 +0200 @@ -39,7 +39,7 @@ CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_o LOG_FOLDER_PATH='./' LOG_FOLDER_NAME='hplip_troubleshoot_logs' @@ -31,9 +31,9 @@ diff -up hplip-3.13.2/logcapture.py.logdir hplip-3.13.2/logcapture.py if File_list: sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES)) if sts != 0: -diff -up hplip-3.13.2/prnt/filters/hplipjs.c.logdir hplip-3.13.2/prnt/filters/hplipjs.c ---- hplip-3.13.2/prnt/filters/hplipjs.c.logdir 2013-02-13 17:34:05.000000000 +0100 -+++ hplip-3.13.2/prnt/filters/hplipjs.c 2013-02-14 11:41:25.148140445 +0100 +diff -up hplip-3.13.4/prnt/filters/hplipjs.c.logdir hplip-3.13.4/prnt/filters/hplipjs.c +--- hplip-3.13.4/prnt/filters/hplipjs.c.logdir 2013-04-08 11:53:27.000000000 +0200 ++++ hplip-3.13.4/prnt/filters/hplipjs.c 2013-04-09 12:12:18.486307781 +0200 @@ -275,7 +275,8 @@ int main (int argc, char **argv) { fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]); @@ -44,9 +44,9 @@ diff -up hplip-3.13.2/prnt/filters/hplipjs.c.logdir hplip-3.13.2/prnt/filters/hp HPFp = fopen (szPSFile, "w"); #endif -diff -up hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2013-02-14 11:41:25.139140568 +0100 -+++ hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp 2013-02-14 11:48:14.507501338 +0100 +diff -up hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp.logdir 2013-04-09 12:12:18.478307892 +0200 ++++ hplip-3.13.4/prnt/hpcups/HPCupsFilter.cpp 2013-04-09 12:15:34.838563875 +0200 @@ -31,7 +31,9 @@ \*****************************************************************************/ @@ -73,7 +73,7 @@ diff -up hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.2/prnt/hpcu openlog("hpcups", LOG_PID, LOG_DAEMON); if (argc < 6 || argc > 7) { -@@ -585,9 +593,10 @@ int HPCupsFilter::processRasterData(cups +@@ -587,9 +595,10 @@ int HPCupsFilter::processRasterData(cups DRIVER_ERROR err; int ret_status = 0; @@ -83,11 +83,11 @@ diff -up hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.2/prnt/hpcu - strcpy(hpPreProcessedRasterFile, "/var/log/hp/tmp/hplipSwapedPagesXXXXXX"); + snprintf(hpPreProcessedRasterFile, sizeof (hpPreProcessedRasterFile), + "%s/hplipSwapedPagesXXXXXX", env_tmpdir); - + while (cupsRasterReadHeader2(cups_raster, &cups_header)) -@@ -649,14 +658,14 @@ int HPCupsFilter::processRasterData(cups - +@@ -651,14 +660,15 @@ int HPCupsFilter::processRasterData(cups + if (m_iLogLevel & SAVE_INPUT_RASTERS) { - char szFileName[64]; @@ -100,10 +100,11 @@ diff -up hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.2/prnt/hpcu - snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_bmp_%d_XXXXXX", current_page_number); + snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterc_bmp_%d_XXXXXX", env_tmpdir, current_page_number); ++ createTempFile(szFileName, &cfp); if (cfp) { -@@ -667,7 +676,7 @@ int HPCupsFilter::processRasterData(cups +@@ -669,7 +679,7 @@ int HPCupsFilter::processRasterData(cups if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW || cups_header.cupsColorSpace == CUPS_CSPACE_K) { @@ -112,9 +113,9 @@ diff -up hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.2/prnt/hpcu createTempFile(szFileName, &kfp); if (kfp) { -diff -up hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.2/prnt/hpcups/LJZjStream.cpp ---- hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir 2013-02-13 17:32:39.000000000 +0100 -+++ hplip-3.13.2/prnt/hpcups/LJZjStream.cpp 2013-02-14 11:41:25.149140432 +0100 +diff -up hplip-3.13.4/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.4/prnt/hpcups/LJZjStream.cpp +--- hplip-3.13.4/prnt/hpcups/LJZjStream.cpp.logdir 2013-04-08 11:52:06.000000000 +0200 ++++ hplip-3.13.4/prnt/hpcups/LJZjStream.cpp 2013-04-09 12:12:18.487307767 +0200 @@ -42,9 +42,12 @@ #include "LJZjStream.h" #include "Utils.h" @@ -143,9 +144,9 @@ diff -up hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.2/prnt/hpcups if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){ return NO_ERROR; -diff -up hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.2/prnt/hpcups/SystemServices.cpp ---- hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir 2013-02-13 17:32:39.000000000 +0100 -+++ hplip-3.13.2/prnt/hpcups/SystemServices.cpp 2013-02-14 11:50:22.597720115 +0100 +diff -up hplip-3.13.4/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.4/prnt/hpcups/SystemServices.cpp +--- hplip-3.13.4/prnt/hpcups/SystemServices.cpp.logdir 2013-04-08 11:52:06.000000000 +0200 ++++ hplip-3.13.4/prnt/hpcups/SystemServices.cpp 2013-04-09 12:12:18.488307753 +0200 @@ -31,14 +31,17 @@ #include "CommonDefinitions.h" #include "SystemServices.h" @@ -166,9 +167,9 @@ diff -up hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.2/prnt/hp createTempFile(fname, &m_fp); if (m_fp) -diff -up hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp ---- hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir 2013-02-13 17:34:10.000000000 +0100 -+++ hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp 2013-02-14 11:52:05.090292573 +0100 +diff -up hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp +--- hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp.logdir 2013-04-08 11:53:31.000000000 +0200 ++++ hplip-3.13.4/prnt/hpijs/hpcupsfax.cpp 2013-04-09 12:12:18.488307753 +0200 @@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. \*****************************************************************************/ @@ -218,9 +219,9 @@ diff -up hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.2/prnt/hpijs/hp // fdFax = mkstemp (hpFileName); fdFax = createTempFile(hpFileName, &pFilePtrFax); -diff -up hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.2/prnt/hpijs/hpijs.cpp ---- hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir 2013-02-14 11:41:25.136140608 +0100 -+++ hplip-3.13.2/prnt/hpijs/hpijs.cpp 2013-02-14 11:53:57.972718824 +0100 +diff -up hplip-3.13.4/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.4/prnt/hpijs/hpijs.cpp +--- hplip-3.13.4/prnt/hpijs/hpijs.cpp.logdir 2013-04-09 12:12:18.475307934 +0200 ++++ hplip-3.13.4/prnt/hpijs/hpijs.cpp 2013-04-09 12:12:18.489307739 +0200 @@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. \*****************************************************************************/ @@ -272,9 +273,9 @@ diff -up hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.2/prnt/hpijs/hpijs. if ((pSS->InitScript(szCapOutFile, TRUE)) != NO_ERROR) BUG("unable to init capture"); #endif -diff -up hplip-3.13.2/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.13.2/prnt/hpijs/hpijsfax.cpp ---- hplip-3.13.2/prnt/hpijs/hpijsfax.cpp.logdir 2013-02-13 17:34:10.000000000 +0100 -+++ hplip-3.13.2/prnt/hpijs/hpijsfax.cpp 2013-02-14 12:38:58.222064812 +0100 +diff -up hplip-3.13.4/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.13.4/prnt/hpijs/hpijsfax.cpp +--- hplip-3.13.4/prnt/hpijs/hpijsfax.cpp.logdir 2013-04-08 11:53:31.000000000 +0200 ++++ hplip-3.13.4/prnt/hpijs/hpijsfax.cpp 2013-04-09 12:12:18.489307739 +0200 @@ -31,6 +31,7 @@ #ifdef HAVE_LIBHPIP diff --git a/hplip-snmp-quirks.patch b/hplip-snmp-quirks.patch index 8673d04..517ed2f 100644 --- a/hplip-snmp-quirks.patch +++ b/hplip-snmp-quirks.patch @@ -1,8 +1,8 @@ -diff -up hplip-3.12.11/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.12.11/prnt/drv/hpcups.drv.in ---- hplip-3.12.11/prnt/drv/hpcups.drv.in.snmp-quirks 2012-11-27 10:08:06.958516241 +0100 -+++ hplip-3.12.11/prnt/drv/hpcups.drv.in 2012-11-27 10:08:07.120513919 +0100 -@@ -6713,6 +6713,8 @@ Manufacturer "HP" - Attribute "NickName" "" "HP Officejet Pro 8500 a909a, $Version" +diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.13.4/prnt/drv/hpcups.drv.in +--- hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks 2013-04-09 12:11:58.447587815 +0200 ++++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-09 12:11:58.594585761 +0200 +@@ -6757,6 +6757,8 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a" Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;" + // This device lies about its supplies capacity. @@ -10,8 +10,8 @@ diff -up hplip-3.12.11/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.12.11/prnt/drv PCFileName "hp-officejet_pro_8500_a909a.ppd" Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)" } -@@ -6729,6 +6731,8 @@ Manufacturer "HP" - Attribute "NickName" "" "HP Officejet Pro 8500 a909g, $Version" +@@ -6773,6 +6775,8 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g" Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;" + // This device lies about its supplies capacity. diff --git a/hplip.spec b/hplip.spec index 0781215..6a05370 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,6 +1,6 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.13.3 +Version: 3.13.4 Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons @@ -520,6 +520,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Tue Apr 09 2013 Jiri Popelka - 3.13.4-1 +- 3.13.4 + * Fri Mar 08 2013 Jiri Popelka - 3.13.3-1 - 3.13.3 diff --git a/sources b/sources index 37e0f3f..5199db1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a378cc08f7a4f131968c0966c1ceb8c hplip-3.13.3.tar.gz +e5c247161e2fd7685e0520e968393d19 hplip-3.13.4.tar.gz