From d37d135d242d17a7680a339b166e3e26853856b8 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Mon, 30 Mar 2015 05:53:22 -0400 Subject: [PATCH] Rediff patches for the new version --- 85_rebuild_python_ui.dpatch | 35 +- hplip-deviceIDs-drv.patch | 1523 ++++++------------------------- hplip-deviceIDs-ppd.patch | 605 +----------- hplip-logdir.patch | 20 +- hplip-pstotiff-is-rubbish.patch | 15 +- 5 files changed, 342 insertions(+), 1856 deletions(-) diff --git a/85_rebuild_python_ui.dpatch b/85_rebuild_python_ui.dpatch index 16e7040..7f1c29c 100644 --- a/85_rebuild_python_ui.dpatch +++ b/85_rebuild_python_ui.dpatch @@ -1,12 +1,18 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 85_rebuild_python_ui.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ ---- a/Makefile.am -+++ b/Makefile.am +diff -Naur hplip-3.15.2.orig/configure.in hplip-3.15.2/configure.in +--- hplip-3.15.2.orig/configure.in 2015-03-30 05:47:07.804427140 -0400 ++++ hplip-3.15.2/configure.in 2015-03-30 05:48:11.035209618 -0400 +@@ -531,6 +531,8 @@ + [FOUND_HEADER=yes; break;]) + AS_IF([test "x$FOUND_HEADER" != "xyes"], + [AC_MSG_ERROR([cannot find python-devel support], 6)]) ++ AC_ARG_VAR([PYUIC4], [PyQT pyuic4 .ui to .py compiler command]) ++ AC_CHECK_TOOLS([PYUIC4], [pyuic4]) + fi + + if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then +diff -Naur hplip-3.15.2.orig/Makefile.am hplip-3.15.2/Makefile.am +--- hplip-3.15.2.orig/Makefile.am 2015-03-30 05:47:07.893426831 -0400 ++++ hplip-3.15.2/Makefile.am 2015-03-30 05:47:08.758423824 -0400 @@ -3,6 +3,11 @@ # # (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP @@ -19,14 +25,3 @@ INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/ CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\" CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\" ---- a/configure.in -+++ b/configure.in -@@ -536,6 +536,8 @@ - AC_MSG_RESULT("using $PYTHONINCLUDEDIR") - AC_ARG_VAR(PYTHONINCLUDEDIR, [path to Python.h C header file]) - AC_CHECK_HEADERS(python$PYTHON_VERSION/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)]) -+ AC_ARG_VAR([PYUIC4], [PyQT pyuic4 .ui to .py compiler command]) -+ AC_CHECK_TOOLS([PYUIC4], [pyuic4]) - fi - - if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch index 42a1349..dc975b5 100644 --- a/hplip-deviceIDs-drv.patch +++ b/hplip-deviceIDs-drv.patch @@ -1,133 +1,7 @@ -diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv/hpcups.drv.in ---- hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv 2013-07-23 07:18:43.000000000 +0200 -+++ hplip-3.13.7/prnt/drv/hpcups.drv.in 2013-07-23 12:39:39.023387776 +0200 -@@ -473,7 +473,7 @@ Manufacturer "HP" - ModelName "HP Officejet v40xi" - 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)" - } -@@ -481,7 +481,7 @@ Manufacturer "HP" - ModelName "HP Officejet v40" - 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)" -@@ -498,7 +498,7 @@ Manufacturer "HP" - ModelName "HP Officejet g55" - 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)" - } -@@ -546,7 +546,7 @@ Manufacturer "HP" - ModelName "HP Officejet g85" - 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)" - } -@@ -562,7 +562,7 @@ Manufacturer "HP" - ModelName "HP Officejet g95" - 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)" - } -@@ -578,7 +578,7 @@ Manufacturer "HP" - ModelName "HP PSC 750xi" - 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)" - } -@@ -586,7 +586,7 @@ Manufacturer "HP" - ModelName "HP PSC 750" - 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)" - } -@@ -618,7 +618,7 @@ Manufacturer "HP" - ModelName "HP PSC 900 Series" - 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)" - } -@@ -634,7 +634,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 920c" - 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)" -@@ -653,7 +653,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 930c" - 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)" -@@ -694,7 +694,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 940c" - 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)" -@@ -713,7 +713,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 950c" - 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)" - } -@@ -770,7 +770,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 959c" - 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)" - } -@@ -778,7 +778,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 970c" - 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)" -@@ -798,7 +798,7 @@ Manufacturer "HP" +diff -up hplip-3.15.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.15.2/prnt/drv/hpcups.drv.in +--- hplip-3.15.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2015-01-29 13:21:00.000000000 +0100 ++++ hplip-3.15.2/prnt/drv/hpcups.drv.in 2015-02-04 14:20:39.756550038 +0100 +@@ -465,7 +465,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1000" Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1000" @@ -136,7 +10,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-photosmart_p1000.ppd" Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" Attribute "Product" "" "(HP Photosmart p1000xi Printer)" -@@ -807,7 +807,7 @@ Manufacturer "HP" +@@ -474,7 +474,7 @@ Manufacturer "HP" ModelName "HP Photosmart p1100" Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version" Attribute "ShortNickName" "" "HP Photosmart p1100" @@ -145,7 +19,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-photosmart_p1100.ppd" Attribute "Product" "" "(HP Photosmart p1100 Printer)" Attribute "Product" "" "(HP Photosmart p1100xi Printer)" -@@ -841,7 +841,7 @@ Manufacturer "HP" +@@ -516,7 +516,7 @@ Manufacturer "HP" ModelName "HP Deskjet 3820" Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 3820" @@ -154,7 +28,25 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_3820.ppd" Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" -@@ -879,7 +879,7 @@ Manufacturer "HP" +@@ -542,7 +542,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40xi" + 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)" + } +@@ -550,7 +550,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40" + 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)" +@@ -579,7 +579,7 @@ Manufacturer "HP" ModelName "HP Officejet 5105" Attribute "NickName" "" "HP Officejet 5105, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 5105" @@ -163,7 +55,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_5105.ppd" Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" } -@@ -887,7 +887,7 @@ Manufacturer "HP" +@@ -587,7 +587,7 @@ Manufacturer "HP" ModelName "HP Officejet 5110v" Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 5110v" @@ -172,6 +64,114 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_5110v.ppd" Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" } +@@ -604,7 +604,7 @@ Manufacturer "HP" + ModelName "HP Officejet g55" + 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)" + } +@@ -644,7 +644,7 @@ Manufacturer "HP" + ModelName "HP PSC 750xi" + 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)" + } +@@ -652,7 +652,7 @@ Manufacturer "HP" + ModelName "HP PSC 750" + 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)" + } +@@ -700,7 +700,7 @@ Manufacturer "HP" + ModelName "HP Officejet g85" + 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)" + } +@@ -716,7 +716,7 @@ Manufacturer "HP" + ModelName "HP PSC 900 Series" + 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)" + } +@@ -732,7 +732,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 920c" + 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)" +@@ -751,7 +751,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 930c" + 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)" +@@ -792,7 +792,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 940c" + 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)" +@@ -811,7 +811,7 @@ Manufacturer "HP" + ModelName "HP Officejet g95" + 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)" + } +@@ -843,7 +843,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 950c" + 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)" + } +@@ -876,7 +876,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 959c" + 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)" + } +@@ -884,7 +884,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 970c" + 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)" @@ -938,7 +938,7 @@ Manufacturer "HP" ModelName "HP Deskjet 1220c" Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version" @@ -190,16 +190,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-2000c.ppd" Attribute "Product" "" "(HP 2000cse Printer)" Attribute "Product" "" "(HP 2000c Printer)" -@@ -1576,7 +1576,7 @@ Manufacturer "HP" - ModelName "HP Officejet D Series" - 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)" -@@ -1599,7 +1599,7 @@ Manufacturer "HP" +@@ -1609,7 +1609,7 @@ Manufacturer "HP" ModelName "HP Deskjet 960c" Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 960c" @@ -208,7 +199,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_960c.ppd" Attribute "Product" "" "(HP Deskjet 960cse Printer)" Attribute "Product" "" "(HP Deskjet 960cxi Printer)" -@@ -1609,7 +1609,7 @@ Manufacturer "HP" +@@ -1619,7 +1619,7 @@ Manufacturer "HP" ModelName "HP Deskjet 980c" Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 980c" @@ -217,7 +208,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_980c.ppd" Attribute "Product" "" "(HP Deskjet 980cxi Printer)" Attribute "Product" "" "(HP Deskjet 980c Printer)" -@@ -1618,7 +1618,7 @@ Manufacturer "HP" +@@ -1628,7 +1628,7 @@ Manufacturer "HP" ModelName "HP Deskjet 990c" Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 990c" @@ -226,7 +217,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_990c.ppd" Attribute "Product" "" "(HP Deskjet 990cxi Printer)" Attribute "Product" "" "(HP Deskjet 990cse Printer)" -@@ -1681,7 +1681,7 @@ Manufacturer "HP" +@@ -1658,7 +1658,7 @@ Manufacturer "HP" ModelName "HP Color Inkjet cp1700" Attribute "NickName" "" "HP Color Inkjet cp1700, hpcups $Version" Attribute "ShortNickName" "" "HP Color Inkjet cp1700" @@ -235,34 +226,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-color_inkjet_cp1700.ppd" Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" } -@@ -1689,7 +1689,7 @@ Manufacturer "HP" - ModelName "HP PSC 2100 Series" - 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)" -@@ -1702,7 +1702,7 @@ Manufacturer "HP" - ModelName "HP PSC 2150 Series" - 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)" - } -@@ -1710,7 +1710,7 @@ Manufacturer "HP" - ModelName "HP PSC 2170 Series" - 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)" -@@ -1747,7 +1747,7 @@ Manufacturer "HP" +@@ -1666,7 +1666,7 @@ Manufacturer "HP" ModelName "HP Officejet 7100 Series" Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7100 Series" @@ -271,6 +235,42 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_7100_series.ppd" Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" +@@ -1681,7 +1681,7 @@ Manufacturer "HP" + ModelName "HP Officejet D Series" + 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)" +@@ -1728,7 +1728,7 @@ Manufacturer "HP" + ModelName "HP PSC 2100 Series" + 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)" +@@ -1741,7 +1741,7 @@ Manufacturer "HP" + ModelName "HP PSC 2150 Series" + 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)" + } +@@ -1749,7 +1749,7 @@ Manufacturer "HP" + ModelName "HP PSC 2170 Series" + 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)" @@ -1977,7 +1977,7 @@ Manufacturer "HP" ModelName "HP Business Inkjet 2200" Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version" @@ -307,7 +307,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-business_inkjet_2280-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" -@@ -2539,7 +2539,7 @@ Manufacturer "HP" +@@ -2522,7 +2522,7 @@ Manufacturer "HP" ModelName "HP PSC 2200 Series" Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2200 Series" @@ -316,7 +316,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-psc_2200_series.ppd" Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" } -@@ -2557,7 +2557,7 @@ Manufacturer "HP" +@@ -2540,7 +2540,7 @@ Manufacturer "HP" ModelName "HP PSC 2300 Series" Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2300 Series" @@ -325,7 +325,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-psc_2300_series.ppd" Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" -@@ -2566,7 +2566,7 @@ Manufacturer "HP" +@@ -2549,7 +2549,7 @@ Manufacturer "HP" ModelName "HP PSC 2350 Series" Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2350 Series" @@ -334,16 +334,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-psc_2350_series.ppd" Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" -@@ -2583,7 +2583,7 @@ Manufacturer "HP" - ModelName "HP PSC 2400 Series" - 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)" -@@ -2609,7 +2609,7 @@ Manufacturer "HP" +@@ -2592,7 +2592,7 @@ Manufacturer "HP" ModelName "HP PSC 2500 Series" Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 2500 Series" @@ -352,7 +343,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-psc_2500_series.ppd" Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" -@@ -3070,7 +3070,7 @@ Manufacturer "HP" +@@ -3040,7 +3040,7 @@ Manufacturer "HP" ModelName "HP Officejet j5700 Series" Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j5700 Series" @@ -361,7 +352,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_j5700_series.ppd" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" -@@ -3143,7 +3143,7 @@ Manufacturer "HP" +@@ -3126,7 +3126,7 @@ Manufacturer "HP" ModelName "HP Officejet 6100 Series" Attribute "NickName" "" "HP Officejet 6100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 6100 Series" @@ -370,16 +361,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_6100_series.ppd" Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" -@@ -3198,7 +3198,7 @@ Manufacturer "HP" - ModelName "HP Officejet 6300 Series" - 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)" -@@ -3367,7 +3367,7 @@ Manufacturer "HP" +@@ -3350,7 +3350,7 @@ Manufacturer "HP" ModelName "HP Officejet 7200 Series" Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 7200 Series" @@ -397,7 +379,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_7400_series.ppd" Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" -@@ -10604,7 +10604,7 @@ Manufacturer "HP" +@@ -11486,7 +11486,7 @@ Manufacturer "HP" ModelName "HP PSC 1100 Series" Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 1100 Series" @@ -406,7 +388,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-psc_1100_series.ppd" Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" -@@ -10614,7 +10614,7 @@ Manufacturer "HP" +@@ -11496,7 +11496,7 @@ Manufacturer "HP" ModelName "HP PSC 1200 Series" Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP PSC 1200 Series" @@ -415,16 +397,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-psc_1200_series.ppd" Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" -@@ -10797,7 +10797,7 @@ Manufacturer "HP" - ModelName "HP Deskjet 3940" - 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)" -@@ -10806,7 +10806,7 @@ Manufacturer "HP" +@@ -11688,7 +11688,7 @@ Manufacturer "HP" ModelName "HP Officejet 4100 Series" Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4100 Series" @@ -433,7 +406,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_4100_series.ppd" Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" -@@ -10833,7 +10833,7 @@ Manufacturer "HP" +@@ -11715,7 +11715,7 @@ Manufacturer "HP" ModelName "HP Officejet 4300 Series" Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4300 Series" @@ -442,7 +415,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_4300_series.ppd" Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" -@@ -11149,7 +11149,7 @@ Manufacturer "HP" +@@ -12026,7 +12026,7 @@ Manufacturer "HP" ModelName "HP Officejet j3600 Series" Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet j3600 Series" @@ -451,7 +424,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_j3600_series.ppd" Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" -@@ -11220,7 +11220,7 @@ Manufacturer "HP" +@@ -12086,7 +12086,7 @@ Manufacturer "HP" ModelName "HP Officejet 4200 Series" Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 4200 Series" @@ -460,7 +433,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_4200_series.ppd" Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" -@@ -11727,6 +11727,7 @@ Manufacturer "HP" +@@ -12609,6 +12609,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;" @@ -468,603 +441,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-photosmart_380_series.ppd" Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" -@@ -12153,7 +12154,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4 Plus" - 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)" -@@ -12179,7 +12180,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5l" - 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)" -@@ -12189,7 +12190,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5mp" - 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)" - } -@@ -12197,7 +12198,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5p" - 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)" - } -@@ -12205,7 +12206,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 6l" - 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)" -@@ -12217,7 +12218,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 6p" - 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)" - } -@@ -12225,7 +12226,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 6mp" - 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)" -@@ -12235,7 +12236,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1015" - 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)" - } -@@ -12285,7 +12286,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1100" - 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)" -@@ -12295,7 +12296,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1150" - 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)" - } -@@ -12312,7 +12313,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1160 Series" - 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)" - } -@@ -12320,7 +12321,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1200" - 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)" -@@ -12345,7 +12346,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1220" - 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)" - } -@@ -12353,7 +12354,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1300" - 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)" -@@ -12378,7 +12379,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1320 Series" - 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)" - } -@@ -12402,7 +12403,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1320" - 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)" -@@ -12427,7 +12428,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m1522nf MFP" - 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)" - } -@@ -12499,7 +12500,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p2015 Series" - 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)" - } -@@ -12523,7 +12524,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p2035" - 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)" - } -@@ -12563,7 +12564,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2100" - 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)" -@@ -12575,7 +12576,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2100 Series" - 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)" - } -@@ -12583,7 +12584,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2200 Series" - Attribute "NickName" "" "HP LaserJet 2200 Series, hpcups $Version" - Attribute "ShortNickName" "" "HP LaserJet 2200 Series" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200 series;DES:hp laserjet 2200 series;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" - PCFileName "hp-laserjet_2200_series.ppd" - Attribute "Product" "" "(HP LaserJet 2200 Series Printer)" - } -@@ -12591,7 +12592,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2200" - 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)" -@@ -12604,7 +12605,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2300" - 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)" -@@ -12617,7 +12618,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2300 Series" - 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)" - } -@@ -12633,7 +12634,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2420" - 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)" -@@ -12644,7 +12645,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 2430" - 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)" -@@ -12672,7 +12673,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p3005" - 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)" -@@ -12685,7 +12686,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p3010 Series" - 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)" -@@ -12694,7 +12695,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3015" - 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)" - } -@@ -12702,7 +12703,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3020" - 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)" - } -@@ -12710,7 +12711,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m3027 MFP" - 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)" -@@ -12719,7 +12720,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3030" - 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)" - } -@@ -12727,7 +12728,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3050" - 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)" -@@ -12736,7 +12737,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3052" - 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)" - } -@@ -12744,7 +12745,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3055" - 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)" - } -@@ -12772,7 +12773,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3200m" - 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)" - } -@@ -12788,7 +12789,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3200" - 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)" - } -@@ -12808,7 +12809,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3330" - 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)" - } -@@ -12816,7 +12817,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3380" - 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)" - } -@@ -12824,7 +12825,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 3390" - 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)" - } -@@ -12840,7 +12841,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4000 Series" - 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)" -@@ -12860,7 +12861,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p4014" - 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)" - } -@@ -12916,7 +12917,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4050 Series" - 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)" -@@ -12937,7 +12938,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4100 Series" - 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)" -@@ -12956,7 +12957,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4200" - 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)" -@@ -12981,7 +12982,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4250" - 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)" -@@ -12993,7 +12994,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4300" - 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)" -@@ -13006,7 +13007,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4345 MFP" - 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)" -@@ -13017,7 +13018,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m4345 MFP" - 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)" -@@ -13036,7 +13037,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 4350" - 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)" -@@ -13072,7 +13073,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p4515" - 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)" - } -@@ -13088,7 +13089,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5000 Series" - 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)" - } -@@ -13104,7 +13105,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 8000 Series" - 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)" - } -@@ -13198,7 +13199,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5si" - 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)" -@@ -13234,7 +13235,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m3035 MFP" - 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)" -@@ -13255,7 +13256,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m5025 MFP" - 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)" - } -@@ -13263,7 +13264,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m5035 MFP" - 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)" -@@ -13281,7 +13282,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 5100 Series" - 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)" -@@ -13312,7 +13313,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 8000" - 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)" -@@ -13332,7 +13333,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 8150 Series" - 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)" -@@ -13536,7 +13537,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm1312nfi MFP" - 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)" - } -@@ -13624,7 +13625,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp1515n" - 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)" - } -@@ -13632,7 +13633,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp1518ni" - 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)" - } -@@ -13640,7 +13641,9 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp2025dn" - 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;" -+ // DNS-SD response has no usb_* keys, just ty/product -+ Attribute "1284DeviceID" "" "MFG:HP;MDL:Color LaserJet CP2025dn;" - PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" - } -@@ -13656,7 +13659,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp2025n" - 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)" - } -@@ -13672,7 +13675,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14554,7 +14557,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2300" Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2300" @@ -1073,133 +450,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-business_inkjet_2300-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" -@@ -13682,7 +13685,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 2500" - 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)" - } -@@ -13723,7 +13726,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp3525" - 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)" -@@ -13734,7 +13737,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm3530 MFP" - 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)" -@@ -13743,7 +13746,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3700" - 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)" - } -@@ -13762,7 +13765,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3800" - 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)" -@@ -13773,7 +13776,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp4005" - Attribute "NickName" "" "HP Color LaserJet cp4005 pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cp4005" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;" - PCFileName "hp-color_laserjet_cp4005-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cp4005n Printer)" - Attribute "Product" "" "(HP Color LaserJet cp4005dn Printer)" -@@ -13801,7 +13804,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cp4520 Series" - 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)" - } -@@ -13809,7 +13812,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm4540 MFP" - Attribute "NickName" "" "HP Color LaserJet cm4540 MFP pcl3, hpcups $Version" - Attribute "ShortNickName" "" "HP Color LaserJet cm4540 MFP" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4540 mfp;DES:hp color laserjet cm4540 mfp;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;DES:HP Color LaserJet CM4540 MFP;" - PCFileName "hp-color_laserjet_cm4540_mfp-pcl3.ppd" - Attribute "Product" "" "(HP Color LaserJet cm4540 Multifunction Printer)" - } -@@ -13817,7 +13820,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4550" - 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)" -@@ -13830,7 +13833,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4600 Series" - 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)" -@@ -13842,7 +13845,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4600" - 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)" - } -@@ -13858,7 +13861,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4650" - 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)" -@@ -13870,7 +13873,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 4700" - 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)" -@@ -13882,7 +13885,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm4730 MFP" - 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)" -@@ -13936,7 +13939,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14818,7 +14821,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet 9100 Series" Attribute "NickName" "" "HP Officejet 9100 Series pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet 9100 Series" @@ -1208,16 +459,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_9100_series-pcl3.ppd" Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" -@@ -13964,7 +13967,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet cm2320nf MFP" - 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)" - } -@@ -14020,7 +14023,7 @@ Group "RLT/HP Real Life Technologies" +@@ -14902,7 +14905,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Business Inkjet 2800" Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, hpcups $Version" Attribute "ShortNickName" "" "HP Business Inkjet 2800" @@ -1226,34 +468,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-business_inkjet_2800-pcl3.ppd" Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" -@@ -14055,7 +14058,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 5550" - 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)" -@@ -14312,7 +14315,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1010" - 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)" - } -@@ -14320,7 +14323,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1012" - 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)" - } -@@ -14528,7 +14531,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15445,7 +15448,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Lx" Attribute "NickName" "" "HP Officejet Lx, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Lx" @@ -1262,7 +477,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_lx.ppd" Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" } -@@ -14692,7 +14695,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15574,7 +15577,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 300" Attribute "NickName" "" "HP Officejet Series 300, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 300" @@ -1271,7 +486,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_series_300.ppd" Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" } -@@ -14716,7 +14719,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15598,7 +15601,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 400" Attribute "NickName" "" "HP Deskjet 400, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 400" @@ -1280,7 +495,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_400.ppd" Attribute "Product" "" "(HP Deskjet 400 Printer)" Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" -@@ -14733,7 +14736,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15615,7 +15618,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 540" Attribute "NickName" "" "HP Deskjet 540, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 540" @@ -1289,7 +504,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_540.ppd" Attribute "Product" "" "(HP Deskjet 540 Printer)" } -@@ -14858,7 +14861,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15740,7 +15743,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 630c" Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 630c" @@ -1298,7 +513,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_630c.ppd" Attribute "Product" "" "(HP Deskjet 630c Printer)" } -@@ -14874,7 +14877,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15756,7 +15759,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 656c" Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 656c" @@ -1307,7 +522,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_656c.ppd" Attribute "Product" "" "(HP Deskjet 656c Printer)" Attribute "Product" "" "(HP Deskjet 656cvr Printer)" -@@ -14987,7 +14990,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15869,7 +15872,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 600" Attribute "NickName" "" "HP Deskjet 600, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 600" @@ -1316,7 +531,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_600.ppd" Attribute "Product" "" "(HP Deskjet 600c Printer)" Attribute "Product" "" "(HP Deskjet 600 Printer)" -@@ -15041,7 +15044,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15931,7 +15934,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 600" Attribute "NickName" "" "HP Officejet Series 600, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 600" @@ -1325,7 +540,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_series_600.ppd" Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" } -@@ -15093,7 +15096,7 @@ Group "RLT/HP Real Life Technologies" +@@ -15983,7 +15986,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 670c" Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 670c" @@ -1334,7 +549,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_670c.ppd" Attribute "Product" "" "(HP Deskjet 670c)" } -@@ -15245,7 +15248,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16127,7 +16130,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 610c" Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 610c" @@ -1343,7 +558,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_610c.ppd" Attribute "Product" "" "(HP Deskjet 610c Printer)" } -@@ -15269,7 +15272,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16151,7 +16154,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 640c" Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 640c" @@ -1352,7 +567,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_640c.ppd" Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" Attribute "Product" "" "(HP Deskjet 640c Printer)" -@@ -15289,7 +15292,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16171,7 +16174,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 690c" Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 690c" @@ -1361,7 +576,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_690c.ppd" Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" Attribute "Product" "" "(HP Deskjet 690c Printer)" -@@ -15349,7 +15352,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16231,7 +16234,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Series 700" Attribute "NickName" "" "HP Officejet Series 700, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Series 700" @@ -1370,61 +585,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_series_700.ppd" Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" } -@@ -15492,7 +15495,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet T Series" - 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)" -@@ -15503,7 +15506,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet r40" - 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)" - } -@@ -15527,7 +15530,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet r60" - 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)" - } -@@ -15535,7 +15538,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet r65" - 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)" - } -@@ -15551,7 +15554,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Officejet r80" - 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)" - } -@@ -15559,7 +15562,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP PSC 500" - 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)" -@@ -15576,7 +15579,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16382,7 +16385,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 812c" Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 812c" @@ -1433,7 +594,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_812c.ppd" Attribute "Product" "" "(HP Deskjet 812c Printer)" } -@@ -15584,7 +15587,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16390,7 +16393,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 815c" Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 815c" @@ -1442,7 +603,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_815c.ppd" Attribute "Product" "" "(HP Deskjet 815c Printer)" } -@@ -15616,7 +15619,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16422,7 +16425,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 840c" Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 840c" @@ -1451,7 +612,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_840c.ppd" Attribute "Product" "" "(HP Deskjet 840c Printer)" } -@@ -15624,7 +15627,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16430,7 +16433,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 841c" Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 841c" @@ -1460,7 +621,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_841c.ppd" Attribute "Product" "" "(HP Deskjet 841c Printer)" } -@@ -15640,7 +15643,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16446,7 +16449,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 843c" Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 843c" @@ -1469,7 +630,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_843c.ppd" Attribute "Product" "" "(HP Deskjet 843c Printer)" Attribute "Product" "" "(HP Deskjet 843cxe Printer)" -@@ -15649,7 +15652,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16455,7 +16458,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 880c" Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 880c" @@ -1478,7 +639,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_880c.ppd" Attribute "Product" "" "(HP Deskjet 880c Printer)" } -@@ -15665,7 +15668,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16471,7 +16474,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 895c" Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 895c" @@ -1487,7 +648,61 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_895c.ppd" Attribute "Product" "" "(HP Deskjet 895cse Printer)" Attribute "Product" "" "(HP Deskjet 895c Printer)" -@@ -15782,7 +15785,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16481,7 +16484,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r40" + 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)" + } +@@ -16505,7 +16508,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r60" + 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)" + } +@@ -16513,7 +16516,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r65" + 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)" + } +@@ -16521,7 +16524,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r80" + 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)" + } +@@ -16537,7 +16540,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet T Series" + 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)" +@@ -16548,7 +16551,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP PSC 500" + 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)" +@@ -16664,7 +16667,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 825c" Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 825c" @@ -1496,7 +711,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_825c.ppd" Attribute "Product" "" "(HP Deskjet 825cvr Printer)" Attribute "Product" "" "(HP Deskjet 825c Printer)" -@@ -15791,7 +15794,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16673,7 +16676,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Deskjet 845c" Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version" Attribute "ShortNickName" "" "HP Deskjet 845c" @@ -1505,25 +720,7 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-deskjet_845c.ppd" Attribute "Product" "" "(HP Deskjet 845c Printer)" Attribute "Product" "" "(HP Deskjet 845cvr Printer)" -@@ -15902,7 +15905,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Deskjet 850c" - 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)" -@@ -15921,7 +15924,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Deskjet 870c" - 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)" -@@ -15932,7 +15935,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16784,7 +16787,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1150c" Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1150c" @@ -1532,16 +729,25 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_pro_1150c.ppd" Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" -@@ -16046,7 +16049,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Deskjet 890c" - 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)" -@@ -16055,7 +16058,7 @@ Group "RLT/HP Real Life Technologies" +@@ -16793,7 +16796,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 850c" + 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)" +@@ -16812,7 +16815,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 870c" + 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)" +@@ -16928,7 +16931,7 @@ Group "RLT/HP Real Life Technologies" ModelName "HP Officejet Pro 1170c Series" Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version" Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" @@ -1550,147 +756,12 @@ diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv PCFileName "hp-officejet_pro_1170c_series.ppd" Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" -@@ -16197,7 +16200,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1018" - 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)" -@@ -16206,7 +16209,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet 1020" - 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)" -@@ -16240,7 +16243,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m1120 MFP" - 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)" - } -@@ -16256,7 +16259,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet m1319f MFP" - 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)" - } -@@ -16272,7 +16275,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p2035" - 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)" - } -@@ -16364,7 +16367,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional p1102w" - 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)" - } -@@ -16372,7 +16375,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional p1102" - Attribute "NickName" "" "HP LaserJet Professional p1102, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet Professional p1102" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102;DES:hp laserjet professional p1102;" - PCFileName "hp-laserjet_professional_p1102.ppd" - Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)" - Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)" -@@ -16494,7 +16497,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional m1212nf MFP" - 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)" - } -@@ -16730,7 +16733,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet Professional p1606dn" - 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)" - } -@@ -16904,7 +16907,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 2600n" - 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)" - } -@@ -17081,7 +17084,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3500" - 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)" -@@ -17091,7 +17094,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP Color LaserJet 3550" - 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)" - } -@@ -17243,7 +17246,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p1505" - 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)" - } -@@ -17377,7 +17380,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p1005" - Attribute "NickName" "" "HP LaserJet p1005, hpcups $Version, requires proprietary plugin" - Attribute "ShortNickName" "" "HP LaserJet p1005" -- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;" -+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1005;" - PCFileName "hp-laserjet_p1005.ppd" - Attribute "Product" "" "(HP LaserJet p1005 Printer)" - } -@@ -17385,7 +17388,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p1006" - 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)" - } -@@ -17393,7 +17396,7 @@ Group "RLT/HP Real Life Technologies" - ModelName "HP LaserJet p1007" - 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;" - PCFileName "hp-laserjet_p1007.ppd" - Attribute "Product" "" "(HP LaserJet p1007 Printer)" - } +@@ -16941,7 +16944,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 890c" + 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)" diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch index 0399f5b..810fdc3 100644 --- a/hplip-deviceIDs-ppd.patch +++ b/hplip-deviceIDs-ppd.patch @@ -1,594 +1,11 @@ -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd 2013-07-23 12:41:46.653625035 +0200 -@@ -42,6 +42,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 2500)" - *Product: "(Hewlett-Packard hp color LaserJet 2500)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd 2013-07-23 12:41:46.654625021 +0200 -@@ -42,6 +42,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 2500)" - *Product: "(Hewlett-Packard hp color LaserJet 2500)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd 2013-07-23 12:41:46.655625007 +0200 -@@ -42,6 +42,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2550 series;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 2550 series)" - *Product: "(Hewlett-Packard hp color LaserJet 2550 series)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:07.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd 2013-07-23 12:41:46.656624993 +0200 -@@ -46,6 +46,7 @@ - - *% Product Name and Version Information - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2605dn;DES:Hewlett-Packard Color LaserJet 2605dn;" - *Product: "(HP Color LaserJet 2605)" - *Product: "(Hewlett-Packard HP Color LaserJet 2605)" - *Product: "(HP Color LaserJet 2605dn)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd 2013-07-23 12:41:46.657624979 +0200 -@@ -43,6 +43,7 @@ - - *% Product Name and Version Information - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;" - *Product: "(HP Color LaserJet 2820)" - *Product: "(Hewlett-Packard HP Color LaserJet 2820)" - *Product: "(HP Color LaserJet 2830)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd 2013-07-23 12:41:46.658624966 +0200 -@@ -41,6 +41,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 3700)" - *Product: "(Hewlett-Packard hp color LaserJet 3700)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd 2013-07-23 12:41:46.659624952 +0200 -@@ -41,6 +41,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 3700)" - *Product: "(Hewlett-Packard hp color LaserJet 3700)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd 2013-07-23 12:41:46.660624938 +0200 -@@ -47,6 +47,7 @@ - - *% Product Name and Version Information - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;" - *Product: "(HP Color LaserJet 3800)" - *Product: "(Hewlett-Packard HP Color LaserJet 3800)" - *ModelName: "HP Color LaserJet 3800" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd 2013-07-23 12:41:46.661624924 +0200 -@@ -40,6 +40,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;" - *Manufacturer: "HP" - *Product: "(HP Color LaserJet 4550 )" - *Product: "(Hewlett-Packard HP Color LaserJet 4550 )" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd 2013-07-23 12:41:46.662624910 +0200 -@@ -41,6 +41,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 4600)" - *Product: "(Hewlett-Packard hp color LaserJet 4600)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd 2013-07-23 12:41:46.663624897 +0200 -@@ -41,6 +41,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 4600)" - *Product: "(Hewlett-Packard hp color LaserJet 4600)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd 2013-07-23 12:41:46.664624883 +0200 -@@ -43,6 +43,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 4650)" - *Product: "(Hewlett-Packard hp color LaserJet 4650)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd 2013-07-23 12:41:46.665624869 +0200 -@@ -45,6 +45,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;" - *Manufacturer: "HP" - *Product: "(HP Color LaserJet 4700)" - *Product: "(Hewlett-Packard HP Color LaserJet 4700)" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd 2013-07-23 12:41:46.666624855 +0200 -@@ -43,6 +43,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 5550 ;" - *Manufacturer: "HP" - *Product: "(hp color LaserJet 5550 )" - *Product: "(Hewlett-Packard hp color LaserJet 5550 )" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd 2013-07-23 12:41:46.667624841 +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.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 12:46:53.884383444 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd 2013-07-23 12:43:46.000000000 +0200 -@@ -32,6 +32,7 @@ - *LanguageEncoding: ISOLatin1 - *PCFileName: "HPP00004.PPD" - *Product: "(HP Color LaserJet CM4540 MFP)" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;" - *Manufacturer: "HP" - *ModelName: "HP Color LaserJet CM4540 MFP" - *ShortNickName: "HP Color LaserJet CM4540 MFP" -diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:08.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd 2013-07-23 12:41:46.668624828 +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.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd 2013-07-23 12:41:46.670624800 +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.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd 2013-07-23 12:45:48.252289396 +0200 -+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd 2013-07-23 12:44:34.000000000 +0200 -@@ -44,6 +44,7 @@ - - - *% Product Name and Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4005;" - *Manufacturer: "HP" - *Product: "(HP Color LaserJet CP4005)" - *Product: "(Hewlett-Packard HP Color LaserJet CP4005)" -diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd 2013-07-23 12:41:46.670624800 +0200 -@@ -38,6 +38,7 @@ - *ShortNickName: "HP Designjet T770 PostScript" - *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.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd 2013-07-23 12:41:46.671624786 +0200 -@@ -38,6 +38,7 @@ - *ShortNickName: "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.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd 2013-07-23 12:41:46.671624786 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 1200)" - *Product: "(Hewlett-Packard HP LaserJet 1200)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd 2013-07-23 12:41:46.672624772 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 1200)" - *Product: "(Hewlett-Packard HP LaserJet 1200)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd 2013-07-23 12:41:46.673624759 +0200 -@@ -58,6 +58,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1300n)" - *Product: "(HP LaserJet 1300n)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd 2013-07-23 12:41:46.673624759 +0200 -@@ -58,6 +58,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1300n)" - *Product: "(HP LaserJet 1300n)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd 2013-07-23 12:41:46.674624745 +0200 -@@ -58,6 +58,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1300n)" - *Product: "(HP LaserJet 1300n)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd 2013-07-23 12:41:46.675624731 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd 2013-07-23 12:41:46.676624717 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd 2013-07-23 12:41:46.677624703 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd 2013-07-23 12:41:46.677624703 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd 2013-07-23 12:41:46.678624689 +0200 -@@ -55,6 +55,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 1320 series)" - *Product: "(HP LaserJet 1320 series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd 2013-07-23 12:41:46.679624676 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 2100 Series)" - *Product: "(Hewlett-Packard HP LaserJet 2100 Series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;" - *PSVersion: "(2014.111) 1" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd 2013-07-23 12:41:46.680624662 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 2100 Series)" - *Product: "(Hewlett-Packard HP LaserJet 2100 Series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;" - *PSVersion: "(2014.111) 1" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:09.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd 2013-07-23 12:41:46.680624662 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 2200)" - *Product: "(Hewlett-Packard HP LaserJet 2200)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd 2013-07-23 12:41:46.681624648 +0200 -@@ -54,6 +54,7 @@ - *Product: "(HP LaserJet 2200)" - *Product: "(Hewlett-Packard HP LaserJet 2200)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd 2013-07-23 12:41:46.682624634 +0200 -@@ -59,6 +59,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2300L)" - *Product: "(HP LaserJet 2300L)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd 2013-07-23 12:41:46.683624620 +0200 -@@ -59,6 +59,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2300L)" - *Product: "(HP LaserJet 2300L)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd 2013-07-23 12:41:46.684624607 +0200 -@@ -57,6 +57,7 @@ - *Product: "(Hewlett-Packard hp LaserJet 2420)" - *Product: "(HP LaserJet 2420)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd 2013-07-23 12:41:46.684624607 +0200 -@@ -58,6 +58,7 @@ - *Product: "(HP LaserJet 3390)" - *Product: "(Hewlett-Packard HP LaserJet 3390)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;" - *PSVersion: "(2014.116) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd 2013-07-23 12:41:46.685624593 +0200 -@@ -49,6 +49,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series" - *Product: "(HP LaserJet 4000 Series)" - *Product: "(Hewlett-Packard HP LaserJet 4000 Series)" - *ModelName: "HP LaserJet 4000 Series" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd 2013-07-23 12:41:46.686624579 +0200 -@@ -49,6 +49,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;" - *Product: "(HP LaserJet 4050 Series )" - *Product: "(Hewlett-Packard HP LaserJet 4050 Series )" - *Product: "(HP LaserJet 4050 Series)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd 2013-07-23 12:41:46.687624565 +0200 -@@ -48,6 +48,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;" - *Product: "(HP LaserJet 4100 Series )" - *Product: "(Hewlett-Packard HP LaserJet 4100 Series )" - *Product: "(HP LaserJet 4100 Series)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd 2013-07-23 12:41:46.688624551 +0200 -@@ -49,6 +49,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;" - *Product: "(hp LaserJet 4200)" - *Product: "(Hewlett-Packard hp LaserJet 4200)" - *Product: "(HP LaserJet 4200)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd 2013-07-23 12:41:46.689624538 +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.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd 2013-07-23 12:41:46.690624524 +0200 -@@ -49,6 +49,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;" - *Product: "(hp LaserJet 4300)" - *Product: "(Hewlett-Packard hp LaserJet 4300)" - *Product: "(HP LaserJet 4300)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd 2013-07-23 12:41:46.691624510 +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.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:10.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd 2013-07-23 12:41:46.692624496 +0200 -@@ -50,6 +50,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;" - *Product: "(HP LaserJet 5100 Series)" - *Product: "(Hewlett-Packard HP LaserJet 5100 Series)" - *ModelName: "HP LaserJet 5100 Series" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd 2013-07-23 12:41:46.694624469 +0200 -@@ -52,6 +52,7 @@ - *%================================================= - *% Product Version Information - *%================================================= -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;" - *ModelName: "HP LaserJet 8000 Series" - *ShortNickName: "HP LaserJet 8000 Series" - *NickName: "HP LaserJet 8000 Series Postscript (recommended)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd 2013-07-23 12:41:46.695624455 +0200 -@@ -52,6 +52,7 @@ - *%================================================= - *% Product Version Information - *%================================================= -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;" - *ModelName: "HP LaserJet 8000 Series" - *ShortNickName: "HP LaserJet 8000 Series" - *NickName: "HP LaserJet 8000 Series Postscript (recommended)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd 2013-07-23 12:41:46.696624441 +0200 -@@ -51,6 +51,7 @@ - *%================================================= - *% Product Version Information - *%================================================= -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;" - *ModelName: "HP LaserJet M3027 MFP" - *ShortNickName: "HP LaserJet M3027 MFP" - *NickName: "HP LaserJet M3027 MFP Postscript (recommended)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd 2013-07-23 12:41:46.697624427 +0200 -@@ -52,6 +52,7 @@ - *%================================================= - *% Product Version Information - *%================================================= -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;" - *ModelName: "HP LaserJet M3035 MFP" - *ShortNickName: "HP LaserJet M3035 MFP" - *NickName: "HP LaserJet M3035 MFP Postscript (recommended)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2013-07-23 12:41:46.698624413 +0200 -@@ -58,6 +58,7 @@ - *Product: "(HP LaserJet P2015 Series)" - *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd 2013-07-23 12:41:46.699624399 +0200 -@@ -50,6 +50,7 @@ - *%================================================= - *% Product Version Information - *%================================================= -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;" - *ModelName: "HP LaserJet P3005" - *ShortNickName: "HP LaserJet P3005" - *NickName: "HP LaserJet P3005 Postscript (recommended)" -diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd ---- hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd 2013-07-23 07:19:11.000000000 +0200 -+++ hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd 2013-07-23 12:41:46.700624386 +0200 -@@ -45,6 +45,7 @@ - - - *% Product Version Information -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;" - *Product: "(HP LaserJet P3015)" - *Product: "(Hewlett-Packard HP LaserJet P3015)" - *Product: "(HP LaserJet P3011)" +diff -up hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd +--- hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid 2014-11-04 09:41:13.200005393 +0000 ++++ hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd 2014-11-04 09:42:13.168312042 +0000 +@@ -82,6 +82,7 @@ + *cupsManualCopies: False + *cupsLanguages: "en da de es fi fr it ja ko nb nl pt ru sv zh_CN zh_TW" + *cupsFilter: "application/vnd.cups-postscript 0 hpps" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 400 color M451dn;DES:HP LaserJet 400 color M451dn;" + *UIConstraints: *HPOption_Duplexer False *Duplex + *UIConstraints: *Duplex *HPOption_Duplexer False + *UIConstraints: *HPOption_Tray3 False *InputSlot Tray3 diff --git a/hplip-logdir.patch b/hplip-logdir.patch index 98ad416..bbfab9b 100644 --- a/hplip-logdir.patch +++ b/hplip-logdir.patch @@ -1,26 +1,24 @@ -diff -Naur hplip-3.14.6.orig/prnt/hpcups/HPCupsFilter.cpp hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.14.6.orig/prnt/hpcups/HPCupsFilter.cpp 2014-07-10 18:00:10.623877105 +0400 -+++ hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp 2014-07-10 18:00:28.512876654 +0400 -@@ -597,7 +597,7 @@ +diff -up hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2015-02-04 14:22:43.838774401 +0100 ++++ hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp 2015-02-04 14:22:43.844774315 +0100 +@@ -619,7 +619,7 @@ int HPCupsFilter::processRasterData(cups char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages. - sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); -+ snprintf(hpPreProcessedRasterFile, sizeof(hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); ++ snprintf(hpPreProcessedRasterFile, sizeof (hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); while (cupsRasterReadHeader2(cups_raster, &cups_header)) -diff -Naur hplip-3.14.6.orig/prnt/hpcups/SystemServices.cpp hplip-3.14.6/prnt/hpcups/SystemServices.cpp ---- hplip-3.14.6.orig/prnt/hpcups/SystemServices.cpp 2014-07-10 18:00:10.645877105 +0400 -+++ hplip-3.14.6/prnt/hpcups/SystemServices.cpp 2014-07-10 18:03:01.156872806 +0400 -@@ -38,8 +38,8 @@ +diff -up hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.15.2/prnt/hpcups/SystemServices.cpp +--- hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir 2015-02-04 14:22:43.844774315 +0100 ++++ hplip-3.15.2/prnt/hpcups/SystemServices.cpp 2015-02-04 14:24:04.080626127 +0100 +@@ -38,7 +38,7 @@ SystemServices::SystemServices(int iLogL if (iLogLevel & SAVE_OUT_FILE) { char fname[MAX_FILE_PATH_LEN]; - sprintf(fname, "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); -- + snprintf(fname, sizeof(fname), "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); -+ createTempFile(fname, &m_fp); if (m_fp) { diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch index e06a820..21b4e3b 100644 --- a/hplip-pstotiff-is-rubbish.patch +++ b/hplip-pstotiff-is-rubbish.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/filters/pstotiff ---- hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish 2011-07-24 21:06:43.000000000 +0200 -+++ hplip-3.11.7/fax/filters/pstotiff 2011-07-25 13:42:27.776988201 +0200 -@@ -1,40 +1,16 @@ +diff -Naur hplip-3.15.2.orig/fax/filters/pstotiff hplip-3.15.2/fax/filters/pstotiff +--- hplip-3.15.2.orig/fax/filters/pstotiff 2015-03-30 05:41:08.462673535 -0400 ++++ hplip-3.15.2/fax/filters/pstotiff 2015-03-30 05:41:59.756495969 -0400 +@@ -1,45 +1,16 @@ -#!/usr/bin/env python - -import os @@ -10,6 +10,8 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/ -import sys -import tempfile - +-PY3 = sys.version_info[0] == 3 +- -READ_SIZE = 8192 - -total_bytes_read = 0 @@ -36,7 +38,10 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/ -out_handle = open(temp_out_fname, mode='rb') -while (total_bytes_read < file_len): - data = out_handle.read(READ_SIZE) -- sys.stdout.write(data) +- if PY3: +- sys.stdout.buffer.write(data) +- else: +- sys.stdout.write(data) - total_bytes_read += READ_SIZE -out_handle.close() -