From 1bba1aa0cac99dfc422baa8ecfc9a3f82bd5a3c0 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 21 Nov 2011 16:03:14 +0000
Subject: [PATCH] Added IEEE 1284 Device ID for Designjet T770 (bug #747957).

---
 hplip-deviceIDs-ppd.patch | 886 +++++++++++++++++++-------------------
 hplip.spec                |   6 +-
 2 files changed, 459 insertions(+), 433 deletions(-)

diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch
index 0e7aa25..c6b9008 100644
--- a/hplip-deviceIDs-ppd.patch
+++ b/hplip-deviceIDs-ppd.patch
@@ -1,215 +1,6 @@
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd	2010-05-12 11:56:17.000000000 +0200
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd	2010-05-12 11:58:30.000000000 +0200
-@@ -53,6 +53,7 @@
- *HPPDEPanel: "HPImagingOptions"
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;"
- *Product: "(hp LaserJet 4250)"
- *Product: "(Hewlett-Packard hp LaserJet 4250)"
- *Product: "(HP LaserJet 4250)"
-diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd	2010-05-12 11:36:35.000000000 +0200
-+++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd	2010-05-12 11:39:06.000000000 +0200
-@@ -50,6 +50,7 @@
- 
- *% Product Name and Version Information
- *Manufacturer:	"HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2605dn;DES:Hewlett-Packard Color LaserJet 2605dn;"
- *Product: "(HP Color LaserJet 2605)"
- *Product: "(Hewlett-Packard HP Color LaserJet 2605)"
- *Product: "(HP Color LaserJet 2605dn)"
-diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd	2010-04-16 22:24:03.049147700 +0100
-+++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd	2010-04-16 22:25:34.077147648 +0100
-@@ -46,6 +46,7 @@
- 
- *% Product Name and Version Information
- *Manufacturer:	"HP"
-+*1284DeviceID:  "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;"
- *Product: "(HP Color LaserJet 2820)"
- *Product: "(Hewlett-Packard HP Color LaserJet 2820)"
- *Product: "(HP Color LaserJet 2830)"
-diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd	2010-04-16 22:22:28.705273898 +0100
-+++ hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd	2010-04-16 22:23:28.914273477 +0100
-@@ -51,6 +51,7 @@
- 
- *% Product Name and Version Information
- *Manufacturer:	"HP"
-+*1284DeviceID:  "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;"
- *Product: 	"(HP Color LaserJet 3800)"
- *Product: "(Hewlett-Packard HP Color LaserJet 3800)"
- *ModelName:	"HP Color LaserJet 3800"
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:53.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd	2010-04-16 22:21:49.286273004 +0100
-@@ -56,6 +56,7 @@
- *Product: "(HP LaserJet 1200)"
- *Product: "(Hewlett-Packard HP LaserJet 1200)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
- *PSVersion: "(2014.116) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:53.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd	2010-04-16 22:21:49.292272590 +0100
-@@ -56,6 +56,7 @@
- *Product: "(HP LaserJet 1200)"
- *Product: "(Hewlett-Packard HP LaserJet 1200)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
- *PSVersion: "(2014.116) 0"
- 
- *%=================================================
-diff -up hplip-3.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
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd	2010-04-16 22:21:49.300272653 +0100
-@@ -57,6 +57,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
- *Product: "(HP LaserJet 1320 series)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
- *PSVersion: "(2014.116) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:54.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd	2010-04-16 22:21:49.304148148 +0100
-@@ -57,6 +57,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
- *Product: "(HP LaserJet 1320 series)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
- *PSVersion: "(2014.116) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:54.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd	2010-04-16 22:21:49.317273026 +0100
-@@ -57,6 +57,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
- *Product: "(HP LaserJet 1320 series)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
- *PSVersion: "(2014.116) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:54.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd	2010-04-16 22:21:49.321272466 +0100
-@@ -57,6 +57,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
- *Product: "(HP LaserJet 1320 series)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
- *PSVersion: "(2014.116) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:54.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd	2010-04-16 22:21:49.334278100 +0100
-@@ -57,6 +57,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
- *Product: "(HP LaserJet 1320 series)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
- *PSVersion: "(2014.116) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:54.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd	2010-04-16 22:21:49.342272544 +0100
-@@ -61,6 +61,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 2300L)"
- *Product: "(HP LaserJet 2300L)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
- *PSVersion: "(3010.107) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:54.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd	2010-04-16 22:21:49.346272524 +0100
-@@ -61,6 +61,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 2300L)"
- *Product: "(HP LaserJet 2300L)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
- *PSVersion: "(3010.107) 0"
- 
- *%=================================================
-diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd
---- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd	2010-02-24 23:09:55.000000000 +0000
-+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd	2010-04-16 22:21:49.376148194 +0100
-@@ -64,6 +64,7 @@
- *Product: "(HP LaserJet P2015 Series)"
- *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
- *PSVersion: "(3010.107) 0"
- 
- *%=================================================
-diff -up hplip-3.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
-+++ hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd	2010-09-13 12:45:07.000000000 +0200
-@@ -51,6 +51,7 @@
- 
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series"
- *Product: "(HP LaserJet 4000 Series)"
- *Product: "(Hewlett-Packard HP LaserJet 4000 Series)"
- *ModelName: "HP LaserJet 4000 Series"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd	2010-12-03 16:12:33.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2500-ps.ppd	2011-11-21 15:56:33.120335351 +0000
 @@ -44,6 +44,7 @@
  
  
