From 444f2b113e3e53f03044cac8389b00dc72819a50 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 29 Feb 2012 13:05:11 +0000
Subject: [PATCH] Added another IEEE 1284 Device ID for Color LaserJet CP2025dn
 to

  cope with its DNS-SD response, which has no usb_* keys (bug #651509).
---
 hplip-deviceIDs-drv.patch | 142 +++++++++++++++++++-------------------
 hplip.spec                |   6 +-
 2 files changed, 77 insertions(+), 71 deletions(-)

diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch
index dddf6f8..14543ee 100644
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
@@ -1,6 +1,6 @@
 diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv/hpcups.drv.in
 --- hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv	2012-02-01 11:56:31.000000000 +0000
-+++ hplip-3.12.2/prnt/drv/hpcups.drv.in	2012-02-22 11:45:43.195493210 +0000
++++ hplip-3.12.2/prnt/drv/hpcups.drv.in	2012-02-29 13:03:19.665437091 +0000
 @@ -460,7 +460,7 @@ Manufacturer "HP"
        ModelName "HP Officejet v40xi"
        Attribute "NickName" "" "HP Officejet v40xi, $Version"
@@ -1044,16 +1044,18 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)"
          }
-@@ -12263,7 +12264,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12263,7 +12264,9 @@ 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"
 -          Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;"
 +          Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025dn;DES:Hewlett-Packard Color LaserJet CP2025dn;"
++          // DNS-SD response has no usb_* keys, just ty/product
++          Attribute "1284DeviceID" "" "MFG:HP;MDL:Color LaserJet CP2025dn;"
            PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)"
          }
-@@ -12279,7 +12280,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12279,7 +12282,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"
@@ -1062,7 +1064,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)"
          }
-@@ -12295,7 +12296,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12295,7 +12298,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"
@@ -1071,7 +1073,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-business_inkjet_2300-pcl3.ppd"
            Attribute "Product" "" "(HP Business Inkjet 2300 Printer)"
            Attribute "Product" "" "(HP Business Inkjet 2300n Printer)"
-@@ -12305,7 +12306,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12305,7 +12308,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"
@@ -1080,7 +1082,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_2500-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 2500 Printer)"
          }
-@@ -12346,7 +12347,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12346,7 +12349,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"
@@ -1089,7 +1091,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_cp3525-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)"
            Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)"
-@@ -12357,7 +12358,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12357,7 +12360,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"
@@ -1098,7 +1100,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/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)"
-@@ -12366,7 +12367,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12366,7 +12369,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"
@@ -1107,7 +1109,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_3700-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 3700 Printer)"
          }
-@@ -12385,7 +12386,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12385,7 +12388,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"
@@ -1116,7 +1118,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_3800-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 3800 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 3800n Printer)"
-@@ -12424,7 +12425,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12424,7 +12427,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"
@@ -1125,7 +1127,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)"
          }
-@@ -12440,7 +12441,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12440,7 +12443,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"
@@ -1134,7 +1136,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_4550-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4550 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 4550n Printer)"
-@@ -12453,7 +12454,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12453,7 +12456,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"
@@ -1143,7 +1145,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_4600_series.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4600 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)"
-@@ -12465,7 +12466,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12465,7 +12468,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"
@@ -1152,7 +1154,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_4600-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)"
          }
-@@ -12481,7 +12482,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12481,7 +12484,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"
@@ -1161,7 +1163,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_4650-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4650 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 4650n Printer)"
-@@ -12493,7 +12494,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12493,7 +12496,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"
@@ -1170,7 +1172,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_4700-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4700 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)"
-@@ -12505,7 +12506,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12505,7 +12508,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"
@@ -1179,7 +1181,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/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)"
-@@ -12559,7 +12560,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12559,7 +12562,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"
@@ -1188,7 +1190,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/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)"
-@@ -12603,7 +12604,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12603,7 +12606,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"
@@ -1197,7 +1199,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
            PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)"
          }
-@@ -12643,7 +12644,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12643,7 +12646,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"
@@ -1206,7 +1208,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-business_inkjet_2800-pcl3.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2800 Printer)"
        Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)"
-@@ -12678,7 +12679,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12678,7 +12681,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"
@@ -1215,7 +1217,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
          PCFileName "hp-color_laserjet_5550-pcl3.ppd"
          Attribute "Product" "" "(HP Color LaserJet 5550n Printer)"
          Attribute "Product" "" "(HP Color LaserJet 5550 Printer)"
-@@ -12935,7 +12936,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12935,7 +12938,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1010"
        Attribute "NickName" "" "HP LaserJet 1010, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1010"
