rpms/hplip/F-13 hplip-deviceIDs-drv.patch, 1.3, 1.4 hplip-deviceIDs-ppd.patch, 1.2, 1.3 hplip.spec, 1.276, 1.277

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/hplip/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27006

Modified Files:
	hplip-deviceIDs-drv.patch hplip-deviceIDs-ppd.patch hplip.spec 
Log Message:
* Wed May 12 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-15
- Added/corrected more IEEE 1284 Device IDs:
  - HP LaserJet 4250 (bug #585499).
  - HP Color LaserJet 2605dn (bug #583953).
  - HP LaserJet P1007 (bug #585272).


hplip-deviceIDs-drv.patch:
 hpcups.drv.in |  301 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 151 insertions(+), 150 deletions(-)

Index: hplip-deviceIDs-drv.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-13/hplip-deviceIDs-drv.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hplip-deviceIDs-drv.patch	16 Apr 2010 21:36:22 -0000	1.3
+++ hplip-deviceIDs-drv.patch	12 May 2010 10:27:29 -0000	1.4
@@ -1350,3 +1350,12 @@ diff -up hplip-3.10.2/prnt/drv/hpcups.dr
        PCFileName "hp-laserjet_p1006.ppd"
        Attribute "Product" "" "(HP LaserJet p1006 Printer)"
      }
+@@ -13407,7 +13408,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"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1007;DES:HP LaserJet P1007;"
+       PCFileName "hp-laserjet_p1007.ppd"
+       Attribute "Product" "" "(HP LaserJet p1007 Printer)"
+     }

hplip-deviceIDs-ppd.patch:
 hp-color_laserjet_2605dn-ps.ppd   |    1 +
 hp-color_laserjet_2840-ps.ppd     |    1 +
 hp-color_laserjet_3800-ps.ppd     |    1 +
 hp-laserjet_1200-ps.ppd           |    1 +
 hp-laserjet_1200n-ps.ppd          |    1 +
 hp-laserjet_1320-ps.ppd           |    1 +
 hp-laserjet_1320_series-ps.ppd    |    1 +
 hp-laserjet_1320n-ps.ppd          |    1 +
 hp-laserjet_1320nw-ps.ppd         |    1 +
 hp-laserjet_1320tn-ps.ppd         |    1 +
 hp-laserjet_2300-ps.ppd           |    1 +
 hp-laserjet_2300_series-ps.ppd    |    1 +
 hp-laserjet_4250-ps.ppd           |    1 +
 hp-laserjet_p2015_series-ps.ppd   |    1 +
 hp-laserjet_p2015dn_series-ps.ppd |    1 +
 hp-laserjet_p2015n_series-ps.ppd  |    1 +
 hp-laserjet_p2015x_series-ps.ppd  |    1 +
 17 files changed, 17 insertions(+)

Index: hplip-deviceIDs-ppd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-13/hplip-deviceIDs-ppd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hplip-deviceIDs-ppd.patch	16 Apr 2010 21:36:23 -0000	1.2
+++ hplip-deviceIDs-ppd.patch	12 May 2010 10:27:29 -0000	1.3
@@ -1,3 +1,25 @@
+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


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-13/hplip.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- hplip.spec	12 May 2010 08:26:39 -0000	1.276
+++ hplip.spec	12 May 2010 10:27:29 -0000	1.277
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -140,6 +140,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # HP Color LaserJet CM1312nfi (bug #581005).
 # HP Color LaserJet 3800 (bug #581935).
 # HP Color LaserJet 2840 (bug #582215).
+# HP LaserJet P1007 (bug #585272).
 %patch5 -p1 -b .deviceIDs-drv
 
 # Stopped hpcups pointlessly trying to read spool files
@@ -178,6 +179,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # HP LaserJet P2015 Series (bug #580231)
 # HP Color LaserJet 3800 (bug #581935).
 # HP Color LaserJet 2840 (bug #582215).
+# HP LaserJet 4250 (bug #585499).
+# HP Color LaserJet 2605dn (bug #583953).
 for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
 do
   gunzip ${ppd_file#*/}.gz
@@ -418,6 +421,12 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Wed May 12 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-15
+- Added/corrected more IEEE 1284 Device IDs:
+  - HP LaserJet 4250 (bug #585499).
+  - HP Color LaserJet 2605dn (bug #583953).
+  - HP LaserJet P1007 (bug #585272).
+
 * Wed May 12 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-14
 - Wait for max 30s to see if a system tray becomes available (bug #569969).