diff --git a/hardware/printer/hplip/files/fedora/hplip-3165-sourceoption.patch b/hardware/printer/hplip/files/fedora/hplip-3165-sourceoption.patch
new file mode 100644
index 0000000000..fd8ff09d0d
--- /dev/null
+++ b/hardware/printer/hplip/files/fedora/hplip-3165-sourceoption.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.16.5/scan.py.sourceoption hplip-3.16.5/scan.py
+--- hplip-3.16.5/scan.py.sourceoption 2016-06-22 10:25:52.742799941 +0200
++++ hplip-3.16.5/scan.py 2016-06-22 10:34:51.945766487 +0200
+@@ -658,6 +658,7 @@ try:
+ sys.exit(1)
+ except:
+ log.error("Failed to get the source from device.")
++ sys.exit(1)
+
+ #check if device has only ADF
+ if len(source_option) == 1 and 'ADF' in source_option:
diff --git a/hardware/printer/hplip/files/fedora/hplip-avahi-parsing.patch b/hardware/printer/hplip/files/fedora/hplip-avahi-parsing.patch
index 42adca53c1..029040b751 100644
--- a/hardware/printer/hplip/files/fedora/hplip-avahi-parsing.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-avahi-parsing.patch
@@ -16,4 +16,4 @@ diff -up hplip-3.15.2/base/avahi.py.parsing hplip-3.15.2/base/avahi.py
+ key, value = keyvalue
if key == 'ty':
y['mdns'] = value
- y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value
\ No newline at end of file
+ y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value
diff --git a/hardware/printer/hplip/files/fedora/hplip-bad-low-ink-warning.patch b/hardware/printer/hplip/files/fedora/hplip-bad-low-ink-warning.patch
old mode 100755
new mode 100644
index 13237c4887..bd51d648b4
--- a/hardware/printer/hplip/files/fedora/hplip-bad-low-ink-warning.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-bad-low-ink-warning.patch
@@ -36,4 +36,4 @@ diff -up hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.10.5/p
+ if ((*(pStr+1) & 0xf3) > '1')
{
if (err != NO_ERROR)
- {
\ No newline at end of file
+ {
diff --git a/hardware/printer/hplip/files/fedora/hplip-check-cups.patch b/hardware/printer/hplip/files/fedora/hplip-check-cups.patch
new file mode 100644
index 0000000000..053eb50050
--- /dev/null
+++ b/hardware/printer/hplip/files/fedora/hplip-check-cups.patch
@@ -0,0 +1,16 @@
+diff -up hplip-3.17.11/installer/core_install.py.check-cups hplip-3.17.11/installer/core_install.py
+--- hplip-3.17.11/installer/core_install.py.check-cups 2017-12-07 15:34:24.855761874 +0100
++++ hplip-3.17.11/installer/core_install.py 2017-12-07 15:38:44.749568860 +0100
+@@ -349,9 +349,9 @@ class CoreInstall(object):
+ 'automake': (True, ['prnt'], AUTOMAKE_STR, self.check_automake, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', None, GENERALDEP),
+ 'libjpeg': (True, ['base', 'prnt'], JPEG_STR, self.check_libjpeg, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', None, GENERALDEP),
+ 'libtool': (True, ['base', 'prnt'], LIBTOOL_STR, self.check_libtool, DEPENDENCY_COMPILE_TIME, '-', 'libtool --version', COMPILEDEP),
+- 'cups': (True, ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '1.1', 'cups-config --version', EXTERNALDEP),
+- 'cups-devel': (True, ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
+- 'cups-image': (True, ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
++ 'cups': (True, ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '1.1', 'lpstat -r', EXTERNALDEP),
++ 'cups-devel': (True, ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'lpstat -r', GENERALDEP),
++ 'cups-image': (True, ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'lpstat -r', GENERALDEP),
+ 'gcc': (True, ['base', 'prnt'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-', 'gcc --version', COMPILEDEP),
+ 'make': (True, ['base', 'prnt'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME, '3.0', 'make --version', COMPILEDEP),
+ 'libpthread': (True, ['base', 'prnt'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#get_libpthread_version', GENERALDEP),
diff --git a/hardware/printer/hplip/files/fedora/hplip-clear-old-state-reasons.patch b/hardware/printer/hplip/files/fedora/hplip-clear-old-state-reasons.patch
old mode 100755
new mode 100644
index 7c30ee2252..0dd0c66456
--- a/hardware/printer/hplip/files/fedora/hplip-clear-old-state-reasons.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-clear-old-state-reasons.patch
@@ -14,4 +14,4 @@ diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip
+
cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ);
- if (cups_raster == NULL) {
\ No newline at end of file
+ if (cups_raster == NULL) {
diff --git a/hardware/printer/hplip/files/fedora/hplip-colorlaserjet-mfp-m278-m281.patch b/hardware/printer/hplip/files/fedora/hplip-colorlaserjet-mfp-m278-m281.patch
new file mode 100644
index 0000000000..357cff3fdc
--- /dev/null
+++ b/hardware/printer/hplip/files/fedora/hplip-colorlaserjet-mfp-m278-m281.patch
@@ -0,0 +1,62 @@
+diff -urw hplip-3.17.10-orig/data/models/models.dat hplip-3.17.10/data/models/models.dat
+--- hplip-3.17.10-orig/data/models/models.dat 2017-10-13 10:39:44.000000000 +0200
++++ hplip-3.17.10/data/models/models.dat 2017-11-02 21:14:40.931754882 +0100
+@@ -57211,6 +57211,58 @@
+ usb-vid=3f0
+ wifi-config=3
+
++[hp_colorlaserjet_mfp_m278-m281]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=7
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=1
++io-mode=1
++io-support=14
++job-storage=0
++linefeed-cal-type=0
++model1=HP Color LaserJet MFP M278-281
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++ppd-name=hp-color_laserjet_pro_mfp_m277
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CF400A/CF400X
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CF401A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CF403A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CF402A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=48c3
++support-type=2
++support-ver=3.15.4
++tech-class=Postscript
++tech-subclass=Normal
++tech-type=4
++usb-pid=3c2a
++usb-vid=3f0
++wifi-config=3
++
+ [hp_color_laserjet_m553]
+ align-type=0
+ clean-type=0
diff --git a/hardware/printer/hplip/files/fedora/hplip-deviceIDs-drv.patch b/hardware/printer/hplip/files/fedora/hplip-deviceIDs-drv.patch
old mode 100755
new mode 100644
index e6071af6e4..363c59dbc3
--- a/hardware/printer/hplip/files/fedora/hplip-deviceIDs-drv.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-deviceIDs-drv.patch
@@ -1,767 +1,768 @@
-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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;"
-+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;"
- PCFileName "hp-photosmart_p1000.ppd"
- Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)"
- Attribute "Product" "" "(HP Photosmart p1000xi Printer)"
-@@ -474,7 +474,7 @@ Manufacturer "HP"
- ModelName "HP Photosmart p1100"
- Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version"
- Attribute "ShortNickName" "" "HP Photosmart p1100"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;"
-+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;"
- PCFileName "hp-photosmart_p1100.ppd"
- Attribute "Product" "" "(HP Photosmart p1100 Printer)"
- Attribute "Product" "" "(HP Photosmart p1100xi Printer)"
-@@ -516,7 +516,7 @@ Manufacturer "HP"
+diff -up hplip-3.17.11/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.17.11/prnt/drv/hpcups.drv.in
+--- hplip-3.17.11/prnt/drv/hpcups.drv.in.deviceIDs-drv 2017-12-07 09:31:48.721626277 +0100
++++ hplip-3.17.11/prnt/drv/hpcups.drv.in 2017-12-07 13:40:30.703164179 +0100
+@@ -487,7 +487,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 3820"
Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 3820"
+ Attribute "ShortNickName" "" "HP Deskjet 3820 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3820;DES:deskjet 3820;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;"
PCFileName "hp-deskjet_3820.ppd"
Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)"
Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;"
- PCFileName "hp-officejet_5105.ppd"
- Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)"
- }
-@@ -587,7 +587,7 @@ Manufacturer "HP"
- ModelName "HP Officejet 5110v"
- Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet 5110v"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;"
- PCFileName "hp-officejet_5110v.ppd"
- Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)"
- }
-@@ -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"
+@@ -521,7 +521,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 920c"
Attribute "NickName" "" "HP Deskjet 920c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 920c"
+ Attribute "ShortNickName" "" "HP Deskjet 920c hpijs"
- 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"
+@@ -532,7 +532,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 930c"
Attribute "NickName" "" "HP Deskjet 930c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 930c"
+ Attribute "ShortNickName" "" "HP Deskjet 930c hpijs"
- 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"
+@@ -573,7 +573,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 940c"
Attribute "NickName" "" "HP Deskjet 940c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 940c"
+ Attribute "ShortNickName" "" "HP Deskjet 940c hpijs"
- 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"
+@@ -592,7 +592,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 950c"
Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 950c"
+ Attribute "ShortNickName" "" "HP Deskjet 950c hpijs"
- 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"
+@@ -625,7 +625,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 959c"
Attribute "NickName" "" "HP Deskjet 959c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 959c"
+ Attribute "ShortNickName" "" "HP Deskjet 959c hpijs"
- 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"
+@@ -633,7 +633,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 970c"
Attribute "NickName" "" "HP Deskjet 970c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 970c"
+ Attribute "ShortNickName" "" "HP Deskjet 970c hpijs"
- 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"
+@@ -665,7 +665,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet 5105"
+ Attribute "NickName" "" "HP Officejet 5105, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet 5105 hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;"
+ PCFileName "hp-officejet_5105.ppd"
+ Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)"
+ }
+@@ -682,7 +682,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet 5110v"
+ Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet 5110v hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;"
+ PCFileName "hp-officejet_5110v.ppd"
+ Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)"
+ }
+@@ -690,7 +690,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet g55"
+ Attribute "NickName" "" "HP Officejet g55, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet g55 hpijs"
+- 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)"
+ }
+@@ -706,7 +706,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet g85"
+ Attribute "NickName" "" "HP Officejet g85, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet g85 hpijs"
+- 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)"
+ }
+@@ -722,7 +722,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet g95"
+ Attribute "NickName" "" "HP Officejet g95, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet g95 hpijs"
+- 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)"
+ }
+@@ -770,7 +770,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet v40"
+ Attribute "NickName" "" "HP Officejet v40, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet v40 hpijs"
+- 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)"
+@@ -779,7 +779,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet v40xi"
+ Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet v40xi hpijs"
+- 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)"
+ }
+@@ -795,7 +795,7 @@ Manufacturer "HP"
+ ModelName "HP Photosmart p1000"
+ Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Photosmart p1000 hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;"
++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;"
+ PCFileName "hp-photosmart_p1000.ppd"
+ Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)"
+ Attribute "Product" "" "(HP Photosmart p1000xi Printer)"
+@@ -804,7 +804,7 @@ Manufacturer "HP"
+ ModelName "HP Photosmart p1100"
+ Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Photosmart p1100 hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;"
++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;"
+ PCFileName "hp-photosmart_p1100.ppd"
+ Attribute "Product" "" "(HP Photosmart p1100 Printer)"
+ Attribute "Product" "" "(HP Photosmart p1100xi Printer)"
+@@ -821,7 +821,7 @@ Manufacturer "HP"
+ ModelName "HP PSC 750"
+ Attribute "NickName" "" "HP PSC 750, hpcups $Version"
+ Attribute "ShortNickName" "" "HP PSC 750 hpijs"
+- 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)"
+ }
+@@ -829,7 +829,7 @@ Manufacturer "HP"
+ ModelName "HP PSC 750xi"
+ Attribute "NickName" "" "HP PSC 750xi, hpcups $Version"
+ Attribute "ShortNickName" "" "HP PSC 750xi hpijs"
+- 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)"
+ }
+@@ -861,7 +861,7 @@ Manufacturer "HP"
+ ModelName "HP PSC 900 Series"
+ Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version"
+ Attribute "ShortNickName" "" "HP PSC 900 Series hpijs"
+- 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)"
+ }
+@@ -935,7 +935,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 1220c"
Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 1220c"
+ Attribute "ShortNickName" "" "HP Deskjet 1220c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1220c;DES:deskjet 1220c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;"
PCFileName "hp-deskjet_1220c.ppd"
Attribute "Product" "" "(HP Deskjet 1220c Printer)"
Attribute "Product" "" "(HP Deskjet 1220cse Printer)"
-@@ -1134,7 +1134,7 @@ Manufacturer "HP"
+@@ -1125,7 +1125,7 @@ Manufacturer "HP"
ModelName "HP 2000c"
Attribute "NickName" "" "HP 2000c, hpcups $Version"
- Attribute "ShortNickName" "" "HP 2000c"
+ Attribute "ShortNickName" "" "HP 2000c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp 2000c;DES:hp 2000c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP 2000C;DES:hp 2000c;"
PCFileName "hp-2000c.ppd"
Attribute "Product" "" "(HP 2000cse Printer)"
Attribute "Product" "" "(HP 2000c Printer)"
-@@ -1609,7 +1609,7 @@ Manufacturer "HP"
+@@ -1589,7 +1589,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 960c"
Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 960c"
+ Attribute "ShortNickName" "" "HP Deskjet 960c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 960c;DES:deskjet 960c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;"
PCFileName "hp-deskjet_960c.ppd"
Attribute "Product" "" "(HP Deskjet 960cse Printer)"
Attribute "Product" "" "(HP Deskjet 960cxi Printer)"
-@@ -1619,7 +1619,7 @@ Manufacturer "HP"
+@@ -1599,7 +1599,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 980c"
Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 980c"
+ Attribute "ShortNickName" "" "HP Deskjet 980c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 980c;DES:deskjet 980c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;"
PCFileName "hp-deskjet_980c.ppd"
Attribute "Product" "" "(HP Deskjet 980cxi Printer)"
Attribute "Product" "" "(HP Deskjet 980c Printer)"
-@@ -1628,7 +1628,7 @@ Manufacturer "HP"
+@@ -1608,7 +1608,7 @@ Manufacturer "HP"
ModelName "HP Deskjet 990c"
Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 990c"
+ Attribute "ShortNickName" "" "HP Deskjet 990c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 990c;DES:deskjet 990c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;"
PCFileName "hp-deskjet_990c.ppd"
Attribute "Product" "" "(HP Deskjet 990cxi Printer)"
Attribute "Product" "" "(HP Deskjet 990cse Printer)"
-@@ -1658,7 +1658,7 @@ Manufacturer "HP"
+@@ -1638,7 +1638,7 @@ Manufacturer "HP"
ModelName "HP Color Inkjet cp1700"
Attribute "NickName" "" "HP Color Inkjet cp1700, hpcups $Version"
- Attribute "ShortNickName" "" "HP Color Inkjet cp1700"
+ Attribute "ShortNickName" "" "HP Color Inkjet cp1700 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;"
PCFileName "hp-color_inkjet_cp1700.ppd"
Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
}
-@@ -1666,7 +1666,7 @@ Manufacturer "HP"
+@@ -1646,7 +1646,7 @@ Manufacturer "HP"
ModelName "HP Officejet 7100 Series"
Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet 7100 Series"
+ Attribute "ShortNickName" "" "HP Officejet 7100 Series hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7100 series;DES:officejet 7100 series;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7100 series;DES:officejet 7100 series;"
PCFileName "hp-officejet_7100_series.ppd"
Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)"
-@@ -1681,7 +1681,7 @@ Manufacturer "HP"
+@@ -1661,7 +1661,7 @@ Manufacturer "HP"
ModelName "HP Officejet D Series"
Attribute "NickName" "" "HP Officejet D Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet D Series"
+ Attribute "ShortNickName" "" "HP Officejet D Series hpijs"
- 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"
+@@ -1708,7 +1708,7 @@ Manufacturer "HP"
ModelName "HP PSC 2100 Series"
Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP PSC 2100 Series"
+ Attribute "ShortNickName" "" "HP PSC 2100 Series hpijs"
- 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"
+@@ -1721,7 +1721,7 @@ Manufacturer "HP"
ModelName "HP PSC 2150 Series"
Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP PSC 2150 Series"
+ Attribute "ShortNickName" "" "HP PSC 2150 Series hpijs"
- 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"
+@@ -1729,7 +1729,7 @@ Manufacturer "HP"
ModelName "HP PSC 2170 Series"
Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP PSC 2170 Series"
+ Attribute "ShortNickName" "" "HP PSC 2170 Series hpijs"
- 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"
+@@ -1951,7 +1951,7 @@ Manufacturer "HP"
ModelName "HP Business Inkjet 2200"
Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version"
- Attribute "ShortNickName" "" "HP Business Inkjet 2200"
+ Attribute "ShortNickName" "" "HP Business Inkjet 2200 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2200;DES:hp business inkjet 2200;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;"
PCFileName "hp-business_inkjet_2200.ppd"
Attribute "Product" "" "(HP Business Inkjet 2200 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2200se Printer)"
-@@ -1987,7 +1987,7 @@ Manufacturer "HP"
+@@ -1961,7 +1961,7 @@ Manufacturer "HP"
ModelName "HP Business Inkjet 2230"
Attribute "NickName" "" "HP Business Inkjet 2230, hpcups $Version"
- Attribute "ShortNickName" "" "HP Business Inkjet 2230"
+ Attribute "ShortNickName" "" "HP Business Inkjet 2230 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2230;DES:hp business inkjet 2230;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;"
PCFileName "hp-business_inkjet_2230.ppd"
Attribute "Product" "" "(HP Business Inkjet 2230 Printer)"
}
-@@ -1995,7 +1995,7 @@ Manufacturer "HP"
+@@ -1969,7 +1969,7 @@ Manufacturer "HP"
ModelName "HP Business Inkjet 2250"
Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, hpcups $Version"
- Attribute "ShortNickName" "" "HP Business Inkjet 2250"
+ Attribute "ShortNickName" "" "HP Business Inkjet 2250 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2250;DES:hp business inkjet 2250;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;"
PCFileName "hp-business_inkjet_2250-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2250 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)"
-@@ -2004,7 +2004,7 @@ Manufacturer "HP"
+@@ -1978,7 +1978,7 @@ Manufacturer "HP"
ModelName "HP Business Inkjet 2280"
Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, hpcups $Version"
- Attribute "ShortNickName" "" "HP Business Inkjet 2280"
+ Attribute "ShortNickName" "" "HP Business Inkjet 2280 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2280;DES:hp business inkjet 2280;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;"
PCFileName "hp-business_inkjet_2280-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2280 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;"
- PCFileName "hp-psc_2200_series.ppd"
- Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)"
- }
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;"
- PCFileName "hp-psc_2300_series.ppd"
- Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)"
- Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;"
- PCFileName "hp-psc_2350_series.ppd"
- Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)"
- Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;"
- PCFileName "hp-psc_2500_series.ppd"
- Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)"
- Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;"
- PCFileName "hp-officejet_j5700_series.ppd"
- Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)"
- Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100 series;DES:officejet 6100 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;"
- PCFileName "hp-officejet_6100_series.ppd"
- Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)"
- Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)"
-@@ -3350,7 +3350,7 @@ Manufacturer "HP"
+@@ -2740,7 +2740,7 @@ Manufacturer "HP"
ModelName "HP Officejet 7200 Series"
Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet 7200 Series"
+ Attribute "ShortNickName" "" "HP Officejet 7200 Series hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7200 series;DES:officejet 7200 series;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7200 series;DES:officejet 7200 series;"
PCFileName "hp-officejet_7200_series.ppd"
Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)"
-@@ -3452,7 +3452,7 @@ Manufacturer "HP"
+@@ -2764,7 +2764,7 @@ Manufacturer "HP"
ModelName "HP Officejet 7400 Series"
Attribute "NickName" "" "HP Officejet 7400 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet 7400 Series"
+ Attribute "ShortNickName" "" "HP Officejet 7400 Series hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7400 series;DES:officejet 7400 series;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7400 series;DES:officejet 7400 series;"
PCFileName "hp-officejet_7400_series.ppd"
Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;"
- PCFileName "hp-psc_1100_series.ppd"
- Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)"
- Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;"
- PCFileName "hp-psc_1200_series.ppd"
- Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)"
- Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)"
-@@ -11688,7 +11688,7 @@ Manufacturer "HP"
+@@ -2810,7 +2810,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet j5700 Series"
+ Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet j5700 Series hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;"
+ PCFileName "hp-officejet_j5700_series.ppd"
+ Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)"
+ Attribute "Product" "" "(HP Officejet j5785 All-in-one Printer)"
+@@ -3488,7 +3488,7 @@ Manufacturer "HP"
+ ModelName "HP PSC 2200 Series"
+ Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version"
+ Attribute "ShortNickName" "" "HP PSC 2200 Series hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;"
+ PCFileName "hp-psc_2200_series.ppd"
+ Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)"
+ }
+@@ -3506,7 +3506,7 @@ Manufacturer "HP"
+ ModelName "HP PSC 2300 Series"
+ Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version"
+ Attribute "ShortNickName" "" "HP PSC 2300 Series hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;"
+ PCFileName "hp-psc_2300_series.ppd"
+ Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)"
+ Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)"
+@@ -3514,8 +3514,7 @@ Manufacturer "HP"
+ {
+ ModelName "HP PSC 2350 Series"
+ Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version"
+- Attribute "ShortNickName" "" "HP PSC 2350 Series hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;"
+ PCFileName "hp-psc_2350_series.ppd"
+ Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)"
+ Attribute "Product" "" "(HP PSC 2358 All-in-one Printer)"
+@@ -3545,7 +3544,7 @@ Manufacturer "HP"
+ ModelName "HP PSC 2500 Series"
+ Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version"
+ Attribute "ShortNickName" "" "HP PSC 2500 Series hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;"
+ PCFileName "hp-psc_2500_series.ppd"
+ Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)"
+ Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)"
+@@ -7134,7 +7133,7 @@ Manufacturer "HP"
+ ModelName "HP Officejet 6100"
+ Attribute "NickName" "" "HP Officejet 6100, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet 6100 hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100;DES:officejet 6100;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;"
+ PCFileName "hp-officejet_6100.ppd"
+ Attribute "Product" "" "(HP Officejet 6100 Eprinter h611a)"
+ }
+@@ -16828,7 +16827,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
ModelName "HP Officejet 4100 Series"
Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet 4100 Series"
+ Attribute "ShortNickName" "" "HP Officejet 4100 Series hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4100 series;DES:officejet 4100 series;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-packard;MDL:officejet 4100 series;DES:officejet 4100 series;"
PCFileName "hp-officejet_4100_series.ppd"
Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)"
-@@ -11715,7 +11715,7 @@ Manufacturer "HP"
+@@ -16855,7 +16854,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
ModelName "HP Officejet 4300 Series"
Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet 4300 Series"
+ Attribute "ShortNickName" "" "HP Officejet 4300 Series hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4300 series;DES:officejet 4300 series;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet 4300 series;DES:officejet 4300 series;"
PCFileName "hp-officejet_4300_series.ppd"
Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)"
- Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;"
- PCFileName "hp-officejet_j3600_series.ppd"
- Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)"
- Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)"
-@@ -12086,7 +12086,7 @@ Manufacturer "HP"
+ Attribute "Product" "" "(HP Officejet 4338 All-in-one Printer)"
+@@ -16887,7 +16886,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
+ ModelName "HP PSC 1100 Series"
+ Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version"
+ Attribute "ShortNickName" "" "HP PSC 1100 Series hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;"
+ PCFileName "hp-psc_1100_series.ppd"
+ Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)"
+ Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)"
+@@ -16897,7 +16896,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
+ ModelName "HP PSC 1200 Series"
+ Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version"
+ Attribute "ShortNickName" "" "HP PSC 1200 Series hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;"
+ PCFileName "hp-psc_1200_series.ppd"
+ Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)"
+ Attribute "Product" "" "(HP PSC 1217 All-in-one Printer)"
+@@ -17200,7 +17199,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
ModelName "HP Officejet 4200 Series"
Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet 4200 Series"
+ Attribute "ShortNickName" "" "HP Officejet 4200 Series hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4200 series;DES:officejet 4200 series;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 4200 series;DES:officejet 4200 series;"
PCFileName "hp-officejet_4200_series.ppd"
Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)"
-@@ -12609,6 +12609,7 @@ Manufacturer "HP"
+@@ -17265,7 +17264,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
+ ModelName "HP Officejet j3600 Series"
+ Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Officejet j3600 Series hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;"
+ PCFileName "hp-officejet_j3600_series.ppd"
+ Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)"
+ Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)"
+@@ -17768,6 +17767,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $Version"
- Attribute "ShortNickName" "" "HP Photosmart 380 Series"
+ Attribute "ShortNickName" "" "HP Photosmart 380 Series hpijs"
Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;"
+ Attribute "1284DeviceID" "" "MFG:HP;MDL:Photosmart 380 series_BT;DES:385;"
PCFileName "hp-photosmart_380_series.ppd"
Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)"
Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)"
-@@ -14554,7 +14557,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -19573,7 +19573,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"
+ Attribute "ShortNickName" "" "HP Business Inkjet 2300 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2300;DES:Hewlett-Packard Business Inkjet 2300;"
PCFileName "hp-business_inkjet_2300-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2300 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2300n Printer)"
-@@ -14818,7 +14821,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -19973,7 +19973,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"
+ Attribute "ShortNickName" "" "HP Officejet 9100 Series hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 9100 series;DES:officejet 9100 series;"
PCFileName "hp-officejet_9100_series-pcl3.ppd"
Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)"
Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)"
-@@ -14902,7 +14905,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -20057,7 +20057,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"
+ Attribute "ShortNickName" "" "HP Business Inkjet 2800 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2800;DES:hp business inkjet 2800;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2800;DES:Hewlett-Packard Business Inkjet 2800;"
PCFileName "hp-business_inkjet_2800-pcl3.ppd"
Attribute "Product" "" "(HP Business Inkjet 2800 Printer)"
Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)"
-@@ -15445,7 +15448,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -20600,7 +20600,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet Lx"
Attribute "NickName" "" "HP Officejet Lx, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet Lx"
+ Attribute "ShortNickName" "" "HP Officejet Lx hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet lx;DES:officejet lx;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet;DES:officejet lx;"
PCFileName "hp-officejet_lx.ppd"
Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)"
}
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;"
- PCFileName "hp-officejet_series_300.ppd"
- Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)"
- }
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;"
-+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;"
- PCFileName "hp-deskjet_400.ppd"
- Attribute "Product" "" "(HP Deskjet 400 Printer)"
- Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)"
-@@ -15615,7 +15618,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -20737,7 +20737,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 540"
Attribute "NickName" "" "HP Deskjet 540, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 540"
+ Attribute "ShortNickName" "" "HP Deskjet 540 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 540;DES:deskjet 540;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 540;DES:Hewlett-Packard DeskJet 540;"
PCFileName "hp-deskjet_540.ppd"
Attribute "Product" "" "(HP Deskjet 540 Printer)"
}
-@@ -15740,7 +15743,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -20745,7 +20745,7 @@ Group "RLT/HP Real Life Technologies"
+ ModelName "HP Deskjet 400"
+ Attribute "NickName" "" "HP Deskjet 400, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Deskjet 400 hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;"
+ PCFileName "hp-deskjet_400.ppd"
+ Attribute "Product" "" "(HP Deskjet 400 Printer)"
+ Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)"
+@@ -20762,7 +20762,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 hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;"
++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;"
+ PCFileName "hp-officejet_series_300.ppd"
+ Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)"
+ }
+@@ -20895,7 +20895,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 630c"
Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 630c"
+ Attribute "ShortNickName" "" "HP Deskjet 630c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 630c;DES:deskjet 630c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 630C;DES:Hewlett-Packard DeskJet 630C;"
PCFileName "hp-deskjet_630c.ppd"
Attribute "Product" "" "(HP Deskjet 630c Printer)"
}
-@@ -15756,7 +15759,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -20911,7 +20911,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 656c"
Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 656c"
+ Attribute "ShortNickName" "" "HP Deskjet 656c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 656c;DES:deskjet 656c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 656C;DES:DESKJET 656C;"
PCFileName "hp-deskjet_656c.ppd"
Attribute "Product" "" "(HP Deskjet 656c Printer)"
Attribute "Product" "" "(HP Deskjet 656cvr Printer)"
-@@ -15869,7 +15872,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21024,7 +21024,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 600"
Attribute "NickName" "" "HP Deskjet 600, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 600"
+ Attribute "ShortNickName" "" "HP Deskjet 600 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 600;DES:deskjet 600;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;"
PCFileName "hp-deskjet_600.ppd"
Attribute "Product" "" "(HP Deskjet 600c Printer)"
Attribute "Product" "" "(HP Deskjet 600 Printer)"
-@@ -15931,7 +15934,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21065,7 +21065,7 @@ Group "RLT/HP Real Life Technologies"
+ ModelName "HP Deskjet 670c"
+ Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Deskjet 670c hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;"
++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;"
+ PCFileName "hp-deskjet_670c.ppd"
+ Attribute "Product" "" "(HP Deskjet 670c Printer)"
+ }
+@@ -21137,7 +21137,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"
+ Attribute "ShortNickName" "" "HP Officejet Series 600 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 600;DES:officejet series 600;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 600;DES:officejet series 600;"
PCFileName "hp-officejet_series_600.ppd"
Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)"
}
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;"
-+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;"
- PCFileName "hp-deskjet_670c.ppd"
- Attribute "Product" "" "(HP Deskjet 670c)"
- }
-@@ -16127,7 +16130,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21282,7 +21282,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 610c"
Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 610c"
+ Attribute "ShortNickName" "" "HP Deskjet 610c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 610c;DES:deskjet 610c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;"
PCFileName "hp-deskjet_610c.ppd"
Attribute "Product" "" "(HP Deskjet 610c Printer)"
}
-@@ -16151,7 +16154,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21306,7 +21306,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 640c"
Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 640c"
+ Attribute "ShortNickName" "" "HP Deskjet 640c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 640c;DES:deskjet 640c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;"
PCFileName "hp-deskjet_640c.ppd"
Attribute "Product" "" "(HP Deskjet 640c Lite Printer)"
Attribute "Product" "" "(HP Deskjet 640c Printer)"
-@@ -16171,7 +16174,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21335,7 +21335,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 690c"
Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 690c"
+ Attribute "ShortNickName" "" "HP Deskjet 690c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 690c;DES:deskjet 690c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;"
PCFileName "hp-deskjet_690c.ppd"
Attribute "Product" "" "(HP Deskjet 690c Plus Printer)"
Attribute "Product" "" "(HP Deskjet 690c Printer)"
-@@ -16231,7 +16234,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21386,7 +21386,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"
+ Attribute "ShortNickName" "" "HP Officejet Series 700 hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 700;DES:officejet series 700;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 700;DES:officejet series 700;"
PCFileName "hp-officejet_series_700.ppd"
Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)"
}
-@@ -16382,7 +16385,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21537,7 +21537,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 812c"
Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 812c"
+ Attribute "ShortNickName" "" "HP Deskjet 812c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 812c;DES:deskjet 812c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;"
PCFileName "hp-deskjet_812c.ppd"
Attribute "Product" "" "(HP Deskjet 812c Printer)"
}
-@@ -16390,7 +16393,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21545,7 +21545,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 815c"
Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 815c"
+ Attribute "ShortNickName" "" "HP Deskjet 815c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 815c;DES:deskjet 815c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;"
PCFileName "hp-deskjet_815c.ppd"
Attribute "Product" "" "(HP Deskjet 815c Printer)"
}
-@@ -16422,7 +16425,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21577,7 +21577,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 840c"
Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 840c"
+ Attribute "ShortNickName" "" "HP Deskjet 840c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 840c;DES:deskjet 840c;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 840C;DES:deskjet 840c;"
PCFileName "hp-deskjet_840c.ppd"
Attribute "Product" "" "(HP Deskjet 840c Printer)"
}
-@@ -16430,7 +16433,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21585,7 +21585,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 841c"
Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 841c"
+ Attribute "ShortNickName" "" "HP Deskjet 841c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 841c;DES:deskjet 841c;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 841C;DES:deskjet 841c;"
PCFileName "hp-deskjet_841c.ppd"
Attribute "Product" "" "(HP Deskjet 841c Printer)"
}
-@@ -16446,7 +16449,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21601,7 +21601,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 843c"
Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 843c"
+ Attribute "ShortNickName" "" "HP Deskjet 843c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 843c;DES:deskjet 843c;"
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 843C;DES:deskjet 843c;"
PCFileName "hp-deskjet_843c.ppd"
Attribute "Product" "" "(HP Deskjet 843c Printer)"
Attribute "Product" "" "(HP Deskjet 843cxe Printer)"
-@@ -16455,7 +16458,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21610,7 +21610,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 880c"
Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 880c"
+ Attribute "ShortNickName" "" "HP Deskjet 880c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 880c;DES:deskjet 880c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;"
PCFileName "hp-deskjet_880c.ppd"
Attribute "Product" "" "(HP Deskjet 880c Printer)"
}
-@@ -16471,7 +16474,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21626,7 +21626,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 895c"
Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 895c"
+ Attribute "ShortNickName" "" "HP Deskjet 895c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 895c;DES:deskjet 895c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;"
PCFileName "hp-deskjet_895c.ppd"
Attribute "Product" "" "(HP Deskjet 895cse Printer)"
Attribute "Product" "" "(HP Deskjet 895c Printer)"
-@@ -16481,7 +16484,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21636,7 +21636,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r40"
Attribute "NickName" "" "HP Officejet r40, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet r40"
+ Attribute "ShortNickName" "" "HP Officejet r40 hpijs"
- 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"
+@@ -21660,7 +21660,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r60"
Attribute "NickName" "" "HP Officejet r60, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet r60"
+ Attribute "ShortNickName" "" "HP Officejet r60 hpijs"
- 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"
+@@ -21668,7 +21668,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r65"
Attribute "NickName" "" "HP Officejet r65, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet r65"
+ Attribute "ShortNickName" "" "HP Officejet r65 hpijs"
- 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"
+@@ -21676,7 +21676,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Officejet r80"
Attribute "NickName" "" "HP Officejet r80, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet r80"
+ Attribute "ShortNickName" "" "HP Officejet r80 hpijs"
- 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"
+@@ -21692,7 +21692,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 "ShortNickName" "" "HP Officejet T Series hpijs"
- 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"
+ Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)"
+ Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)"
+@@ -21703,7 +21703,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP PSC 500"
Attribute "NickName" "" "HP PSC 500, hpcups $Version"
- Attribute "ShortNickName" "" "HP PSC 500"
+ Attribute "ShortNickName" "" "HP PSC 500 hpijs"
- 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"
+@@ -21819,7 +21819,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 825c"
Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 825c"
+ Attribute "ShortNickName" "" "HP Deskjet 825c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 825c;DES:deskjet 825c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;"
PCFileName "hp-deskjet_825c.ppd"
Attribute "Product" "" "(HP Deskjet 825cvr Printer)"
Attribute "Product" "" "(HP Deskjet 825c Printer)"
-@@ -16673,7 +16676,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21828,7 +21828,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 845c"
Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 845c"
+ Attribute "ShortNickName" "" "HP Deskjet 845c hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 845c;DES:deskjet 845c;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;"
PCFileName "hp-deskjet_845c.ppd"
Attribute "Product" "" "(HP Deskjet 845c Printer)"
Attribute "Product" "" "(HP Deskjet 845cvr Printer)"
-@@ -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"
-- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;"
-+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;"
- PCFileName "hp-officejet_pro_1150c.ppd"
- Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)"
- Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)"
-@@ -16793,7 +16796,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21939,7 +21939,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 850c"
Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 850c"
+ Attribute "ShortNickName" "" "HP Deskjet 850c hpijs"
- 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"
+@@ -21958,7 +21958,7 @@ Group "RLT/HP Real Life Technologies"
ModelName "HP Deskjet 870c"
Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version"
- Attribute "ShortNickName" "" "HP Deskjet 870c"
+ Attribute "ShortNickName" "" "HP Deskjet 870c hpijs"
- 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"
+@@ -21969,7 +21969,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 hpijs"
+- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;"
++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;"
+ PCFileName "hp-officejet_pro_1150c.ppd"
+ Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)"
+ Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)"
+@@ -22083,7 +22083,7 @@ Group "RLT/HP Real Life Technologies"
+ ModelName "HP Deskjet 890c"
+ Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version"
+ Attribute "ShortNickName" "" "HP Deskjet 890c hpijs"
+- 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)"
+@@ -22092,7 +22092,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"
+ Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series hpijs"
- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;"
+ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;"
PCFileName "hp-officejet_pro_1170c_series.ppd"
Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)"
Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)"
-@@ -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)"
\ No newline at end of file
diff --git a/hardware/printer/hplip/files/fedora/hplip-deviceIDs-ppd.patch b/hardware/printer/hplip/files/fedora/hplip-deviceIDs-ppd.patch
old mode 100755
new mode 100644
index 221a4bd229..810fdc301e
--- a/hardware/printer/hplip/files/fedora/hplip-deviceIDs-ppd.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-deviceIDs-ppd.patch
@@ -8,4 +8,4 @@ diff -up hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid
+*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
\ No newline at end of file
+ *UIConstraints: *HPOption_Tray3 False *InputSlot Tray3
diff --git a/hardware/printer/hplip/files/fedora/hplip-dj990c-margin.patch b/hardware/printer/hplip/files/fedora/hplip-dj990c-margin.patch
index 3e871723b0..1091384424 100644
--- a/hardware/printer/hplip/files/fedora/hplip-dj990c-margin.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-dj990c-margin.patch
@@ -12,4 +12,4 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.dj990c-margin hplip-3.14.10/prnt/d
+ CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice"
"<>setpagedevice"
CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice"
- "<>setpagedevice"
\ No newline at end of file
+ "<>setpagedevice"
diff --git a/hardware/printer/hplip/files/fedora/hplip-hpcups-sigpipe.patch b/hardware/printer/hplip/files/fedora/hplip-hpcups-sigpipe.patch
old mode 100755
new mode 100644
diff --git a/hardware/printer/hplip/files/fedora/hplip-hpijs-marker-supply.patch b/hardware/printer/hplip/files/fedora/hplip-hpijs-marker-supply.patch
old mode 100755
new mode 100644
diff --git a/hardware/printer/hplip/files/fedora/hplip-jpeg-compression.patch b/hardware/printer/hplip/files/fedora/hplip-jpeg-compression.patch
new file mode 100644
index 0000000000..0584834d8a
--- /dev/null
+++ b/hardware/printer/hplip/files/fedora/hplip-jpeg-compression.patch
@@ -0,0 +1,17 @@
+diff -up hplip-3.17.11/scan.py.jpeg-compression hplip-3.17.11/scan.py
+--- hplip-3.17.11/scan.py.jpeg-compression 2018-01-08 09:26:42.547072815 +0100
++++ hplip-3.17.11/scan.py 2018-01-08 09:29:39.753604411 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2003-2015 HP Development Company, L.P.
+@@ -1079,6 +1079,7 @@ try:
+ log.info("Saving to file %s" % output)
+
+ try:
++ im = im.convert("RGB")
+ im.save(output)
+ except IOError as e:
+ log.error("Error saving file: %s (I/O)" % e)
diff --git a/hardware/printer/hplip/files/fedora/hplip-log-stderr.patch b/hardware/printer/hplip/files/fedora/hplip-log-stderr.patch
index 93ae3d672c..6c0749f23b 100644
--- a/hardware/printer/hplip/files/fedora/hplip-log-stderr.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-log-stderr.patch
@@ -34,4 +34,4 @@ diff -up hplip-3.15.2/prnt/filters/hpps.log-stderr hplip-3.15.2/prnt/filters/hpp
+ sys.stderr.write("INFO: %s\n" % msg)
if os.path.exists(config_file):
- config = configparser.ConfigParser()
\ No newline at end of file
+ config = configparser.ConfigParser()
diff --git a/hardware/printer/hplip/files/fedora/hplip-logdir.patch b/hardware/printer/hplip/files/fedora/hplip-logdir.patch
old mode 100755
new mode 100644
index 6e2b2a2266..bbfab9bd41
--- a/hardware/printer/hplip/files/fedora/hplip-logdir.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-logdir.patch
@@ -21,4 +21,4 @@ diff -up hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.15.2/prnt/hp
+ 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)
- {
\ No newline at end of file
+ {
diff --git a/hardware/printer/hplip/files/fedora/hplip-no-asm.patch b/hardware/printer/hplip/files/fedora/hplip-no-asm.patch
old mode 100755
new mode 100644
index 62e9d45714..1240c17da1
--- a/hardware/printer/hplip/files/fedora/hplip-no-asm.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-no-asm.patch
@@ -33,4 +33,4 @@ diff -up hplip-3.9.8/scan/sane/common.h.no-asm hplip-3.9.8/scan/sane/common.h
#define OK 1
#define ERROR 0
#define MAX_LIST_SIZE 32
-diff -up hplip-3.9.8/scan/sane/hpaio.c.no-asm hplip-3.9.8/scan/sane/hpaio.c
\ No newline at end of file
+diff -up hplip-3.9.8/scan/sane/hpaio.c.no-asm hplip-3.9.8/scan/sane/hpaio.c
diff --git a/hardware/printer/hplip/files/fedora/hplip-no-write-bytecode.patch b/hardware/printer/hplip/files/fedora/hplip-no-write-bytecode.patch
index e8f9ad2d06..55d6147c9b 100644
--- a/hardware/printer/hplip/files/fedora/hplip-no-write-bytecode.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-no-write-bytecode.patch
@@ -24,4 +24,4 @@ diff -up hplip-3.15.11/prnt/filters/hpps.no-write-bytecode hplip-3.15.9/prnt/fil
+#!/usr/bin/env python -B
# -*- coding: utf-8 -*-
#
- # (c) Copyright 2003-2015 HP Development Company, L.P.
\ No newline at end of file
+ # (c) Copyright 2003-2015 HP Development Company, L.P.
diff --git a/hardware/printer/hplip/files/fedora/hplip-noernie.patch b/hardware/printer/hplip/files/fedora/hplip-noernie.patch
new file mode 100644
index 0000000000..4ac83b4860
--- /dev/null
+++ b/hardware/printer/hplip/files/fedora/hplip-noernie.patch
@@ -0,0 +1,64 @@
+diff -up hplip-3.17.4/Makefile.am.no-ernie hplip-3.17.4/Makefile.am
+--- hplip-3.17.4/Makefile.am.no-ernie 2017-04-26 16:28:35.398099978 +0200
++++ hplip-3.17.4/Makefile.am 2017-04-26 16:29:02.235879035 +0200
+@@ -519,7 +519,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
+ prnt/hpcups/Mode2.cpp prnt/hpcups/Mode2.h prnt/hpcups/Mode3.cpp prnt/hpcups/Mode3.h \
+ prnt/hpcups/Mode9.cpp prnt/hpcups/Mode9.h prnt/hpcups/Mode10.cpp prnt/hpcups/Mode10.h \
+ prnt/hpcups/ModeDeltaPlus.cpp prnt/hpcups/ModeDeltaPlus.h prnt/hpcups/ModeJbig.cpp prnt/hpcups/ModeJbig.h \
+- prnt/hpcups/ErnieFilter.cpp prnt/hpcups/ErnieFilter.h prnt/hpcups/EncapsulatorFactory.cpp prnt/hpcups/EncapsulatorFactory.h \
++ prnt/hpcups/EncapsulatorFactory.cpp prnt/hpcups/EncapsulatorFactory.h \
+ prnt/hpcups/Encapsulator.cpp prnt/hpcups/Encapsulator.h prnt/hpcups/Pcl3.cpp prnt/hpcups/Pcl3.h \
+ prnt/hpcups/Pcl3Gui.cpp prnt/hpcups/Pcl3Gui.h prnt/hpcups/Pcl3Gui2.cpp prnt/hpcups/Pcl3Gui2.h \
+ prnt/hpcups/LJMono.cpp prnt/hpcups/LJMono.h prnt/hpcups/LJColor.cpp prnt/hpcups/LJColor.h \
+diff -up hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp.no-ernie hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp
+--- hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp.no-ernie 2017-04-26 16:28:39.525066003 +0200
++++ hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp 2017-04-26 16:29:46.987510614 +0200
+@@ -30,7 +30,6 @@
+
+ #include "CommonDefinitions.h"
+ #include "Pcl3Gui2.h"
+-#include "ErnieFilter.h"
+ #include "Mode10.h"
+ #include "Mode9.h"
+ #include "PrinterCommands.h"
+@@ -38,7 +37,6 @@
+ Pcl3Gui2::Pcl3Gui2() : Encapsulator()
+ {
+ speed_mech_enabled = true;
+- m_run_ernie_filter = true;
+ crd_type = eCrd_both;
+ strcpy(m_szLanguage, "PCL3GUI");
+ }
+@@ -59,21 +57,6 @@ DRIVER_ERROR Pcl3Gui2::Configure(Pipelin
+ }
+
+ width = m_pMA->printable_width;;
+- if (m_run_ernie_filter) {
+- ErnieFilter *pErnie;
+-
+- // Normal: threshold = (resolution) * (0.0876) - 2
+- int threshold = ((m_pQA->horizontal_resolution * 876) / 10000) - 2;
+-
+- pErnie = new ErnieFilter (width, eBGRPixelData, threshold);
+- p = new Pipeline (pErnie);
+- if (head) {
+- head->AddPhase (p);
+- }
+- else {
+- head = p;
+- }
+- }
+
+ if (crd_type != eCrd_black_only) {
+ Mode10 *pMode10;
+diff -up hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h.no-ernie hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h
+--- hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h.no-ernie 2017-04-26 16:28:43.277035115 +0200
++++ hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h 2017-04-26 16:30:05.826355522 +0200
+@@ -60,7 +60,6 @@ private:
+ DRIVER_ERROR encapsulateRaster(BYTE *input_raster, unsigned int num_bytes, COLORTYPE c_type);
+ bool speed_mech_enabled;
+ int page_number;
+- bool m_run_ernie_filter;
+ eCrdType crd_type;
+ };
+
diff --git a/hardware/printer/hplip/files/fedora/hplip-ppd-ImageableArea.patch b/hardware/printer/hplip/files/fedora/hplip-ppd-ImageableArea.patch
old mode 100755
new mode 100644
index a64ab26fd7..7394bb79bf
--- a/hardware/printer/hplip/files/fedora/hplip-ppd-ImageableArea.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-ppd-ImageableArea.patch
@@ -456,4 +456,4 @@ diff -up hplip-3.14.3/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea hplip
+*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76"
*da.ImageableArea Env10/Konvolut Comm10: ""
*de.ImageableArea Env10/Umschlag Comm10: ""
- *es.ImageableArea Env10/Sobre Comm10: ""
\ No newline at end of file
+ *es.ImageableArea Env10/Sobre Comm10: ""
diff --git a/hardware/printer/hplip/files/fedora/hplip-pstotiff-is-rubbish.patch b/hardware/printer/hplip/files/fedora/hplip-pstotiff-is-rubbish.patch
old mode 100755
new mode 100644
index 57fbcfd125..014e2cfafb
--- a/hardware/printer/hplip/files/fedora/hplip-pstotiff-is-rubbish.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-pstotiff-is-rubbish.patch
@@ -62,4 +62,4 @@ diff -up hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.15.2/fax/
+RET=$?
+cat "$TMPFILE"
+rm -f "$TMPFILE"
-+exit $RET
\ No newline at end of file
++exit $RET
diff --git a/hardware/printer/hplip/files/fedora/hplip-retry-open.patch b/hardware/printer/hplip/files/fedora/hplip-retry-open.patch
old mode 100755
new mode 100644
index 70688913a6..366710817a
--- a/hardware/printer/hplip/files/fedora/hplip-retry-open.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-retry-open.patch
@@ -13,4 +13,4 @@ diff -up hplip-3.9.12/prnt/backend/hp.c.retry-open hplip-3.9.12/prnt/backend/hp.
-
/* Display user error. */
device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]);
-
\ No newline at end of file
+
diff --git a/hardware/printer/hplip/files/fedora/hplip-scan-tmp.patch b/hardware/printer/hplip/files/fedora/hplip-scan-tmp.patch
index 22fe7daec3..39f2b96fa2 100644
--- a/hardware/printer/hplip/files/fedora/hplip-scan-tmp.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-scan-tmp.patch
@@ -22,4 +22,4 @@ diff -up hplip-3.15.2/scan/sane.py.scan-tmp hplip-3.15.2/scan/sane.py
+ prefix='hpscan')
self.buffer = os.fdopen(self.buffer_fd, "w+b")
self.format = -1
- self.format_name = ''
\ No newline at end of file
+ self.format_name = ''
diff --git a/hardware/printer/hplip/files/fedora/hplip-silence-ioerror.patch b/hardware/printer/hplip/files/fedora/hplip-silence-ioerror.patch
index deda117619..013931b775 100644
--- a/hardware/printer/hplip/files/fedora/hplip-silence-ioerror.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-silence-ioerror.patch
@@ -8,4 +8,5 @@ diff -up hplip-3.15.2/base/logger.py.silence-ioerror hplip-3.15.2/base/logger.py
+ except IOError:
+ pass
finally:
- self._lock.release()
\ No newline at end of file
+ self._lock.release()
+
diff --git a/hardware/printer/hplip/files/fedora/hplip-snmp-quirks.patch b/hardware/printer/hplip/files/fedora/hplip-snmp-quirks.patch
old mode 100755
new mode 100644
index b91dfa9eed..e31b69817d
--- a/hardware/printer/hplip/files/fedora/hplip-snmp-quirks.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-snmp-quirks.patch
@@ -1,21 +1,21 @@
-diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.13.4/prnt/drv/hpcups.drv.in
---- hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks 2013-04-09 12:11:58.447587815 +0200
-+++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-09 12:11:58.594585761 +0200
-@@ -6757,6 +6757,8 @@ Manufacturer "HP"
+diff -up hplip-3.17.11/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.17.11/prnt/drv/hpcups.drv.in
+--- hplip-3.17.11/prnt/drv/hpcups.drv.in.snmp-quirks 2017-12-07 15:21:34.149138400 +0100
++++ hplip-3.17.11/prnt/drv/hpcups.drv.in 2017-12-07 15:33:32.443211804 +0100
+@@ -10831,6 +10831,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a"
+ Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a hpijs"
Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;"
+ // This device lies about its supplies capacity.
+ Attribute "cupsSNMPQuirks" "" "capacity"
PCFileName "hp-officejet_pro_8500_a909a.ppd"
Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)"
}
-@@ -6773,6 +6775,8 @@ Manufacturer "HP"
+@@ -10839,6 +10841,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version"
- Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g"
+ Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g hpijs"
Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;"
+ // This device lies about its supplies capacity.
+ Attribute "cupsSNMPQuirks" "" "capacity"
PCFileName "hp-officejet_pro_8500_a909g.ppd"
Attribute "Product" "" "(HP Officejet Pro 8500 Wireless All-in-one Printer - a909g)"
- }
\ No newline at end of file
+ }
diff --git a/hardware/printer/hplip/files/fedora/hplip-strncpy.patch b/hardware/printer/hplip/files/fedora/hplip-strncpy.patch
index dcd0d7aaf5..eac29b8e98 100644
--- a/hardware/printer/hplip/files/fedora/hplip-strncpy.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-strncpy.patch
@@ -45,4 +45,4 @@ diff -up hplip-3.14.10/prnt/hpijs/hpijsfax.cpp.strncpy hplip-3.14.10/prnt/hpijs/
+ strncpy(user_name, argv[2], sizeof(user_name) - 1);
snprintf(hpFileName,sizeof(hpFileName),"%s/hp_%s_ijsfax_Log_XXXXXX",CUPS_TMP_DIR, user_name);
-
\ No newline at end of file
+
diff --git a/hardware/printer/hplip/files/fedora/hplip-strstr-const.patch b/hardware/printer/hplip/files/fedora/hplip-strstr-const.patch
old mode 100755
new mode 100644
index aea8360d29..f2ac91b26a
--- a/hardware/printer/hplip/files/fedora/hplip-strstr-const.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-strstr-const.patch
@@ -47,4 +47,4 @@ diff -up hplip-3.9.6b/prnt/hpijs/registry.cpp.strstr-const hplip-3.9.6b/prnt/hpi
+ strstr (cmdStr+4, "postscript") ))
{
device = ePScript;
- match = TRUE;
\ No newline at end of file
+ match = TRUE;
diff --git a/hardware/printer/hplip/files/fedora/hplip-typo.patch b/hardware/printer/hplip/files/fedora/hplip-typo.patch
new file mode 100644
index 0000000000..f8a6aca82f
--- /dev/null
+++ b/hardware/printer/hplip/files/fedora/hplip-typo.patch
@@ -0,0 +1,12 @@
+diff -up hplip-3.17.11/firmware.py.typo hplip-3.17.11/firmware.py
+--- hplip-3.17.11/firmware.py.typo 2018-01-12 16:50:10.338366719 +0100
++++ hplip-3.17.11/firmware.py 2018-01-12 16:50:33.563184939 +0100
+@@ -99,7 +99,7 @@ try:
+ if mode == GUI_MODE and (ui_toolkit == 'qt4' or ui_toolkit == 'qt5'):
+ if not utils.canEnterGUIMode4():
+ log.error("%s -u/--gui requires Qt4/Qt5 GUI support. Entering interactive mode." % __mod__)
+- mode = INTERACTIVE_MODE4
++ mode = INTERACTIVE_MODE
+
+ elif mode == GUI_MODE and ui_toolkit == 'qt3':
+ if not utils.canEnterGUIMode():
diff --git a/hardware/printer/hplip/files/fedora/hplip-udev-rules.patch b/hardware/printer/hplip/files/fedora/hplip-udev-rules.patch
old mode 100755
new mode 100644
index 3d33c7c59a..4836054738
--- a/hardware/printer/hplip/files/fedora/hplip-udev-rules.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-udev-rules.patch
@@ -1,13 +1,12 @@
-diff -up hplip-3.15.11/Makefile.am.udev-rules hplip-3.15.11/Makefile.am
---- hplip-3.15.11/Makefile.am.udev-rules 2015-11-12 11:29:04.000000000 +0100
-+++ hplip-3.15.11/Makefile.am 2015-12-10 12:43:11.518518146 +0100
-@@ -118,7 +118,7 @@ rulessystemdir=/usr/lib/systemd/system
- dist_rulessystem_DATA =data/rules/hplip-printer@.service
+diff -up hplip-3.17.11/Makefile.am.udev-rules hplip-3.17.11/Makefile.am
+--- hplip-3.17.11/Makefile.am.udev-rules 2017-12-07 13:44:04.472414453 +0100
++++ hplip-3.17.11/Makefile.am 2017-12-07 15:20:18.544755557 +0100
+@@ -132,7 +132,7 @@ dist_rulessystem_DATA =data/rules/hplip-
# hpmud.rules
+ if !HPLIP_CLASS_DRIVER
-rulesdir = /etc/udev/rules.d
-+rulesdir = /lib/udev/rules.d
++rulesdir = /usr/lib/udev/rules.d
if UDEV_SYSFS_RULES
dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
else
-
diff --git a/hardware/printer/hplip/files/fedora/hplip-ui-optional.patch b/hardware/printer/hplip/files/fedora/hplip-ui-optional.patch
old mode 100755
new mode 100644
index ace9c919c7..fa64da8cff
--- a/hardware/printer/hplip/files/fedora/hplip-ui-optional.patch
+++ b/hardware/printer/hplip/files/fedora/hplip-ui-optional.patch
@@ -1,7 +1,7 @@
-diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py
---- hplip-3.12.11/base/utils.py.ui-optional 2012-11-20 10:55:15.000000000 +0100
-+++ hplip-3.12.11/base/utils.py 2012-11-27 10:03:21.909512264 +0100
-@@ -667,6 +667,13 @@ def checkPyQtImport(): # qt3
+diff -up hplip-3.16.7/base/utils.py.ui-optional hplip-3.16.7/base/utils.py
+--- hplip-3.16.7/base/utils.py.ui-optional 2016-07-15 12:12:28.000000000 +0200
++++ hplip-3.16.7/base/utils.py 2016-08-12 10:12:24.599398769 +0200
+@@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3
if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
no_qt_message_gtk()
@@ -15,13 +15,40 @@ diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py
log.error("PyQt not installed. GUI not available. Exiting.")
return False
-@@ -712,7 +719,8 @@ def checkPyQtImport4():
- import PyQt4
- import ui4
- except ImportError:
-- log.error("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP")
-+ # hplip-gui sub-package (Fedora) requires PyQt4
+@@ -783,7 +790,8 @@ def checkPyQtImport4():
+ import PyQt5
+ import ui5
+ else:
+- log.debug("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP again")
++ # hplip-gui sub-package (Fedora) requires python3-qt5
+ log.error("Install the hplip-gui package for graphical support.")
return False
- else:
- return True
\ No newline at end of file
+ return True
+
+@@ -2434,6 +2442,7 @@ def checkPyQtImport45():
+ except ImportError as e:
+ log.debug(e)
+
++ log.error("Install the hplip-gui package for graphical support.")
+ raise ImportError("GUI Modules PyQt4 and PyQt5 are not installed")
+
+
+@@ -2455,6 +2464,7 @@ def import_dialog(ui_toolkit):
+ return (QApplication, "ui4")
+ except ImportError as e:
+ log.error(e)
++ log.error("Unable to load Qt support. Is hplip-gui package installed?")
+ sys.exit(1)
+ elif ui_toolkit == "qt5":
+ try:
+@@ -2463,9 +2473,7 @@ def import_dialog(ui_toolkit):
+ return (QApplication, "ui5")
+ except ImportError as e:
+ log.error(e)
+- sys.exit(1)
+- else:
+- log.error("Unable to load Qt support. Is it installed?")
++ log.error("Unable to load Qt support. Is hplip-gui package installed?")
+ sys.exit(1)
+
+
diff --git a/hardware/printer/hplip/files/pisilinux/add-pisilinux-support.patch b/hardware/printer/hplip/files/pisilinux/add-pisilinux-support.patch
old mode 100755
new mode 100644
index 80c3b210a1..ebe0d3a7f3
--- a/hardware/printer/hplip/files/pisilinux/add-pisilinux-support.patch
+++ b/hardware/printer/hplip/files/pisilinux/add-pisilinux-support.patch
@@ -1,6 +1,6 @@
diff -Nuar a/installer/distros.dat b/installer/distros.dat
---- a/installer/distros.dat 2014-01-08 11:29:27.000000000 +0200
-+++ b/installer/distros.dat 2014-01-17 11:36:40.776456834 +0200
+--- a/installer/distros.dat 2017-11-23 15:10:13.000000000 +0300
++++ b/installer/distros.dat 2018-02-15 15:04:58.913643271 +0300
@@ -92,7 +92,7 @@
# ****************************************
@@ -10,11 +10,10 @@ diff -Nuar a/installer/distros.dat b/installer/distros.dat
# ****************************************
-@@ -5957,3 +5957,25 @@
-
+@@ -10111,9 +10111,30 @@
[lfs:6:avahi-utils]
packages=avahi
-+
+
+# ****************************************
+[PiSilinux]
+index=51
@@ -34,6 +33,12 @@ diff -Nuar a/installer/distros.dat b/installer/distros.dat
+add_user_to_group=
+policykit=1
+native_cups=1
-+ui_toolkit=qt4
++ui_toolkit=qt5
+acl_rules=1
-\ Dosya sonunda yenisatır yok.
++
+ [lfs:6:automake]
+ packages=automake1.11
+
+ [lfs:6:epm]
+ packages=epm
+-
diff --git a/hardware/printer/hplip/files/pisilinux/orj-add-pisilinux-support.patch b/hardware/printer/hplip/files/pisilinux/orj-add-pisilinux-support.patch
new file mode 100755
index 0000000000..80c3b210a1
--- /dev/null
+++ b/hardware/printer/hplip/files/pisilinux/orj-add-pisilinux-support.patch
@@ -0,0 +1,39 @@
+diff -Nuar a/installer/distros.dat b/installer/distros.dat
+--- a/installer/distros.dat 2014-01-08 11:29:27.000000000 +0200
++++ b/installer/distros.dat 2014-01-17 11:36:40.776456834 +0200
+@@ -92,7 +92,7 @@
+ # ****************************************
+
+ [distros]
+-distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs
++distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,pisilinux
+
+ # ****************************************
+
+@@ -5957,3 +5957,25 @@
+
+ [lfs:6:avahi-utils]
+ packages=avahi
++
++# ****************************************
++[PiSilinux]
++index=51
++versions=1.0
++display=1
++display_name=Pisi
++package_mgrs=pisi
++package_mgr_cmd=su -c "pisi install $packages_to_install"
++hplip_remove_cmd=su -c "pisi remove hplip hplip-gui"
++su_sudo=su
++ppd_install=drv
++udev_mode_fix=1
++ppd_dir=/usr/share/cups/model/HP
++drv_dir=/usr/share/cups/drv/HP
++fix_ppd_symlink=0
++package_available=1
++add_user_to_group=
++policykit=1
++native_cups=1
++ui_toolkit=qt4
++acl_rules=1
+\ Dosya sonunda yenisatır yok.
diff --git a/hardware/printer/hplip/pspec.xml b/hardware/printer/hplip/pspec.xml
index 06ba46749e..e724cc0db4 100755
--- a/hardware/printer/hplip/pspec.xml
+++ b/hardware/printer/hplip/pspec.xml
@@ -12,7 +12,7 @@
MIT
HP Linux Imaging and Printing System
HP Linux Imaging and Printing (HPLIP) System includes printer and scanner drivers and related service tools.
- mirrors://sourceforge/hplip/hplip-3.16.11.tar.gz
+ mirrors://sourceforge/hplip/hplip-3.17.11.tar.gz
patch-ppds.sh
@@ -23,6 +23,7 @@
fedora/hplip-ppd-ImageableArea.patch
+ zlib-devel
libjpeg-turbo-devel
foomatic-db
net-snmp-devel
@@ -37,28 +38,34 @@
fedora/hplip-avahi-parsing.patch
fedora/hplip-bad-low-ink-warning.patch
+ fedora/hplip-check-cups.patch
fedora/hplip-clear-old-state-reasons.patch
-
+ fedora/hplip-colorlaserjet-mfp-m278-m281.patch
+ fedora/hplip-device-reconnected.patch
fedora/hplip-deviceIDs-drv.patch
fedora/hplip-dj990c-margin.patch
+ fedora/hplip-3165-sourceoption.patch
fedora/hplip-hpcups-sigpipe.patch
fedora/hplip-hpijs-marker-supply.patch
+ fedora/hplip-jpeg-compression.patch
fedora/hplip-lineart.patch
fedora/hplip-log-stderr.patch
fedora/hplip-logdir.patch
fedora/hplip-no-asm.patch
fedora/hplip-no-write-bytecode.patch
+ fedora/hplip-noernie.patch
-
+ fedora/hplip-pstotiff-is-rubbish.patch
fedora/hplip-retry-open.patch
fedora/hplip-scan-tmp.patch
fedora/hplip-silence-ioerror.patch
fedora/hplip-snmp-quirks.patch
fedora/hplip-strncpy.patch
- fedora/hplip-udev-rules.patch
+ fedora/hplip-typo.patch
+ fedora/hplip-udev-rules.patch
fedora/hplip-strstr-const.patch
-
+ fedora/hplip-ui-optional.patch
pisilinux/desktop-i18n.patch
@@ -74,6 +81,7 @@
Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
+
hplip
@@ -81,6 +89,7 @@
library
driver
+ zlib
libjpeg-turbo
net-snmp
foomatic-db
@@ -163,6 +172,13 @@
+
+ 2017-04-15
+ 3.17.11
+ Version Bump
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2017-04-09
3.16.11
@@ -192,4 +208,4 @@
alihan@pisilinux.org
-
\ No newline at end of file
+