From 6fc5b7a9915995ed3128197fa043de8d4a489f90 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Tue, 1 Mar 2011 18:33:31 +0100
Subject: [PATCH] Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).

Corrected IEEE 1284 Device IDs:
LaserJet 1300 (bug #670548)
LaserJet 3390 (bug #678565)
LaserJet P1505 (bug #680951)
---
 hplip-deviceIDs-drv.patch | 277 ++++++++++++++++++++------------------
 hplip-deviceIDs-ppd.patch |  44 ++++++
 hplip-wifisetup.patch     |  12 ++
 hplip.spec                |  14 +-
 4 files changed, 212 insertions(+), 135 deletions(-)
 create mode 100644 hplip-wifisetup.patch

diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch
index 1953f2b..7235be3 100644
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
@@ -1,6 +1,6 @@
-diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv/hpcups.drv.in
---- hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv	2010-09-26 19:09:24.000000000 +0200
-+++ hplip-3.10.9/prnt/drv/hpcups.drv.in	2010-12-03 17:28:05.000000000 +0100
+diff -up hplip-3.11.1/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.11.1/prnt/drv/hpcups.drv.in
+--- hplip-3.11.1/prnt/drv/hpcups.drv.in.deviceIDs-drv	2011-01-19 06:20:01.000000000 +0100
++++ hplip-3.11.1/prnt/drv/hpcups.drv.in	2011-03-01 16:15:05.000000000 +0100
 @@ -442,7 +442,7 @@ Manufacturer "HP"
        ModelName "HP Officejet v40xi"
        Attribute "NickName" "" "HP Officejet v40xi, $Version"
@@ -406,7 +406,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_7400_series.ppd"
        Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)"
-@@ -8196,7 +8196,7 @@ Manufacturer "HP"
+@@ -8220,7 +8220,7 @@ Manufacturer "HP"
        ModelName "HP PSC 1100 Series"
        Attribute "NickName" "" "HP PSC 1100 Series, $Version"
        Attribute "ShortNickName" "" "HP PSC 1100 Series"
@@ -415,7 +415,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-psc_1100_series.ppd"
        Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)"
-@@ -8206,7 +8206,7 @@ Manufacturer "HP"
+@@ -8230,7 +8230,7 @@ Manufacturer "HP"
        ModelName "HP PSC 1200 Series"
        Attribute "NickName" "" "HP PSC 1200 Series, $Version"
        Attribute "ShortNickName" "" "HP PSC 1200 Series"
@@ -424,7 +424,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-psc_1200_series.ppd"
        Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)"
-@@ -8389,7 +8389,7 @@ Manufacturer "HP"
+@@ -8413,7 +8413,7 @@ Manufacturer "HP"
        ModelName "HP Deskjet 3940"
        Attribute "NickName" "" "HP Deskjet 3940, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 3940"
@@ -433,7 +433,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_3940.ppd"
        Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)"
        Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)"
-@@ -8398,7 +8398,7 @@ Manufacturer "HP"
+@@ -8422,7 +8422,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 4100 Series"
        Attribute "NickName" "" "HP Officejet 4100 Series, $Version"
        Attribute "ShortNickName" "" "HP Officejet 4100 Series"
@@ -442,7 +442,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_4100_series.ppd"
        Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)"
-@@ -8425,7 +8425,7 @@ Manufacturer "HP"
+@@ -8449,7 +8449,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 4300 Series"
        Attribute "NickName" "" "HP Officejet 4300 Series, $Version"
        Attribute "ShortNickName" "" "HP Officejet 4300 Series"
@@ -451,7 +451,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_4300_series.ppd"
        Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)"
-@@ -8731,7 +8731,7 @@ Manufacturer "HP"
+@@ -8755,7 +8755,7 @@ Manufacturer "HP"
        ModelName "HP Officejet j3600 Series"
        Attribute "NickName" "" "HP Officejet j3600 Series, $Version"
        Attribute "ShortNickName" "" "HP Officejet j3600 Series"
@@ -460,7 +460,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_j3600_series.ppd"
        Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)"
-@@ -8802,7 +8802,7 @@ Manufacturer "HP"
+@@ -8826,7 +8826,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 4200 Series"
        Attribute "NickName" "" "HP Officejet 4200 Series, $Version"
        Attribute "ShortNickName" "" "HP Officejet 4200 Series"
@@ -469,7 +469,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_4200_series.ppd"
        Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)"
-@@ -9299,6 +9299,7 @@ Manufacturer "HP"
+@@ -9323,6 +9323,7 @@ Manufacturer "HP"
        Attribute "NickName" "" "HP Photosmart 380 Series, $Version"
        Attribute "ShortNickName" "" "HP Photosmart 380 Series"
        Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;"
@@ -477,7 +477,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-photosmart_380_series.ppd"
        Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)"
        Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)"
-@@ -9726,7 +9727,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9750,7 +9751,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4 Plus"
        Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4 Plus"
@@ -486,7 +486,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4_plus-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4 Plus Printer)"
        Attribute "Product" "" "(HP LaserJet 4m Plus Printer)"
-@@ -9752,7 +9753,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9776,7 +9777,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5mp"
        Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5mp"