@@ -1224,7 +1226,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_1010.ppd"
        Attribute "Product" "" "(HP LaserJet 1010 Printer)"
      }
-@@ -12943,7 +12944,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12943,7 +12946,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1012"
        Attribute "NickName" "" "HP LaserJet 1012, $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1012"
@@ -1233,7 +1235,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_1012.ppd"
        Attribute "Product" "" "(HP LaserJet 1012 Printer)"
      }
-@@ -13151,7 +13152,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13151,7 +13154,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Lx"
        Attribute "NickName" "" "HP Officejet Lx, $Version"
        Attribute "ShortNickName" "" "HP Officejet Lx"
@@ -1242,7 +1244,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-officejet_lx.ppd"
        Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)"
      }
-@@ -13315,7 +13316,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13315,7 +13318,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"
@@ -1251,7 +1253,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-officejet_series_300.ppd"
        Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)"
      }
-@@ -13339,7 +13340,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13339,7 +13342,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 400"
        Attribute "NickName" "" "HP Deskjet 400, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 400"
@@ -1260,7 +1262,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_400.ppd"
        Attribute "Product" "" "(HP Deskjet 400 Printer)"
        Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)"
-@@ -13356,7 +13357,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13356,7 +13359,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 540"
        Attribute "NickName" "" "HP Deskjet 540, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 540"
@@ -1269,7 +1271,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_540.ppd"
        Attribute "Product" "" "(HP Deskjet 540 Printer)"
      }
-@@ -13481,7 +13482,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13481,7 +13484,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 630c"
        Attribute "NickName" "" "HP Deskjet 630c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 630c"
@@ -1278,7 +1280,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_630c.ppd"
        Attribute "Product" "" "(HP Deskjet 630c Printer)"
      }
-@@ -13497,7 +13498,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13497,7 +13500,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 656c"
        Attribute "NickName" "" "HP Deskjet 656c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 656c"
@@ -1287,7 +1289,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_656c.ppd"
        Attribute "Product" "" "(HP Deskjet 656c Printer)"
        Attribute "Product" "" "(HP Deskjet 656cvr Printer)"
-@@ -13610,7 +13611,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13610,7 +13613,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Deskjet 600"
          Attribute "NickName" "" "HP Deskjet 600, $Version"
          Attribute "ShortNickName" "" "HP Deskjet 600"
@@ -1296,7 +1298,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
          PCFileName "hp-deskjet_600.ppd"
          Attribute "Product" "" "(HP Deskjet 600c Printer)"
          Attribute "Product" "" "(HP Deskjet 600 Printer)"
-@@ -13632,7 +13633,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13632,7 +13635,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"
@@ -1305,7 +1307,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
          PCFileName "hp-officejet_series_500.ppd"
          Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)"
        }
-@@ -13672,7 +13673,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13672,7 +13675,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"
@@ -1314,7 +1316,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
          PCFileName "hp-officejet_series_600.ppd"
          Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)"
        }
-@@ -13724,7 +13725,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13724,7 +13727,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Deskjet 670c"
          Attribute "NickName" "" "HP Deskjet 670c, $Version"
          Attribute "ShortNickName" "" "HP Deskjet 670c"
@@ -1323,7 +1325,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
          PCFileName "hp-deskjet_670c.ppd"
          Attribute "Product" "" "(HP Deskjet 670c)"
        }
-@@ -13876,7 +13877,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13876,7 +13879,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 610c"
        Attribute "NickName" "" "HP Deskjet 610c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 610c"
@@ -1332,7 +1334,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_610c.ppd"
        Attribute "Product" "" "(HP Deskjet 610c Printer)"
      }
-@@ -13900,7 +13901,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13900,7 +13903,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 640c"
        Attribute "NickName" "" "HP Deskjet 640c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 640c"
@@ -1341,7 +1343,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_640c.ppd"
        Attribute "Product" "" "(HP Deskjet 640c Lite Printer)"
        Attribute "Product" "" "(HP Deskjet 640c Printer)"
-@@ -13920,7 +13921,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13920,7 +13923,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 690c"
        Attribute "NickName" "" "HP Deskjet 690c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 690c"
@@ -1350,7 +1352,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_690c.ppd"
        Attribute "Product" "" "(HP Deskjet 690c Plus Printer)"
        Attribute "Product" "" "(HP Deskjet 690c Printer)"
-@@ -13980,7 +13981,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13980,7 +13983,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"
@@ -1359,7 +1361,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-officejet_series_700.ppd"
        Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)"
      }
-@@ -14123,7 +14124,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14123,7 +14126,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"
@@ -1368,7 +1370,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/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)"
-@@ -14134,7 +14135,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14134,7 +14137,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r40"
        Attribute "NickName" "" "HP Officejet r40, $Version"
        Attribute "ShortNickName" "" "HP Officejet r40"
