From 53e8e60e1352d5ca7b69525dd976fa6161f8483b Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 26 Mar 2010 18:17:04 +0000
Subject: [PATCH] - Device IDs for HP PhotoSmart 2570, HP DeskJet 959C and HP
 OfficeJet Pro     K550 (bug #577280, bug #577293, bug #577296).

---
 ...b-device-id-hp-ps2570-dj959c-ojpk550.patch | 47 +++++++++++++++++++
 foomatic-db.spec                              | 11 ++++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 foomatic-db-device-id-hp-ps2570-dj959c-ojpk550.patch

diff --git a/foomatic-db-device-id-hp-ps2570-dj959c-ojpk550.patch b/foomatic-db-device-id-hp-ps2570-dj959c-ojpk550.patch
new file mode 100644
index 0000000..c1977e2
--- /dev/null
+++ b/foomatic-db-device-id-hp-ps2570-dj959c-ojpk550.patch
@@ -0,0 +1,47 @@
+diff -U0 foomatic-db-20100204/ChangeLog.device-id-hp-ps2570-dj959c-ojpk550 foomatic-db-20100204/ChangeLog
+diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_959C.xml.device-id-hp-ps2570-dj959c-ojpk550 foomatic-db-20100204/db/source/printer/HP-DeskJet_959C.xml
+--- foomatic-db-20100204/db/source/printer/HP-DeskJet_959C.xml.device-id-hp-ps2570-dj959c-ojpk550	2010-03-26 18:02:07.658626522 +0000
++++ foomatic-db-20100204/db/source/printer/HP-DeskJet_959C.xml	2010-03-26 18:02:47.552752211 +0000
+@@ -18,6 +18,12 @@
+       <charset>us-ascii</charset>
+     </text>
+   </lang>
++  <autodetect>
++    <general>
++      <manufacturer>HEWLETT-PACKARD</manufacturer>
++      <model>DESKJET 950C</model>
++    </general>
++  </autodetect>
+   <functionality>A</functionality>
+   <driver>hplip</driver>
+   <comments>
+diff -up foomatic-db-20100204/db/source/printer/HP-OfficeJet_Pro_K550.xml.device-id-hp-ps2570-dj959c-ojpk550 foomatic-db-20100204/db/source/printer/HP-OfficeJet_Pro_K550.xml
+--- foomatic-db-20100204/db/source/printer/HP-OfficeJet_Pro_K550.xml.device-id-hp-ps2570-dj959c-ojpk550	2010-03-26 18:02:07.797626677 +0000
++++ foomatic-db-20100204/db/source/printer/HP-OfficeJet_Pro_K550.xml	2010-03-26 18:02:47.554761101 +0000
+@@ -19,10 +19,10 @@
+   </lang>
+   <autodetect>
+     <parallel>
+-      <commandset>MLC,PML,PCL</commandset>
+-      <description>Hewlett-Packard OfficeJet_Pro_K550</description>
+-      <manufacturer>HEWLETT-PACKARD</manufacturer>
+-      <model>HP OfficeJet Pro K550</model>
++      <commandset>MLC,PCL,PML,DESKJET,DW-PCL,DYN</commandset>
++      <description>HP Officejet Pro K550</description>
++      <manufacturer>HP</manufacturer>
++      <model>Officejet Pro K550</model>
+     </parallel>
+   </autodetect>
+   <functionality>A</functionality>
+diff -up foomatic-db-20100204/db/source/printer/HP-PhotoSmart_2570.xml.device-id-hp-ps2570-dj959c-ojpk550 foomatic-db-20100204/db/source/printer/HP-PhotoSmart_2570.xml
+--- foomatic-db-20100204/db/source/printer/HP-PhotoSmart_2570.xml.device-id-hp-ps2570-dj959c-ojpk550	2010-03-26 18:02:07.829627307 +0000
++++ foomatic-db-20100204/db/source/printer/HP-PhotoSmart_2570.xml	2010-03-26 18:02:47.557755598 +0000
+@@ -23,7 +23,7 @@
+       <commandset>MLC,PCL,PML,DW-PCL</commandset>
+       <description>hp photosmart 2570</description>
+       <manufacturer>HP</manufacturer>
+-      <model>PHOTOSMART 2570</model>
++      <model>Photosmart 2570 series</model>
+     </general>
+   </autodetect>
+   <functionality>A</functionality>
diff --git a/foomatic-db.spec b/foomatic-db.spec
index 79a09d1..5ae6e2a 100644
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@ -5,7 +5,7 @@
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 12.%{dbver_snap}%{?dist}
+Release: 13.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
@@ -16,6 +16,7 @@ Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijs
 
 Patch1: foomatic-db-device-id-kyocera-mita-fs-1020d.patch
 Patch2: foomatic-db-bad-margins.patch
+Patch3: foomatic-db-device-id-hp-ps2570-dj959c-ojpk550.patch
 
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -102,6 +103,10 @@ popd
 # Fixed missing units in driver margins (bug #576370).
 %patch2 -p1 -b .bad-margins
 
+# Device IDs for HP PhotoSmart 2570, HP DeskJet 959C and HP OfficeJet
+# Pro K550 (bug #577280, bug #577293, bug #577296).
+%patch3 -p1 -b .device-id-hp-ps2570-dj959c-ojpk550.patch
+
 popd
 
 %build
@@ -168,6 +173,10 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Fri Mar 26 2010 Tim Waugh <twaugh@redhat.com> 4.0-13.20100402
+- Device IDs for HP PhotoSmart 2570, HP DeskJet 959C and HP OfficeJet
+  Pro K550 (bug #577280, bug #577293, bug #577296).
+
 * Thu Mar 25 2010 Tim Waugh <twaugh@redhat.com> 4.0-12.20100402
 - Fixed missing units in driver margins (bug #576370).