@@ -495,7 +495,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_5mp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 5mp Printer)"
      }
-@@ -9760,7 +9761,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9784,7 +9785,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5l"
        Attribute "NickName" "" "HP LaserJet 5l, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5l"
@@ -504,7 +504,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_5l.ppd"
        Attribute "Product" "" "(HP LaserJet 5l Printer)"
        Attribute "Product" "" "(HP LaserJet 5l-fs Printer)"
-@@ -9770,7 +9771,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9794,7 +9795,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5p"
        Attribute "NickName" "" "HP LaserJet 5p, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5p"
@@ -513,7 +513,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_5p.ppd"
        Attribute "Product" "" "(HP LaserJet 5p Printer)"
      }
-@@ -9778,7 +9779,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9802,7 +9803,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 6l"
        Attribute "NickName" "" "HP LaserJet 6l, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 6l"
@@ -522,7 +522,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_6l.ppd"
        Attribute "Product" "" "(HP LaserJet 6l Printer)"
        Attribute "Product" "" "(HP LaserJet 6lse Printer)"
-@@ -9790,7 +9791,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9814,7 +9815,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 6p"
        Attribute "NickName" "" "HP LaserJet 6p, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 6p"
@@ -531,7 +531,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_6p.ppd"
        Attribute "Product" "" "(HP LaserJet 6p Printer)"
      }
-@@ -9798,7 +9799,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9822,7 +9823,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 6mp"
        Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 6mp"
@@ -540,7 +540,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_6mp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 6mp Printer)"
        Attribute "Product" "" "(HP LaserJet 6mp Se Printer)"
-@@ -9808,7 +9809,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9832,7 +9833,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1015"
        Attribute "NickName" "" "HP LaserJet 1015, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1015"
@@ -549,7 +549,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1015.ppd"
        Attribute "Product" "" "(HP LaserJet 1015 Printer)"
      }
-@@ -9850,7 +9851,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9874,7 +9875,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1100"
        Attribute "NickName" "" "HP LaserJet 1100, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1100"
@@ -558,7 +558,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1100.ppd"
        Attribute "Product" "" "(HP LaserJet 1100 Printer)"
        Attribute "Product" "" "(HP LaserJet 1100se Printer)"
-@@ -9868,7 +9869,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9892,7 +9893,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1150"
        Attribute "NickName" "" "HP LaserJet 1150, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1150"
@@ -567,7 +567,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1150.ppd"
        Attribute "Product" "" "(HP LaserJet 1150 Printer)"
      }
-@@ -9885,7 +9886,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9909,7 +9910,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1160 Series"
        Attribute "NickName" "" "HP LaserJet 1160 Series, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1160 Series"
@@ -576,7 +576,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1160_series.ppd"
        Attribute "Product" "" "(HP LaserJet 1160 Series Printer)"
      }
-@@ -9893,7 +9894,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9917,7 +9918,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1200"
        Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1200"
@@ -585,7 +585,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1200-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 1200 Printer)"
        Attribute "Product" "" "(HP LaserJet 1200se Printer)"
-@@ -9918,7 +9919,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9942,7 +9943,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1220"
        Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1220"
@@ -594,7 +594,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1220-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)"
      }
-@@ -9926,7 +9927,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9950,7 +9951,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1300"
        Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1300"
@@ -603,7 +603,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1300-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 1300 Printer)"
        Attribute "Product" "" "(HP LaserJet 1300t Printer)"
-@@ -9951,7 +9952,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9975,7 +9976,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1320 Series"
        Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1320 Series"
@@ -612,7 +612,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1320_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 1320 Series Printer)"
      }
-@@ -9975,7 +9976,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -9999,7 +10000,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1320"
        Attribute "NickName" "" "HP LaserJet 1320, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1320"
@@ -621,7 +621,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1320.ppd"
        Attribute "Product" "" "(HP LaserJet 1320 Printer)"
        Attribute "Product" "" "(HP LaserJet 1320t Printer)"
-@@ -10048,7 +10049,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10116,7 +10117,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p2015 Series"
        Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet p2015 Series"
@@ -630,7 +630,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_p2015_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet p2015 Printer)"
      }
-@@ -10112,7 +10113,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10180,7 +10181,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2100"
        Attribute "NickName" "" "HP LaserJet 2100, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2100"
@@ -639,7 +639,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_2100.ppd"
        Attribute "Product" "" "(HP LaserJet 2100 Printer)"
        Attribute "Product" "" "(HP LaserJet 2100m Printer)"
-@@ -10124,7 +10125,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10192,7 +10193,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2100 Series"
        Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2100 Series"
@@ -648,7 +648,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_2100_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2100 Series Printer)"
      }
-@@ -10140,7 +10141,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10208,7 +10209,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2200"
        Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2200"
@@ -657,7 +657,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_2200-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2200 Printer)"
        Attribute "Product" "" "(HP LaserJet 2200d Printer)"
-@@ -10153,7 +10154,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10221,7 +10222,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2300"
        Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2300"
@@ -666,7 +666,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_2300-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2300 Printer)"
        Attribute "Product" "" "(HP LaserJet 2300n Printer)"