@@ -1377,7 +1379,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-officejet_r40.ppd"
        Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)"
      }
-@@ -14158,7 +14159,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14158,7 +14161,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r60"
        Attribute "NickName" "" "HP Officejet r60, $Version"
        Attribute "ShortNickName" "" "HP Officejet r60"
@@ -1386,7 +1388,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-officejet_r60.ppd"
        Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)"
      }
-@@ -14166,7 +14167,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14166,7 +14169,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r65"
        Attribute "NickName" "" "HP Officejet r65, $Version"
        Attribute "ShortNickName" "" "HP Officejet r65"
@@ -1395,7 +1397,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-officejet_r65.ppd"
        Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)"
      }
-@@ -14182,7 +14183,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14182,7 +14185,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r80"
        Attribute "NickName" "" "HP Officejet r80, $Version"
        Attribute "ShortNickName" "" "HP Officejet r80"
@@ -1404,7 +1406,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-officejet_r80.ppd"
        Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)"
      }
-@@ -14190,7 +14191,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14190,7 +14193,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP PSC 500"
        Attribute "NickName" "" "HP PSC 500, $Version"
        Attribute "ShortNickName" "" "HP PSC 500"
@@ -1413,7 +1415,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/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)"
-@@ -14207,7 +14208,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14207,7 +14210,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 812c"
        Attribute "NickName" "" "HP Deskjet 812c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 812c"
@@ -1422,7 +1424,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_812c.ppd"
        Attribute "Product" "" "(HP Deskjet 812c Printer)"
      }
-@@ -14215,7 +14216,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14215,7 +14218,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 815c"
        Attribute "NickName" "" "HP Deskjet 815c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 815c"
@@ -1431,7 +1433,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_815c.ppd"
        Attribute "Product" "" "(HP Deskjet 815c Printer)"
      }
-@@ -14247,7 +14248,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14247,7 +14250,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 840c"
        Attribute "NickName" "" "HP Deskjet 840c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 840c"
@@ -1440,7 +1442,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_840c.ppd"
        Attribute "Product" "" "(HP Deskjet 840c Printer)"
      }
-@@ -14255,7 +14256,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14255,7 +14258,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 841c"
        Attribute "NickName" "" "HP Deskjet 841c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 841c"
@@ -1449,7 +1451,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_841c.ppd"
        Attribute "Product" "" "(HP Deskjet 841c Printer)"
      }
-@@ -14271,7 +14272,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14271,7 +14274,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 843c"
        Attribute "NickName" "" "HP Deskjet 843c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 843c"
@@ -1458,7 +1460,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_843c.ppd"
        Attribute "Product" "" "(HP Deskjet 843c Printer)"
        Attribute "Product" "" "(HP Deskjet 843cxe Printer)"
-@@ -14280,7 +14281,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14280,7 +14283,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 880c"
        Attribute "NickName" "" "HP Deskjet 880c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 880c"
@@ -1467,7 +1469,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_880c.ppd"
        Attribute "Product" "" "(HP Deskjet 880c Printer)"
      }
-@@ -14296,7 +14297,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14296,7 +14299,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 895c"
        Attribute "NickName" "" "HP Deskjet 895c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 895c"
@@ -1476,7 +1478,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_895c.ppd"
        Attribute "Product" "" "(HP Deskjet 895cse Printer)"
        Attribute "Product" "" "(HP Deskjet 895c Printer)"
-@@ -14413,7 +14414,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14413,7 +14416,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 825c"
        Attribute "NickName" "" "HP Deskjet 825c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 825c"
@@ -1485,7 +1487,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_825c.ppd"
        Attribute "Product" "" "(HP Deskjet 825cvr Printer)"
        Attribute "Product" "" "(HP Deskjet 825c Printer)"
-@@ -14422,7 +14423,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14422,7 +14425,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 845c"
        Attribute "NickName" "" "HP Deskjet 845c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 845c"
@@ -1494,7 +1496,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_845c.ppd"
        Attribute "Product" "" "(HP Deskjet 845c Printer)"
        Attribute "Product" "" "(HP Deskjet 845cvr Printer)"
-@@ -14533,7 +14534,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14533,7 +14536,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 850c"
        Attribute "NickName" "" "HP Deskjet 850c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 850c"
@@ -1503,7 +1505,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_850c.ppd"
        Attribute "Product" "" "(HP Deskjet 850k Printer)"
        Attribute "Product" "" "(HP Deskjet 850c Printer)"
-@@ -14552,7 +14553,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14552,7 +14555,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 870c"
        Attribute "NickName" "" "HP Deskjet 870c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 870c"