@@ -218,9 +9,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: "(hp color LaserJet 2500)"
  *Product: "(Hewlett-Packard hp color LaserJet 2500)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd	2010-12-03 16:12:11.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2500_series-ps.ppd	2011-11-21 15:56:33.123335298 +0000
 @@ -44,6 +44,7 @@
  
  
@@ -229,9 +20,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: "(hp color LaserJet 2500)"
  *Product: "(Hewlett-Packard hp color LaserJet 2500)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd	2010-12-03 16:12:57.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2550_series-ps.ppd	2011-11-21 15:56:33.128335209 +0000
 @@ -44,6 +44,7 @@
  
  
@@ -240,9 +31,31 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: "(hp color LaserJet 2550 series)"
  *Product: "(Hewlett-Packard hp color LaserJet 2550 series)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd	2010-12-03 16:13:58.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2605dn-ps.ppd	2011-11-21 15:56:33.014337244 +0000
+@@ -50,6 +50,7 @@
+ 
+ *% Product Name and Version Information
+ *Manufacturer:	"HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2605dn;DES:Hewlett-Packard Color LaserJet 2605dn;"
+ *Product: "(HP Color LaserJet 2605)"
+ *Product: "(Hewlett-Packard HP Color LaserJet 2605)"
+ *Product: "(HP Color LaserJet 2605dn)"
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_2840-ps.ppd	2011-11-21 15:56:33.019337154 +0000
+@@ -46,6 +46,7 @@
+ 
+ *% Product Name and Version Information
+ *Manufacturer:	"HP"
++*1284DeviceID:  "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;"
+ *Product: "(HP Color LaserJet 2820)"
+ *Product: "(Hewlett-Packard HP Color LaserJet 2820)"
+ *Product: "(HP Color LaserJet 2830)"
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_3700n-ps.ppd	2011-11-21 15:56:33.134335101 +0000
 @@ -43,6 +43,7 @@
  
  
@@ -251,9 +64,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 3700)"
  *Product: "(Hewlett-Packard hp color LaserJet 3700)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd	2010-12-03 16:13:23.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_3700-ps.ppd	2011-11-21 15:56:33.140334995 +0000
 @@ -43,6 +43,7 @@
  
  
@@ -262,9 +75,20 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 3700)"
  *Product: "(Hewlett-Packard hp color LaserJet 3700)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd	2010-12-03 16:14:24.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_3800-ps.ppd	2011-11-21 15:56:33.027337012 +0000