-@@ -10166,7 +10167,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10234,7 +10235,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2300 Series"
        Attribute "NickName" "" "HP LaserJet 2300 Series, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2300 Series"
@@ -675,7 +675,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_2300_series.ppd"
        Attribute "Product" "" "(HP LaserJet 2300 Series Printer)"
      }
-@@ -10182,7 +10183,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10250,7 +10251,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2420"
        Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2420"
@@ -684,7 +684,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_2420-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2420 Printer)"
        Attribute "Product" "" "(HP LaserJet 2420d Printer)"
-@@ -10193,7 +10194,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10261,7 +10262,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2430"
        Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2430"
@@ -693,7 +693,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_2430-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2430t Printer)"
        Attribute "Product" "" "(HP LaserJet 2430 Printer)"
-@@ -10221,7 +10222,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10289,7 +10290,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p3005"
        Attribute "NickName" "" "HP LaserJet p3005 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet p3005"
@@ -702,7 +702,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_p3005-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet p3005 Printer)"
        Attribute "Product" "" "(HP LaserJet p3005d Printer)"
-@@ -10234,7 +10235,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10302,7 +10303,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p3010 Series"
        Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet p3010 Series"
@@ -711,7 +711,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_p3010_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet p3015 Printer)"
        Attribute "Product" "" "(HP LaserJet p3011 Printer)"
-@@ -10243,7 +10244,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10311,7 +10312,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3015"
        Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3015"
@@ -720,7 +720,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3015-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)"
      }
-@@ -10251,7 +10252,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10319,7 +10320,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3020"
        Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3020"
@@ -729,7 +729,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3020-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)"
      }
-@@ -10259,7 +10260,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10327,7 +10328,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m3027 MFP"
        Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet m3027 MFP"
@@ -738,7 +738,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)"
-@@ -10268,7 +10269,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10336,7 +10337,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3030"
        Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3030"
@@ -747,7 +747,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3030-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)"
      }
-@@ -10276,7 +10277,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10344,7 +10345,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3050"
        Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3050"
@@ -756,7 +756,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3050-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)"
        Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)"
-@@ -10285,7 +10286,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10353,7 +10354,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3052"
        Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3052"
@@ -765,7 +765,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3052-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)"
      }
-@@ -10293,7 +10294,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10361,7 +10362,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3055"
        Attribute "NickName" "" "HP LaserJet 3055, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3055"
@@ -774,7 +774,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3055.ppd"
        Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)"
      }
-@@ -10321,7 +10322,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10389,7 +10390,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3200m"
        Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3200m"
@@ -783,7 +783,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3200m-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)"
      }
-@@ -10337,7 +10338,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10405,7 +10406,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3200"
        Attribute "NickName" "" "HP LaserJet 3200, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3200"
@@ -792,7 +792,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3200.ppd"
        Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)"
      }
-@@ -10357,7 +10358,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10425,7 +10426,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3330"
        Attribute "NickName" "" "HP LaserJet 3330, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3330"
@@ -801,7 +801,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3330.ppd"
        Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)"
      }
-@@ -10365,7 +10366,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10433,7 +10434,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3380"
        Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3380"
@@ -810,7 +810,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3380-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)"
      }
-@@ -10373,7 +10374,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10441,7 +10442,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3390"
        Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3390"
@@ -819,7 +819,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_3390-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)"
      }
-@@ -10389,7 +10390,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10457,7 +10458,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4000 Series"
        Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4000 Series"
@@ -828,7 +828,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4000_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4000 Printer)"
        Attribute "Product" "" "(HP LaserJet 4000n Printer)"
-@@ -10417,7 +10418,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10485,7 +10486,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p4014"
        Attribute "NickName" "" "HP LaserJet p4014, $Version"
        Attribute "ShortNickName" "" "HP LaserJet p4014"
@@ -837,7 +837,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_p4014.ppd"
        Attribute "Product" "" "(HP LaserJet p4014 Printer)"
      }
-@@ -10465,7 +10466,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10533,7 +10534,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4050 Series"
        Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4050 Series"
@@ -846,7 +846,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4050_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4050 Printer)"
        Attribute "Product" "" "(HP LaserJet 4050n Printer)"
-@@ -10477,7 +10478,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10545,7 +10546,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4100 Series"
        Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4100 Series"
@@ -855,7 +855,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4100_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 410dtn Printer)"
        Attribute "Product" "" "(HP LaserJet 4100tn Printer)"
-@@ -10505,7 +10506,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10573,7 +10574,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4200"
        Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4200"
@@ -864,7 +864,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4200-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4200 Printer)"
        Attribute "Product" "" "(HP LaserJet 4200l Printer)"
-@@ -10530,7 +10531,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10598,7 +10599,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4250"
        Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4250"
@@ -873,7 +873,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4250-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4250 Printer)"
        Attribute "Product" "" "(HP LaserJet 4250dtn Printer)"
-@@ -10542,7 +10543,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10610,7 +10611,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4300"
        Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4300"
@@ -882,7 +882,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4300-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4300 Printer)"
        Attribute "Product" "" "(HP LaserJet 4300dtn Printer)"
-@@ -10555,7 +10556,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10623,7 +10624,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4345 MFP"
        Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4345 MFP"