@@ -1512,7 +1514,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_870c.ppd"
        Attribute "Product" "" "(HP Deskjet 870k Printer)"
        Attribute "Product" "" "(HP Deskjet 870c Printer)"
-@@ -14563,7 +14564,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14563,7 +14566,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"
@@ -1521,7 +1523,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/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)"
-@@ -14677,7 +14678,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14677,7 +14680,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 890c"
        Attribute "NickName" "" "HP Deskjet 890c, $Version"
        Attribute "ShortNickName" "" "HP Deskjet 890c"
@@ -1530,7 +1532,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-deskjet_890c.ppd"
        Attribute "Product" "" "(HP Deskjet 890cse Printer)"
        Attribute "Product" "" "(HP Deskjet 890c Printer)"
-@@ -14686,7 +14687,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14686,7 +14689,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"
@@ -1539,7 +1541,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/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)"
-@@ -14828,7 +14829,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14828,7 +14831,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"
@@ -1548,7 +1550,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_1018.ppd"
        Attribute "Product" "" "(HP LaserJet 1018 Printer)"
        Attribute "Product" "" "(HP LaserJet 1018s Printer)"
-@@ -14837,7 +14838,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14837,7 +14840,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"
@@ -1557,7 +1559,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_1020.ppd"
        Attribute "Product" "" "(HP LaserJet 1020 Printer)"
        Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)"
-@@ -14871,7 +14872,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14871,7 +14874,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m1120 MFP"
        Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet m1120 MFP"
@@ -1566,7 +1568,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_m1120_mfp.ppd"
        Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)"
      }
-@@ -14887,7 +14888,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14887,7 +14890,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m1319f MFP"
        Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet m1319f MFP"
@@ -1575,7 +1577,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_m1319f_mfp.ppd"
        Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)"
      }
-@@ -14903,7 +14904,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14903,7 +14906,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p2035"
        Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p2035"
@@ -1584,7 +1586,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_p2035-zjs.ppd"
        Attribute "Product" "" "(HP LaserJet p2035 Printer)"
      }
-@@ -15003,7 +15004,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15003,7 +15006,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet Professional p1102w"
        Attribute "NickName" "" "HP LaserJet Professional p1102w, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet Professional p1102w"
@@ -1593,7 +1595,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_professional_p1102w.ppd"
        Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)"
      }
-@@ -15059,7 +15060,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15059,7 +15062,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet Professional m1212nf MFP"
        Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP"
@@ -1602,7 +1604,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd"
        Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)"
      }
-@@ -15239,7 +15240,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15239,7 +15242,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet Professional p1606dn"
        Attribute "NickName" "" "HP LaserJet Professional p1606dn, $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LJ Professional p1606dn"
@@ -1611,7 +1613,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_professional_p1606dn.ppd"
        Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)"
      }
-@@ -15389,7 +15390,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15389,7 +15392,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"
@@ -1620,7 +1622,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-color_laserjet_2600n.ppd"
        Attribute "Product" "" "(HP Color LaserJet 2600n Printer)"
      }
-@@ -15589,7 +15590,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15589,7 +15592,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"
@@ -1629,7 +1631,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-color_laserjet_3500.ppd"
        Attribute "Product" "" "(HP Color LaserJet 3500 Printer)"
        Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)"
-@@ -15599,7 +15600,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15599,7 +15602,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"
@@ -1638,7 +1640,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-color_laserjet_3550.ppd"
        Attribute "Product" "" "(HP Color LaserJet 3550 Printer)"
      }
-@@ -15751,7 +15752,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15751,7 +15754,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"
@@ -1647,7 +1649,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_p1505.ppd"
        Attribute "Product" "" "(HP LaserJet p1505 Printer)"
      }
-@@ -15893,7 +15894,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15893,7 +15896,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"
@@ -1656,7 +1658,7 @@ diff -up hplip-3.12.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.12.2/prnt/drv
        PCFileName "hp-laserjet_p1006.ppd"
        Attribute "Product" "" "(HP LaserJet p1006 Printer)"
      }
-@@ -15901,7 +15902,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15901,7 +15904,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.spec b/hplip.spec
index 6d6024a..62130e8 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.12.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -515,6 +515,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Feb 29 2012 Tim Waugh <twaugh@redhat.com> 3.12.2-3
+- Added another IEEE 1284 Device ID for Color LaserJet CP2025dn to
+  cope with its DNS-SD response, which has no usb_* keys (bug #651509).
+
 * Wed Feb 22 2012 Tim Waugh <twaugh@redhat.com> 3.12.2-2
 - Added IEEE 1284 Device ID for LaserJet Professional P1102w (bug #795958).