+@@ -51,6 +51,7 @@
+ 
+ *% Product Name and Version Information
+ *Manufacturer:	"HP"
++*1284DeviceID:  "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;"
+ *Product: 	"(HP Color LaserJet 3800)"
+ *Product: "(Hewlett-Packard HP Color LaserJet 3800)"
+ *ModelName:	"HP Color LaserJet 3800"
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4550-ps.ppd	2011-11-21 15:56:33.145334905 +0000
 @@ -43,6 +43,7 @@
  
  
@@ -273,9 +97,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(HP Color LaserJet 4550 )"
  *Product: "(Hewlett-Packard HP Color LaserJet 4550 )"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd	2010-12-03 16:14:49.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4600-ps.ppd	2011-11-21 15:56:33.151334799 +0000
 @@ -44,6 +44,7 @@
  
  
@@ -284,9 +108,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 4600)"
  *Product: "(Hewlett-Packard hp color LaserJet 4600)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd	2010-12-03 16:15:10.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4600_series-ps.ppd	2011-11-21 15:56:33.156334709 +0000
 @@ -44,6 +44,7 @@
  
  
@@ -295,9 +119,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 4600)"
  *Product: "(Hewlett-Packard hp color LaserJet 4600)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd	2010-12-03 16:15:43.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4650-ps.ppd	2011-11-21 15:56:33.164334567 +0000
 @@ -47,6 +47,7 @@
  
  
@@ -306,9 +130,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 4650)"
  *Product: "(Hewlett-Packard hp color LaserJet 4650)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd	2010-12-03 16:16:06.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_4700-ps.ppd	2011-11-21 15:56:33.172334423 +0000
 @@ -49,6 +49,7 @@
  
  
@@ -317,9 +141,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(HP Color LaserJet 4700)"
  *Product: "(Hewlett-Packard HP Color LaserJet 4700)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd	2010-12-03 16:16:29.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:37.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_5550-ps.ppd	2011-11-21 15:56:33.183334227 +0000
 @@ -46,6 +46,7 @@
  
  
@@ -328,196 +152,9 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: "(hp color LaserJet 5550 )"
  *Product: "(Hewlett-Packard hp color LaserJet 5550 )"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd	2010-12-03 16:17:23.000000000 +0100