@@ -891,7 +891,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4345_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)"
-@@ -10566,7 +10567,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10634,7 +10635,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m4345 MFP"
        Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet m4345 MFP"
@@ -900,7 +900,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)"
-@@ -10585,7 +10586,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10653,7 +10654,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4350"
        Attribute "NickName" "" "HP LaserJet 4350 pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4350"
@@ -909,7 +909,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_4350-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4350 Printer)"
        Attribute "Product" "" "(HP LaserJet 4350dtn Printer)"
-@@ -10621,7 +10622,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10689,7 +10690,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p4515"
        Attribute "NickName" "" "HP LaserJet p4515, $Version"
        Attribute "ShortNickName" "" "HP LaserJet p4515"
@@ -918,7 +918,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_p4515.ppd"
        Attribute "Product" "" "(HP LaserJet p4515 Printer)"
      }
-@@ -10637,7 +10638,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10705,7 +10706,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5000 Series"
        Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5000 Series"
@@ -927,7 +927,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_5000_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 5000 Series Printer)"
      }
-@@ -10653,7 +10654,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10721,7 +10722,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 8000 Series"
        Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 8000 Series"
@@ -936,7 +936,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_8000_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 8000 Series Printer)"
      }
-@@ -10747,7 +10748,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10815,7 +10816,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5si"
        Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5si"
@@ -945,7 +945,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_5si-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 5si Printer)"
        Attribute "Product" "" "(HP LaserJet 5si Hm Printer)"
-@@ -10783,7 +10784,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10851,7 +10852,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m3035 MFP"
        Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet m3035 MFP"
@@ -954,7 +954,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)"
-@@ -10804,7 +10805,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10872,7 +10873,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m5025 MFP"
        Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet m5025 MFP"
@@ -963,7 +963,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)"
      }
-@@ -10812,7 +10813,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10880,7 +10881,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m5035 MFP"
        Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet m5035 MFP"
@@ -972,7 +972,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)"
-@@ -10830,7 +10831,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10898,7 +10899,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5100 Series"
        Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5100 Series"
@@ -981,7 +981,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_5100_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 5100 Printer)"
        Attribute "Product" "" "(HP LaserJet 5100le Printer)"
-@@ -10861,7 +10862,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10929,7 +10930,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 8000"
        Attribute "NickName" "" "HP LaserJet 8000, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 8000"
@@ -990,7 +990,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_8000.ppd"
        Attribute "Product" "" "(HP LaserJet 8000 Printer)"
        Attribute "Product" "" "(HP LaserJet 8000dn Printer)"
-@@ -10881,7 +10882,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -10949,7 +10950,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 8150 Series"
        Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 8150 Series"
@@ -999,7 +999,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_8150_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 8150 Printer)"
        Attribute "Product" "" "(HP LaserJet 8150n Printer)"
-@@ -11094,7 +11095,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11162,7 +11163,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cm1312nfi MFP"
        Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP"
@@ -1008,7 +1008,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)"
      }
-@@ -11110,7 +11111,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11242,7 +11243,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cp1515n"
        Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cp1515n"
@@ -1017,7 +1017,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)"
      }
-@@ -11118,7 +11119,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11250,7 +11251,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cp1518ni"
        Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni"
@@ -1026,7 +1026,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)"
      }
-@@ -11134,7 +11135,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11266,7 +11267,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cp2025dn"
        Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn"
@@ -1035,7 +1035,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)"
      }
-@@ -11150,7 +11151,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11282,7 +11283,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cp2025n"
        Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cp2025n"
@@ -1044,7 +1044,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)"
      }
-@@ -11158,7 +11159,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11290,7 +11291,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Business Inkjet 2300"
        Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Business Inkjet 2300"
@@ -1053,7 +1053,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-business_inkjet_2300-pcl3.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2300 Printer)"
        Attribute "Product" "" "(HP Business Inkjet 2300n Printer)"
-@@ -11192,7 +11193,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11324,7 +11325,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cm2320nf MFP"
        Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP"
@@ -1062,7 +1062,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)"
      }
-@@ -11200,7 +11201,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11332,7 +11333,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 2500"
        Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet 2500"
@@ -1071,7 +1071,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_2500-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet 2500 Printer)"
      }
-@@ -11241,7 +11242,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11373,7 +11374,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cp3525"
        Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cp3525"
@@ -1080,7 +1080,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cp3525-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)"
        Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)"
-@@ -11252,7 +11253,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11384,7 +11385,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cm3530 MFP"
        Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP"
@@ -1089,7 +1089,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)"
        Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)"
-@@ -11261,7 +11262,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11393,7 +11394,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 3700"
        Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet 3700"
@@ -1098,7 +1098,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_3700-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet 3700 Printer)"
      }
-@@ -11280,7 +11281,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11412,7 +11413,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 3800"
        Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet 3800"
@@ -1107,7 +1107,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_3800-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet 3800 Printer)"
        Attribute "Product" "" "(HP Color LaserJet 3800n Printer)"
-@@ -11319,7 +11320,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11451,7 +11452,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cp4520 Series"
        Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series"
@@ -1116,7 +1116,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)"
      }
-@@ -11327,7 +11328,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11467,7 +11468,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 4550"
        Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet 4550"
