1 From: Zdenek Dohnal <zdohnal@redhat.com>
2 Date: Fri, 31 Jan 2020 13:50:05 +0100
3 Subject: models.dat: Re-add drivers missing from 3.19.1
5 several printers were removed in 3.19.1, but actually someone still uses them
6 reported upstream https://bugs.launchpad.net/hplip/+bug/1843592
7 bugzillas 1742949, 1740132, 1739855
9 Origin: https://src.fedoraproject.org/rpms/hplip/blob/master/f/hplip-missing-drivers.patch
13 data/models/models.dat | 477 ++++++++++++++++++++++++++++++++++++++++++++++++-
14 prnt/drv/hpcups.drv.in | 16 ++
15 4 files changed, 490 insertions(+), 9 deletions(-)
17 diff --git a/Makefile.in b/Makefile.in
18 index aef0fbc..cdee8e7 100644
21 @@ -1621,6 +1621,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \
22 ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
23 ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
24 ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
25 + ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
26 ppd/hpcups/hp-laserjet_m1005.ppd.gz \
27 ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
28 ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
29 @@ -1738,6 +1739,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \
30 ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
31 ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
32 ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
33 + ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
34 ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
35 ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
36 ppd/hpcups/hp-laserjet_tank_250x.ppd.gz \
37 @@ -4106,6 +4108,7 @@ dist_unrel_DATA =
38 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
39 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
40 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
41 +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
42 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m1005.ppd.gz \
43 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
44 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
45 @@ -4222,6 +4225,7 @@ dist_unrel_DATA =
46 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
47 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
48 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
49 +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
50 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
51 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
52 @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
53 diff --git a/cups_drv.inc b/cups_drv.inc
54 index a87ea98..e39bde4 100644
57 @@ -411,6 +411,7 @@ cups_ppd_printers = \
58 ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
59 ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
60 ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
61 + ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
62 ppd/hpcups/hp-laserjet_m1005.ppd.gz \
63 ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
64 ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
65 @@ -527,6 +528,7 @@ cups_ppd_printers = \
66 ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
67 ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
68 ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
69 + ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
70 ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
71 ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
72 ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
73 diff --git a/data/models/models.dat b/data/models/models.dat
74 index 12e9a08..7d9650b 100644
75 --- a/data/models/models.dat
76 +++ b/data/models/models.dat
77 @@ -2104,7 +2104,7 @@ usb-pid=411
81 -[hp_laserjet_100_colormfp_m175]
82 +[hp_laserjet_100_colormfp_m175nw]
86 @@ -2119,14 +2119,6 @@ io-support=14
89 model1=HP LaserJet 100 Color MFP M175
90 -model2=HP LaserJet 100 Color MFP M175a
91 -model3=HP LaserJet 100 Color MFP M175b
92 -model4=HP LaserJet 100 Color MFP M175c
93 -model5=HP LaserJet 100 Color MFP M175e
94 -model6=HP LaserJet 100 Color MFP M175nw
95 -model7=HP LaserJet 100 Color MFP M175p
96 -model8=HP LaserJet 100 Color MFP M175q
97 -model9=HP LaserJet 100 Color MFP M175r
98 ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
101 @@ -2165,6 +2157,378 @@ usb-pid=62a
105 +[hp_laserjet_100_colormfp_m175r]
110 +embedded-server-type=1
113 +icon=hp_color_laserjet_cm1312_mfp.png
119 +model1=HP LaserJet 100 Color MFP M175
120 +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
130 +r0-agent1-sku=CE310A
133 +r0-agent2-sku=CE311A
136 +r0-agent3-sku=CE313A
139 +r0-agent4-sku=CE312A
143 +status-battery-check=0
144 +status-dynamic-counters=0
146 +support-released=True
147 +support-subtype=219b2b
150 +tech-class=Postscript
151 +family-class=Undefined
152 +tech-subclass=Normal
158 +[hp_laserjet_100_colormfp_m175q]
163 +embedded-server-type=1
166 +icon=hp_color_laserjet_cm1312_mfp.png
172 +model1=HP LaserJet 100 Color MFP M175
173 +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
183 +r0-agent1-sku=CE310A
186 +r0-agent2-sku=CE311A
189 +r0-agent3-sku=CE313A
192 +r0-agent4-sku=CE312A
196 +status-battery-check=0
197 +status-dynamic-counters=0
199 +support-released=True
200 +support-subtype=219b2b
203 +tech-class=Postscript
204 +family-class=Undefined
205 +tech-subclass=Normal
211 +[hp_laserjet_100_colormfp_m175p]
216 +embedded-server-type=1
219 +icon=hp_color_laserjet_cm1312_mfp.png
225 +model1=HP LaserJet 100 Color MFP M175
226 +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
236 +r0-agent1-sku=CE310A
239 +r0-agent2-sku=CE311A
242 +r0-agent3-sku=CE313A
245 +r0-agent4-sku=CE312A
249 +status-battery-check=0
250 +status-dynamic-counters=0
252 +support-released=True
253 +support-subtype=219b2b
256 +tech-class=Postscript
257 +family-class=Undefined
258 +tech-subclass=Normal
264 +[hp_laserjet_100_colormfp_m175e]
269 +embedded-server-type=1
272 +icon=hp_color_laserjet_cm1312_mfp.png
278 +model1=HP LaserJet 100 Color MFP M175
279 +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
289 +r0-agent1-sku=CE310A
292 +r0-agent2-sku=CE311A
295 +r0-agent3-sku=CE313A
298 +r0-agent4-sku=CE312A
302 +status-battery-check=0
303 +status-dynamic-counters=0
305 +support-released=True
306 +support-subtype=219b2b
309 +tech-class=Postscript
310 +family-class=Undefined
311 +tech-subclass=Normal
317 +[hp_laserjet_100_colormfp_m175a]
322 +embedded-server-type=1
323 +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
324 +family-ppd=hp-postscript-laserjet-pro.ppd
327 +icon=hp_color_laserjet_cm1312_mfp.png
333 +model1=HP LaserJet 100 Color MFP M175
343 +r0-agent1-sku=CE310A
346 +r0-agent2-sku=CE311A
349 +r0-agent3-sku=CE313A
352 +r0-agent4-sku=CE312A
356 +status-battery-check=0
357 +status-dynamic-counters=0
359 +support-released=True
360 +support-subtype=219b2b
363 +tech-class=Postscript
364 +family-class=Undefined
365 +tech-subclass=Normal
371 +[hp_laserjet_100_colormfp_m175c]
376 +embedded-server-type=1
379 +icon=hp_color_laserjet_cm1312_mfp.png
385 +model1=HP LaserJet 100 Color MFP M175
386 +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
396 +r0-agent1-sku=CE310A
399 +r0-agent2-sku=CE311A
402 +r0-agent3-sku=CE313A
405 +r0-agent4-sku=CE312A
409 +status-battery-check=0
410 +status-dynamic-counters=0
412 +support-released=True
413 +support-subtype=219b2b
416 +tech-class=Postscript
417 +family-class=Undefined
418 +tech-subclass=Normal
424 +[hp_laserjet_100_colormfp_m175b]
429 +embedded-server-type=1
432 +icon=hp_color_laserjet_cm1312_mfp.png
438 +model1=HP LaserJet 100 Color MFP M175
439 +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
449 +r0-agent1-sku=CE310A
452 +r0-agent2-sku=CE311A
455 +r0-agent3-sku=CE313A
458 +r0-agent4-sku=CE312A
462 +status-battery-check=0
463 +status-dynamic-counters=0
465 +support-released=True
466 +support-subtype=219b2b
469 +tech-class=Postscript
470 +family-class=Undefined
471 +tech-subclass=Normal
477 [officejet_100_mobile_l411]
480 @@ -17867,6 +18231,58 @@ usb-pid=2c17
484 +[hp_laserjet_cp_1025nw]
489 +embedded-server-type=1
492 +icon=hp_color_laserjet_cp2025.png
498 +model1=HP LaserJet Pro CP 1025nw Color Printer Series
508 +r0-agent1-sku=CE310A
511 +r0-agent2-sku=CE311A
514 +r0-agent3-sku=CE313A
517 +r0-agent4-sku=CE312A
521 +status-battery-check=0
522 +status-dynamic-counters=0
524 +support-released=True
525 +support-subtype=219b2b
528 +tech-class=LJZjsColor
529 +family-class=LJ-Class4
530 +tech-subclass=Advanced
536 [hp_laserjet_cp1025nw]
539 @@ -18468,6 +18884,49 @@ usb-pid=3011
543 +[hp_laserjet_professional_p1102w]
548 +embedded-server-type=0
551 +icon=HP_LaserJet_1012.png
557 +model1=HP LaserJet Professional P1102w Printer
571 +status-battery-check=0
572 +status-dynamic-counters=0
574 +support-released=True
575 +support-subtype=219b2b
578 +tech-class=LJZjsMono
579 +family-class=LJ-Class4
580 +tech-subclass=NoAutoDuplex
586 [hp_laserjet_professional_p1102]
589 diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in
590 index 494758d..af65389 100644
591 --- a/prnt/drv/hpcups.drv.in
592 +++ b/prnt/drv/hpcups.drv.in
593 @@ -22688,6 +22688,14 @@ Group "RLT/HP Real Life Technologies"
594 Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)"
595 Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)"
598 + ModelName "HP LaserJet Professional p1102w"
599 + Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin"
600 + Attribute "ShortNickName" "" "HP LaserJet Professional p1102w hpijs"
601 + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;"
602 + PCFileName "hp-laserjet_professional_p1102w.ppd"
603 + Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)"
606 ModelName "HP LaserJet Professional p1106"
607 Attribute "NickName" "" "HP LaserJet Professional p1106, hpcups $Version"
608 @@ -23122,6 +23130,14 @@ Group "RLT/HP Real Life Technologies"
609 PCFileName "hp-laserjet_cp1025nw.ppd"
610 Attribute "Product" "" "(HP LaserJet Pro cp1025nw Color Printer Series)"
613 + ModelName "HP LaserJet Cp 1025nw"
614 + Attribute "NickName" "" "HP LaserJet Cp 1025nw, hpcups $Version, requires proprietary plugin"
615 + Attribute "ShortNickName" "" "HP LaserJet Cp 1025nw hpijs"
616 + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet cp 1025nw;DES:hp laserjet cp 1025nw;"
617 + PCFileName "hp-laserjet_cp_1025nw.ppd"
618 + Attribute "Product" "" "(HP LaserJet Pro Cp 1025nw Color Printer Series)"
621 } // End LJZjsColor (for proprietary plugin)