-@@ -49,6 +49,7 @@
- *%== Mac OS X specific end ==
- 
- *% Product Name and Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;"
- *Manufacturer:	"HP"
- *Product: 	"(HP Color LaserJet CM4730 MFP)"
- *Product: "(Hewlett-Packard HP Color LaserJet CM4730 MFP)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd	2010-12-03 16:16:55.000000000 +0100
-@@ -51,6 +51,7 @@
- *%== Mac OS X specific end ==
- 
- *% Product Name and Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;"
- *Manufacturer:	"HP"
- *Product: 	"(HP Color LaserJet CP3525)"
- *Product: "(Hewlett-Packard HP Color LaserJet CP3525)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd	2010-12-03 16:04:48.000000000 +0100
-@@ -56,6 +56,7 @@
- *Product: "(HP LaserJet 2100 Series)"
- *Product: "(Hewlett-Packard HP LaserJet 2100 Series)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;"
- *PSVersion: "(2014.111) 1"
- 
- *%=================================================
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd	2010-12-03 16:05:22.000000000 +0100
-@@ -56,6 +56,7 @@
- *Product: "(HP LaserJet 2100 Series)"
- *Product: "(Hewlett-Packard HP LaserJet 2100 Series)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;"
- *PSVersion: "(2014.111) 1"
- 
- *%=================================================
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd	2010-12-03 16:05:51.000000000 +0100
-@@ -60,6 +60,7 @@
- *Product: "(Hewlett-Packard hp LaserJet 2420)"
- *Product: "(HP LaserJet 2420)"
- *Manufacturer: "HP"
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;"
- *PSVersion: "(3010.107) 0"
- 
- *%=================================================
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:24:27.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd	2010-12-03 16:03:05.000000000 +0100
-@@ -52,6 +52,7 @@
- 
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;"
- *Product: "(HP LaserJet 4050 Series )"
- *Product: "(Hewlett-Packard HP LaserJet 4050 Series )"
- *Product: "(HP LaserJet 4050 Series)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd	2010-12-03 16:03:27.000000000 +0100
-@@ -51,6 +51,7 @@
- 
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;"
- *Product: "(HP LaserJet 4100 Series )"
- *Product: "(Hewlett-Packard HP LaserJet 4100 Series )"
- *Product: "(HP LaserJet 4100 Series)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd	2010-12-03 16:06:31.000000000 +0100
-@@ -52,6 +52,7 @@
- 
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;"
- *Product: "(hp LaserJet 4200)"
- *Product: "(Hewlett-Packard hp LaserJet 4200)"
- *Product: "(HP LaserJet 4200)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd	2010-12-03 16:07:07.000000000 +0100
-@@ -52,6 +52,7 @@
- 
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;"
- *Product: "(hp LaserJet 4300)"
- *Product: "(Hewlett-Packard hp LaserJet 4300)"
- *Product: "(HP LaserJet 4300)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd	2010-12-03 16:07:37.000000000 +0100
-@@ -53,6 +53,7 @@
- *HPPDEPanel: "HPImagingOptions"
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;"
- *Product: "(hp LaserJet 4350)"
- *Product: "(Hewlett-Packard hp LaserJet 4350)"
- *Product: "(HP LaserJet 4350)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd	2010-12-03 16:08:01.000000000 +0100
-@@ -53,6 +53,7 @@
- 
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;"
- *Product: "(HP LaserJet 5100 Series)"
- *Product: "(Hewlett-Packard HP LaserJet 5100 Series)"
- *ModelName: "HP LaserJet 5100 Series"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd	2010-12-03 16:08:28.000000000 +0100
-@@ -55,6 +55,7 @@
- *%=================================================
- *% 		 Product Version Information
- *%=================================================
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;"
- *ModelName: "HP LaserJet 8000 Series"
- *ShortNickName: "HP LaserJet 8000 Series"
- *NickName: "HP LaserJet 8000 Series Postscript (recommended)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd	2010-12-03 16:08:53.000000000 +0100
-@@ -55,6 +55,7 @@
- *%=================================================
- *% 		 Product Version Information
- *%=================================================
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;"
- *ModelName: "HP LaserJet 8000 Series"
- *ShortNickName: "HP LaserJet 8000 Series"
- *NickName: "HP LaserJet 8000 Series Postscript (recommended)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd	2010-12-03 16:10:19.000000000 +0100
-@@ -56,6 +56,7 @@
- *%=================================================
- *% 		 Product Version Information
- *%=================================================
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;"
- *ModelName: "HP LaserJet M3027 MFP"
- *ShortNickName: "HP LaserJet M3027 MFP"
- *NickName: "HP LaserJet M3027 MFP Postscript (recommended)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd	2010-12-03 16:10:41.000000000 +0100
-@@ -56,6 +56,7 @@
- *%=================================================
- *% 		 Product Version Information
- *%=================================================
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;"
- *ModelName: "HP LaserJet M3035 MFP"
- *ShortNickName: "HP LaserJet M3035 MFP"
- *NickName: "HP LaserJet M3035 MFP Postscript (recommended)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd	2010-12-03 16:11:04.000000000 +0100
-@@ -57,6 +57,7 @@
- *%=================================================
- *% 		 Product Version Information
- *%=================================================
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;"
- *ModelName: "HP LaserJet P3005"
- *ShortNickName: "HP LaserJet P3005"
- *NickName: "HP LaserJet P3005 Postscript (recommended)"
-diff -up hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd	2010-12-03 15:57:26.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd	2010-12-03 16:11:32.000000000 +0100
-@@ -51,6 +51,7 @@
- *%== Mac OS X specific end ==
- 
- *% Product Version Information
-+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;"
- *Product: "(HP LaserJet P3015)"
- *Product: "(Hewlett-Packard HP LaserJet P3015)"
- *Product: "(HP LaserJet P3011)"
-diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd
---- hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd	2010-12-03 17:40:35.000000000 +0100
-+++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd	2010-12-03 17:41:03.000000000 +0100
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:38.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd	2011-11-21 15:56:33.346331319 +0000
 @@ -51,6 +51,7 @@
  *%== Mac OS X specific end ==
  