@@ -1125,7 +1125,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_4550-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet 4550 Printer)"
        Attribute "Product" "" "(HP Color LaserJet 4550n Printer)"
-@@ -11340,7 +11341,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11480,7 +11481,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 4600 Series"
        Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series"
@@ -1134,7 +1134,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_4600_series.ppd"
        Attribute "Product" "" "(HP Color LaserJet 4600 Printer)"
        Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)"
-@@ -11352,7 +11353,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11492,7 +11493,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 4600"
        Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet 4600"
@@ -1143,7 +1143,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_4600-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)"
      }
-@@ -11368,7 +11369,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11508,7 +11509,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 4650"
        Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet 4650"
@@ -1152,7 +1152,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_4650-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet 4650 Printer)"
        Attribute "Product" "" "(HP Color LaserJet 4650n Printer)"
-@@ -11380,7 +11381,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11520,7 +11521,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 4700"
        Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet 4700"
@@ -1161,7 +1161,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_4700-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet 4700 Printer)"
        Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)"
-@@ -11392,7 +11393,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11532,7 +11533,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet cm4730 MFP"
        Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version"
        Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP"
@@ -1170,7 +1170,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)"
        Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)"
-@@ -11438,7 +11439,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11586,7 +11587,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet 9100 Series"
        Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $Version"
        Attribute "ShortNickName" "" "HP Officejet 9100 Series"
@@ -1179,7 +1179,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_9100_series-pcl3.ppd"
        Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)"
-@@ -11479,7 +11480,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11627,7 +11628,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Business Inkjet 2800"
        Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $Version"
        Attribute "ShortNickName" "" "HP Business Inkjet 2800"
@@ -1188,7 +1188,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-business_inkjet_2800-pcl3.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2800 Printer)"
        Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)"
-@@ -11514,7 +11515,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11662,7 +11663,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Color LaserJet 5550"
          Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, $Version"
          Attribute "ShortNickName" "" "HP Color LaserJet 5550"
@@ -1197,7 +1197,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
          PCFileName "hp-color_laserjet_5550-pcl3.ppd"
          Attribute "Product" "" "(HP Color LaserJet 5550n Printer)"
          Attribute "Product" "" "(HP Color LaserJet 5550 Printer)"
-@@ -11771,7 +11772,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11919,7 +11920,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1010"
        Attribute "NickName" "" "HP LaserJet 1010, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1010"
@@ -1206,7 +1206,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1010.ppd"
        Attribute "Product" "" "(HP LaserJet 1010 Printer)"
      }
-@@ -11779,7 +11780,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -11927,7 +11928,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1012"
        Attribute "NickName" "" "HP LaserJet 1012, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1012"
@@ -1215,7 +1215,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1012.ppd"
        Attribute "Product" "" "(HP LaserJet 1012 Printer)"
      }
-@@ -11987,7 +11988,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12135,7 +12136,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Lx"
        Attribute "NickName" "" "HP Officejet Lx, $Version"
        Attribute "ShortNickName" "" "HP Officejet Lx"
@@ -1224,7 +1224,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_lx.ppd"
        Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)"
      }
-@@ -12151,7 +12152,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12299,7 +12300,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Series 300"
        Attribute "NickName" "" "HP Officejet Series 300, $Version"
        Attribute "ShortNickName" "" "HP Officejet Series 300"
@@ -1233,7 +1233,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_series_300.ppd"
        Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)"
      }
-@@ -12175,7 +12176,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12323,7 +12324,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 400"
        Attribute "NickName" "" "HP Deskjet 400, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 400"
@@ -1242,7 +1242,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_400.ppd"
        Attribute "Product" "" "(HP Deskjet 400 Printer)"
        Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)"
-@@ -12192,7 +12193,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12340,7 +12341,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 540"
        Attribute "NickName" "" "HP Deskjet 540, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 540"
@@ -1251,7 +1251,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_540.ppd"
        Attribute "Product" "" "(HP Deskjet 540 Printer)"
      }
-@@ -12317,7 +12318,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12465,7 +12466,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 630c"
        Attribute "NickName" "" "HP Deskjet 630c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 630c"
@@ -1260,7 +1260,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_630c.ppd"
        Attribute "Product" "" "(HP Deskjet 630c Printer)"
      }
-@@ -12333,7 +12334,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12481,7 +12482,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 656c"
        Attribute "NickName" "" "HP Deskjet 656c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 656c"
@@ -1269,7 +1269,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_656c.ppd"
        Attribute "Product" "" "(HP Deskjet 656c Printer)"
        Attribute "Product" "" "(HP Deskjet 656cvr Printer)"
-@@ -12446,7 +12447,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12594,7 +12595,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Deskjet 600"
          Attribute "NickName" "" "HP Deskjet 600, $Version"
          Attribute "ShortNickName" "" "HP Deskjet 600"
@@ -1278,7 +1278,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
          PCFileName "hp-deskjet_600.ppd"
          Attribute "Product" "" "(HP Deskjet 600c Printer)"
          Attribute "Product" "" "(HP Deskjet 600 Printer)"
