rpms/foomatic/FC-4 foomatic-db-consistency.patch, NONE, 1.1 foomatic.spec, 1.94, 1.95

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/foomatic/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26324

Modified Files:
	foomatic.spec 
Added Files:
	foomatic-db-consistency.patch 
Log Message:
* Wed Jan 11 2006 Tim Waugh <twaugh at redhat.com>
- Make sure printers and drivers match up consistently (bug #177064).


foomatic-db-consistency.patch:
 driver/Postscript.xml  |   15 +++++++++++++++
 printer/HP-DeskJet.xml |    2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE foomatic-db-consistency.patch ---
--- foomatic-db-20050310/db/source/driver/Postscript.xml.consistency	2006-01-11 15:49:22.000000000 +0000
+++ foomatic-db-20050310/db/source/driver/Postscript.xml	2006-01-11 15:51:43.000000000 +0000
@@ -557,12 +557,21 @@
    <id>printer/HP-LaserJet_4350</id>
   </printer>
   <printer>
+   <id>printer/HP-LaserJet_4_Plus</id>
+  </printer>
+  <printer>
    <id>printer/HP-LaserJet_4M</id><!-- HP LaserJet 4M -->
   </printer>
   <printer>
    <id>printer/HP-LaserJet_4ML</id><!-- HP LaserJet 4ML -->
   </printer>
   <printer>
+   <id>printer/HP-LaserJet_4Si</id>
+  </printer>
+  <printer>
+   <id>printer/HP-LaserJet_4V</id>
+  </printer>
+  <printer>
    <id>printer/HP-LaserJet_5000</id><!-- HP LaserJet 5000 -->
   </printer>
   <printer>
@@ -575,6 +584,9 @@
    <id>printer/HP-LaserJet_5MP</id><!-- HP LaserJet 5MP -->
   </printer>
   <printer>
+   <id>printer/HP-LaserJet_5Si</id>
+  </printer>
+  <printer>
    <id>printer/HP-LaserJet_6MP</id><!-- HP LaserJet 6MP -->
   </printer>
   <printer>
@@ -601,6 +613,9 @@
   <printer>
    <id>printer/HP-LaserJet_9050_MFP</id>
   </printer>
+  <printer>
+   <id>printer/HP-LaserJet_9100</id>
+  </printer>
 
   <printer>
    <id>printer/HP-Mopier_240</id><!-- HP Mopier 240 -->
--- foomatic-db-20050310/db/source/printer/HP-DeskJet.xml.consistency	2006-01-11 15:56:18.000000000 +0000
+++ foomatic-db-20050310/db/source/printer/HP-DeskJet.xml	2006-01-11 15:56:35.000000000 +0000
@@ -21,7 +21,7 @@
   <autodetect>
   <!--no known parport probe information--></autodetect>
   <functionality>A</functionality>
-  <driver>hpijs</driver>
+  <driver>pcl3</driver>
   <!--no "contrib_url"-->
   <comments>
     <en></en>


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-4/foomatic.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- foomatic.spec	8 Jan 2006 10:36:39 -0000	1.94
+++ foomatic.spec	11 Jan 2006 16:01:00 -0000	1.95
@@ -71,6 +71,9 @@
 # Fix Postscript driver (bug #151645).
 Patch17: foomatic-postscript.patch
 
+# Make sure printers and drivers match up consistently (bug #177064).
+Patch18: foomatic-db-consistency.patch
+
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
@@ -139,6 +142,7 @@
 %patch8 -p1 -b .hplj5
 %patch16 -p1 -b .ieee1284
 %patch17 -p1 -b .postscript
+%patch18 -p1 -b .consistency
 
 %if %with_omni
 # Omni printers
@@ -289,6 +293,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jan 11 2006 Tim Waugh <twaugh at redhat.com>
+- Make sure printers and drivers match up consistently (bug #177064).
+
 * Sun Jan  8 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-19.1
 - Fix hpijs conflict (bug #177230).