@@ -526,3 +163,388 @@ diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: 	"(HP Color LaserJet CM3530 MFP)"
  *Product: "(Hewlett-Packard HP Color LaserJet CM3530 MFP)"
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:38.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd	2011-11-21 15:56:33.194334031 +0000
+@@ -49,6 +49,7 @@
+ *%== Mac OS X specific end ==
+ 
+ *% Product Name and Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;"
+ *Manufacturer:	"HP"
+ *Product: 	"(HP Color LaserJet CM4730 MFP)"
+ *Product: "(Hewlett-Packard HP Color LaserJet CM4730 MFP)"
+diff -up hplip-3.11.10/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-color_laserjet_cp3525-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:38.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-color_laserjet_cp3525-ps.ppd	2011-11-21 15:56:33.202333888 +0000
+@@ -51,6 +51,7 @@
+ *%== Mac OS X specific end ==
+ 
+ *% Product Name and Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;"
+ *Manufacturer:	"HP"
+ *Product: 	"(HP Color LaserJet CP3525)"
+ *Product: "(Hewlett-Packard HP Color LaserJet CP3525)"
+diff -up hplip-3.11.10/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-designjet_t770_postscript-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd	2011-11-21 15:58:21.095199630 +0000
++++ hplip-3.11.10/prnt/ps/hp-designjet_t770_postscript-ps.ppd	2011-11-21 16:01:46.968516936 +0000
+@@ -38,6 +38,7 @@
+ *ShortNickName: "HP Designjet T770 PostScript"
+ *NickName: "HP Designjet T770ps 44in"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;"
+ 
+ 
+ *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== 
+diff -up hplip-3.11.10/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-designjet_t770ps_24in-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd	2011-11-21 15:58:27.126091749 +0000
++++ hplip-3.11.10/prnt/ps/hp-designjet_t770ps_24in-ps.ppd	2011-11-21 16:02:01.227261873 +0000
+@@ -38,6 +38,7 @@
+ *ShortNickName: "HP Designjet T770ps 24in"
+ *NickName: "HP Designjet T770ps 24in"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;"
+ 
+ 
+ *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== 
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1200n-ps.ppd	2011-11-21 15:56:33.032336922 +0000
+@@ -56,6 +56,7 @@
+ *Product: "(HP LaserJet 1200)"
+ *Product: "(Hewlett-Packard HP LaserJet 1200)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1200-ps.ppd	2011-11-21 15:56:33.036336850 +0000
+@@ -56,6 +56,7 @@
+ *Product: "(HP LaserJet 1200)"
+ *Product: "(Hewlett-Packard HP LaserJet 1200)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1300n-ps.ppd	2011-11-21 15:56:33.039336798 +0000
+@@ -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.10/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1300-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1300-ps.ppd	2011-11-21 15:56:33.043336726 +0000
+@@ -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.10/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1300xi-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1300xi-ps.ppd	2011-11-21 15:56:33.047336654 +0000
+@@ -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.10/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320n-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1320n-ps.ppd	2011-11-21 15:56:33.051336583 +0000
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1320nw-ps.ppd	2011-11-21 15:56:33.056336493 +0000
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1320-ps.ppd	2011-11-21 15:56:33.061336404 +0000
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1320_series-ps.ppd	2011-11-21 15:56:33.066336315 +0000
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_1320tn-ps.ppd	2011-11-21 15:56:33.081336049 +0000
+@@ -57,6 +57,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
+ *Product: "(HP LaserJet 1320 series)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_2100-ps.ppd	2011-11-21 15:56:33.212333710 +0000
+@@ -56,6 +56,7 @@
+ *Product: "(HP LaserJet 2100 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet 2100 Series)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;"
+ *PSVersion: "(2014.111) 1"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_2100_series-ps.ppd	2011-11-21 15:56:33.215333656 +0000
+@@ -56,6 +56,7 @@
+ *Product: "(HP LaserJet 2100 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet 2100 Series)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;"
+ *PSVersion: "(2014.111) 1"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_2300-ps.ppd	2011-11-21 15:56:33.085335977 +0000
+@@ -61,6 +61,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 2300L)"
+ *Product: "(HP LaserJet 2300L)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_2300_series-ps.ppd	2011-11-21 15:56:33.094335816 +0000
+@@ -61,6 +61,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 2300L)"
+ *Product: "(HP LaserJet 2300L)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_2420-ps.ppd	2011-11-21 15:56:33.221333549 +0000
+@@ -60,6 +60,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 2420)"
+ *Product: "(HP LaserJet 2420)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_3390-ps.ppd	2011-11-21 15:56:33.109335547 +0000
+@@ -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.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_4000_series-ps.ppd	2011-11-21 15:56:33.114335459 +0000
+@@ -51,6 +51,7 @@
+ 
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series"
+ *Product: "(HP LaserJet 4000 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet 4000 Series)"
+ *ModelName: "HP LaserJet 4000 Series"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_4050_series-ps.ppd	2011-11-21 15:56:33.226333460 +0000
+@@ -52,6 +52,7 @@
+ 
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;"
+ *Product: "(HP LaserJet 4050 Series )"
+ *Product: "(Hewlett-Packard HP LaserJet 4050 Series )"
+ *Product: "(HP LaserJet 4050 Series)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_4100_series-ps.ppd	2011-11-21 15:56:33.232333352 +0000
+@@ -51,6 +51,7 @@
+ 
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;"
+ *Product: "(HP LaserJet 4100 Series )"
+ *Product: "(Hewlett-Packard HP LaserJet 4100 Series )"
+ *Product: "(HP LaserJet 4100 Series)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_4200-ps.ppd	2011-11-21 15:56:33.238333246 +0000
+@@ -52,6 +52,7 @@
+ 
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;"
+ *Product: "(hp LaserJet 4200)"
+ *Product: "(Hewlett-Packard hp LaserJet 4200)"
+ *Product: "(HP LaserJet 4200)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4250-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_4250-ps.ppd	2011-11-21 15:56:33.008337350 +0000
+@@ -53,6 +53,7 @@
+ *HPPDEPanel: "HPImagingOptions"
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;"
+ *Product: "(hp LaserJet 4250)"
+ *Product: "(Hewlett-Packard hp LaserJet 4250)"
+ *Product: "(HP LaserJet 4250)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_4300-ps.ppd	2011-11-21 15:56:33.244333138 +0000
+@@ -52,6 +52,7 @@
+ 
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;"
+ *Product: "(hp LaserJet 4300)"
+ *Product: "(Hewlett-Packard hp LaserJet 4300)"
+ *Product: "(HP LaserJet 4300)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_4350-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:39.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_4350-ps.ppd	2011-11-21 15:56:33.257332906 +0000
+@@ -53,6 +53,7 @@
+ *HPPDEPanel: "HPImagingOptions"
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;"
+ *Product: "(hp LaserJet 4350)"
+ *Product: "(Hewlett-Packard hp LaserJet 4350)"
+ *Product: "(HP LaserJet 4350)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:40.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_5100_series-ps.ppd	2011-11-21 15:56:33.264332782 +0000
+@@ -53,6 +53,7 @@
+ 
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;"
+ *Product: "(HP LaserJet 5100 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet 5100 Series)"
+ *ModelName: "HP LaserJet 5100 Series"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:40.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_8000-ps.ppd	2011-11-21 15:56:33.270332674 +0000
+@@ -55,6 +55,7 @@
+ *%=================================================
+ *% 		 Product Version Information
+ *%=================================================
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;"
+ *ModelName: "HP LaserJet 8000 Series"
+ *ShortNickName: "HP LaserJet 8000 Series"
+ *NickName: "HP LaserJet 8000 Series Postscript (recommended)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:40.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_8000_series-ps.ppd	2011-11-21 15:56:33.281332478 +0000
+@@ -55,6 +55,7 @@
+ *%=================================================
+ *% 		 Product Version Information
+ *%=================================================
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;"
+ *ModelName: "HP LaserJet 8000 Series"
+ *ShortNickName: "HP LaserJet 8000 Series"
+ *NickName: "HP LaserJet 8000 Series Postscript (recommended)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:40.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd	2011-11-21 15:56:33.290332317 +0000
+@@ -56,6 +56,7 @@
+ *%=================================================
+ *% 		 Product Version Information
+ *%=================================================
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;"
+ *ModelName: "HP LaserJet M3027 MFP"
+ *ShortNickName: "HP LaserJet M3027 MFP"
+ *NickName: "HP LaserJet M3027 MFP Postscript (recommended)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:40.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd	2011-11-21 15:56:33.298332175 +0000
+@@ -56,6 +56,7 @@
+ *%=================================================
+ *% 		 Product Version Information
+ *%=================================================
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;"
+ *ModelName: "HP LaserJet M3035 MFP"
+ *ShortNickName: "HP LaserJet M3035 MFP"
+ *NickName: "HP LaserJet M3035 MFP Postscript (recommended)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:40.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_p2015_series-ps.ppd	2011-11-21 15:56:33.101335690 +0000
+@@ -64,6 +64,7 @@
+ *Product: "(HP LaserJet P2015 Series)"
+ *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
+ *Manufacturer: "HP"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;"
+ *PSVersion: "(3010.107) 0"
+ 
+ *%=================================================
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:40.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_p3005-ps.ppd	2011-11-21 15:56:33.309331978 +0000
+@@ -57,6 +57,7 @@
+ *%=================================================
+ *% 		 Product Version Information
+ *%=================================================
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;"
+ *ModelName: "HP LaserJet P3005"
+ *ShortNickName: "HP LaserJet P3005"
+ *NickName: "HP LaserJet P3005 Postscript (recommended)"
+diff -up hplip-3.11.10/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.11.10/prnt/ps/hp-laserjet_p3010_series-ps.ppd
+--- hplip-3.11.10/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd	2011-10-02 04:11:40.000000000 +0100
++++ hplip-3.11.10/prnt/ps/hp-laserjet_p3010_series-ps.ppd	2011-11-21 15:56:33.329331621 +0000
+@@ -51,6 +51,7 @@
+ *%== Mac OS X specific end ==
+ 
+ *% Product Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;"
+ *Product: "(HP LaserJet P3015)"
+ *Product: "(Hewlett-Packard HP LaserJet P3015)"
+ *Product: "(HP LaserJet P3011)"
diff --git a/hplip.spec b/hplip.spec
index 7034755..0b29d60 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.11.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -233,6 +233,7 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
 #                4650/4700/5550/CP3525 (bug #659040)
 # Color LaserJet CM4730 MFP (bug #658831)
 # Color LaserJet CM3530 MFP (bug #659381)
+# Designjet T770 (bug #747957).
 for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
 do
   gunzip ${ppd_file#*/}.gz
@@ -528,6 +529,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Nov 21 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-8
+- Added IEEE 1284 Device ID for Designjet T770 (bug #747957).
+
 * Wed Nov 16 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-7
 - Corrected IEEE 1284 Device ID for LaserJet M1120 MFP (bug #754139).