-@@ -12468,7 +12469,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12616,7 +12617,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Officejet Series 500"
          Attribute "NickName" "" "HP Officejet Series 500, $Version"
          Attribute "ShortNickName" "" "HP Officejet Series 500"
@@ -1287,7 +1287,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
          PCFileName "hp-officejet_series_500.ppd"
          Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)"
        }
-@@ -12508,7 +12509,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12656,7 +12657,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Officejet Series 600"
          Attribute "NickName" "" "HP Officejet Series 600, $Version"
          Attribute "ShortNickName" "" "HP Officejet Series 600"
@@ -1296,7 +1296,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
          PCFileName "hp-officejet_series_600.ppd"
          Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)"
        }
-@@ -12560,7 +12561,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12708,7 +12709,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Deskjet 670c"
          Attribute "NickName" "" "HP Deskjet 670c, $Version"
          Attribute "ShortNickName" "" "HP Deskjet 670c"
@@ -1305,7 +1305,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
          PCFileName "hp-deskjet_670c.ppd"
          Attribute "Product" "" "(HP Deskjet 670c)"
        }
-@@ -12712,7 +12713,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12860,7 +12861,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 610c"
        Attribute "NickName" "" "HP Deskjet 610c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 610c"
@@ -1314,7 +1314,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_610c.ppd"
        Attribute "Product" "" "(HP Deskjet 610c Printer)"
      }
-@@ -12736,7 +12737,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12884,7 +12885,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 640c"
        Attribute "NickName" "" "HP Deskjet 640c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 640c"
@@ -1323,7 +1323,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_640c.ppd"
        Attribute "Product" "" "(HP Deskjet 640c Lite Printer)"
        Attribute "Product" "" "(HP Deskjet 640c Printer)"
-@@ -12756,7 +12757,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12904,7 +12905,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 690c"
        Attribute "NickName" "" "HP Deskjet 690c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 690c"
@@ -1332,7 +1332,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_690c.ppd"
        Attribute "Product" "" "(HP Deskjet 690c Plus Printer)"
        Attribute "Product" "" "(HP Deskjet 690c Printer)"
-@@ -12816,7 +12817,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12964,7 +12965,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Series 700"
        Attribute "NickName" "" "HP Officejet Series 700, $Version"
        Attribute "ShortNickName" "" "HP Officejet Series 700"
@@ -1341,7 +1341,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_series_700.ppd"
        Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)"
      }
-@@ -12959,7 +12960,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13107,7 +13108,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet T Series"
        Attribute "NickName" "" "HP Officejet T Series, $Version"
        Attribute "ShortNickName" "" "HP Officejet T Series"
@@ -1350,7 +1350,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_t_series.ppd"
        Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)"
-@@ -12970,7 +12971,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13118,7 +13119,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r40"
        Attribute "NickName" "" "HP Officejet r40, $Version"
        Attribute "ShortNickName" "" "HP Officejet r40"
@@ -1359,7 +1359,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_r40.ppd"
        Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)"
      }
-@@ -12994,7 +12995,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13142,7 +13143,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r60"
        Attribute "NickName" "" "HP Officejet r60, $Version"
        Attribute "ShortNickName" "" "HP Officejet r60"
@@ -1368,7 +1368,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_r60.ppd"
        Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)"
      }
-@@ -13002,7 +13003,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13150,7 +13151,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r65"
        Attribute "NickName" "" "HP Officejet r65, $Version"
        Attribute "ShortNickName" "" "HP Officejet r65"
@@ -1377,7 +1377,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_r65.ppd"
        Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)"
      }
-@@ -13018,7 +13019,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13166,7 +13167,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r80"
        Attribute "NickName" "" "HP Officejet r80, $Version"
        Attribute "ShortNickName" "" "HP Officejet r80"
@@ -1386,7 +1386,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_r80.ppd"
        Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)"
      }
-@@ -13026,7 +13027,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13174,7 +13175,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP PSC 500"
        Attribute "NickName" "" "HP PSC 500, $Version"
        Attribute "ShortNickName" "" "HP PSC 500"
@@ -1395,7 +1395,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-psc_500.ppd"
        Attribute "Product" "" "(HP PSC 500 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)"
-@@ -13043,7 +13044,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13191,7 +13192,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 812c"
        Attribute "NickName" "" "HP Deskjet 812c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 812c"
@@ -1404,7 +1404,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_812c.ppd"
        Attribute "Product" "" "(HP Deskjet 812c Printer)"
      }
-@@ -13051,7 +13052,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13199,7 +13200,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 815c"
        Attribute "NickName" "" "HP Deskjet 815c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 815c"
@@ -1413,7 +1413,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_815c.ppd"
        Attribute "Product" "" "(HP Deskjet 815c Printer)"
      }
-@@ -13083,7 +13084,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13231,7 +13232,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 840c"
        Attribute "NickName" "" "HP Deskjet 840c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 840c"
@@ -1422,7 +1422,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_840c.ppd"
        Attribute "Product" "" "(HP Deskjet 840c Printer)"
      }
-@@ -13091,7 +13092,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13239,7 +13240,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 841c"
        Attribute "NickName" "" "HP Deskjet 841c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 841c"
@@ -1431,7 +1431,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_841c.ppd"
        Attribute "Product" "" "(HP Deskjet 841c Printer)"
      }
-@@ -13107,7 +13108,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13255,7 +13256,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 843c"
        Attribute "NickName" "" "HP Deskjet 843c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 843c"
@@ -1440,7 +1440,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_843c.ppd"
        Attribute "Product" "" "(HP Deskjet 843c Printer)"
        Attribute "Product" "" "(HP Deskjet 843cxe Printer)"
-@@ -13116,7 +13117,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13264,7 +13265,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 880c"
        Attribute "NickName" "" "HP Deskjet 880c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 880c"
@@ -1449,7 +1449,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_880c.ppd"
        Attribute "Product" "" "(HP Deskjet 880c Printer)"
      }
-@@ -13132,7 +13133,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13280,7 +13281,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 895c"
        Attribute "NickName" "" "HP Deskjet 895c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 895c"
@@ -1458,7 +1458,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_895c.ppd"
        Attribute "Product" "" "(HP Deskjet 895cse Printer)"
        Attribute "Product" "" "(HP Deskjet 895c Printer)"
-@@ -13249,7 +13250,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13397,7 +13398,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 825c"
        Attribute "NickName" "" "HP Deskjet 825c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 825c"
@@ -1467,7 +1467,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_825c.ppd"
        Attribute "Product" "" "(HP Deskjet 825cvr Printer)"
        Attribute "Product" "" "(HP Deskjet 825c Printer)"
-@@ -13258,7 +13259,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13406,7 +13407,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 845c"
        Attribute "NickName" "" "HP Deskjet 845c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 845c"
@@ -1476,7 +1476,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_845c.ppd"
        Attribute "Product" "" "(HP Deskjet 845c Printer)"
        Attribute "Product" "" "(HP Deskjet 845cvr Printer)"
-@@ -13369,7 +13370,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13517,7 +13518,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 850c"
        Attribute "NickName" "" "HP Deskjet 850c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 850c"
@@ -1485,7 +1485,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_850c.ppd"
        Attribute "Product" "" "(HP Deskjet 850k Printer)"
        Attribute "Product" "" "(HP Deskjet 850c Printer)"
-@@ -13388,7 +13389,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13536,7 +13537,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 870c"
        Attribute "NickName" "" "HP Deskjet 870c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 870c"
@@ -1494,7 +1494,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_870c.ppd"
        Attribute "Product" "" "(HP Deskjet 870k Printer)"
        Attribute "Product" "" "(HP Deskjet 870c Printer)"
-@@ -13399,7 +13400,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13547,7 +13548,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Pro 1150c"
        Attribute "NickName" "" "HP Officejet Pro 1150c, $Version"
        Attribute "ShortNickName" "" "HP Officejet Pro 1150c"
@@ -1503,7 +1503,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_pro_1150c.ppd"
        Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)"
-@@ -13513,7 +13514,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13661,7 +13662,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 890c"
        Attribute "NickName" "" "HP Deskjet 890c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 890c"
@@ -1512,7 +1512,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-deskjet_890c.ppd"
        Attribute "Product" "" "(HP Deskjet 890cse Printer)"
        Attribute "Product" "" "(HP Deskjet 890c Printer)"
-@@ -13522,7 +13523,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13670,7 +13671,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Pro 1170c Series"
        Attribute "NickName" "" "HP Officejet Pro 1170c Series, $Version"
        Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series"
@@ -1521,7 +1521,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-officejet_pro_1170c_series.ppd"
        Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)"
-@@ -13664,7 +13665,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13812,7 +13813,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1018"
        Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet 1018"
@@ -1530,7 +1530,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1018.ppd"
        Attribute "Product" "" "(HP LaserJet 1018 Printer)"
        Attribute "Product" "" "(HP LaserJet 1018s Printer)"
-@@ -13673,7 +13674,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13821,7 +13822,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1020"
        Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet 1020"
@@ -1539,7 +1539,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_1020.ppd"
        Attribute "Product" "" "(HP LaserJet 1020 Printer)"
        Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)"
-@@ -14150,7 +14151,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14307,7 +14308,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 2600n"
        Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP Color LaserJet 2600n"
@@ -1548,7 +1548,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_2600n.ppd"
        Attribute "Product" "" "(HP Color LaserJet 2600n Printer)"
      }
-@@ -14285,7 +14286,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14515,7 +14516,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 3500"
        Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP Color LaserJet 3500"
@@ -1557,7 +1557,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_3500.ppd"
        Attribute "Product" "" "(HP Color LaserJet 3500 Printer)"
        Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)"
-@@ -14295,7 +14296,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14525,7 +14526,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 3550"
        Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP Color LaserJet 3550"
@@ -1566,7 +1566,16 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-color_laserjet_3550.ppd"
        Attribute "Product" "" "(HP Color LaserJet 3550 Printer)"
      }
-@@ -14589,7 +14590,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14677,7 +14678,7 @@ Group "RLT/HP Real Life Technologies"
+       ModelName "HP LaserJet p1505"
+       Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin"
+       Attribute "ShortNickName" "" "HP LaserJet p1505"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1505;DES:HP LaserJet P1505;"
+       PCFileName "hp-laserjet_p1505.ppd"
+       Attribute "Product" "" "(HP LaserJet p1505 Printer)"
+     }
+@@ -14819,7 +14820,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p1006"
        Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p1006"
@@ -1575,7 +1584,7 @@ diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv
        PCFileName "hp-laserjet_p1006.ppd"
        Attribute "Product" "" "(HP LaserJet p1006 Printer)"
      }
-@@ -14597,7 +14598,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14827,7 +14828,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p1007"
        Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p1007"
diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch
index 63a1ecd..3ae473d 100644
--- a/hplip-deviceIDs-ppd.patch
+++ b/hplip-deviceIDs-ppd.patch
@@ -63,6 +63,39 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2
 +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
  *PSVersion: "(2014.116) 0"
  
+ *%=================================================
+diff -up hplip-3.11.1/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_1300n-ps.ppd
+--- hplip-3.11.1/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd	2011-03-01 16:24:24.000000000 +0100
++++ hplip-3.11.1/prnt/ps/hp-laserjet_1300n-ps.ppd	2011-03-01 18:23:13.000000000 +0100
+@@ -60,6 +60,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1300n)"
+ *Product: "(HP LaserJet 1300n)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.1/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_1300-ps.ppd
+--- hplip-3.11.1/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd	2011-03-01 16:24:24.000000000 +0100
++++ hplip-3.11.1/prnt/ps/hp-laserjet_1300-ps.ppd	2011-03-01 18:23:30.000000000 +0100
+@@ -60,6 +60,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1300n)"
+ *Product: "(HP LaserJet 1300n)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.1/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_1300xi-ps.ppd
+--- hplip-3.11.1/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd	2011-03-01 16:24:24.000000000 +0100
++++ hplip-3.11.1/prnt/ps/hp-laserjet_1300xi-ps.ppd	2011-03-01 18:23:44.000000000 +0100
+@@ -60,6 +60,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1300n)"
+ *Product: "(HP LaserJet 1300n)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
+ *PSVersion: "(2014.116) 0"
+ 
  *%=================================================
 diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd
 --- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:54.000000000 +0000
@@ -184,6 +217,17 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hpl
 +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
  *PSVersion: "(3010.107) 0"
  
+ *%=================================================
+diff -up hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd
+--- hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd	2011-03-01 18:27:07.000000000 +0100
++++ hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd	2011-03-01 18:29:45.000000000 +0100
+@@ -62,6 +62,7 @@
+ *Product: "(HP LaserJet 3390)"
+ *Product: "(Hewlett-Packard HP LaserJet 3390)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;"
+ *PSVersion: "(2014.116) 0"
+ 
  *%=================================================
 diff -up hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd
 --- hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd	2010-09-13 12:42:36.000000000 +0200
diff --git a/hplip-wifisetup.patch b/hplip-wifisetup.patch
new file mode 100644
index 0000000..1a60ce8
--- /dev/null
+++ b/hplip-wifisetup.patch
@@ -0,0 +1,12 @@
+diff -up hplip-3.11.1/ui4/wifisetupdialog.py.wifisetup hplip-3.11.1/ui4/wifisetupdialog.py
+--- hplip-3.11.1/ui4/wifisetupdialog.py.wifisetup	2011-01-19 06:18:20.000000000 +0100
++++ hplip-3.11.1/ui4/wifisetupdialog.py	2011-03-01 15:39:02.000000000 +0100
+@@ -301,7 +301,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog
+             self.dev.close()
+             endWaitCursor()
+ 
+-        self.num_networks = self.networks['numberofscanentries']
++        self.num_networks = self.networks.get('numberofscanentries')
+         self.clearNetworksTable()
+ 
+         if self.num_networks:
diff --git a/hplip.spec b/hplip.spec
index 9f6b6a5..8d5de86 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.11.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -44,6 +44,7 @@ Patch32: hplip-newline.patch
 Patch33: hplip-dbus-threads.patch
 Patch34: hplip-notification-exception.patch
 Patch35: hplip-CVE-2010-4267.patch
+Patch36: hplip-wifisetup.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -154,6 +155,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 # Corrected several IEEE 1284 Device IDs using foomatic data.
 # HP LaserJet P1007 (bug #585272).
+# HP LaserJet P1505 (bug #680951).
 # HP Color LaserJet CM1312nfi (bug #581005).
 # HP Color LaserJet 3800 (bug #581935).
 # HP Color LaserJet 2840 (bug #582215).
@@ -286,6 +288,9 @@ done
 # vulnerability (bug #670252).
 %patch35 -p1 -b .CVE-2010-4267
 
+# Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
+%patch36 -p1 -b .wifisetup
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -513,6 +518,13 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Mar  1 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.1-3
+- Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
+- Corrected IEEE 1284 Device IDs:
+  LaserJet 1300 (bug #670548)
+  LaserJet 3390 (bug #678565)
+  LaserJet P1505 (bug #680951)
+
 * Fri Feb  4 2011 Tim Waugh <twaugh@redhat.com> - 3.11.1-2
 - Fixed typo causing ";marker-supply-low-warning" state reason to be
   reported by hpijs (bug #675151).