[foomatic-db/f13/master] Updated to foomatic-db-4.0-20100819, foomatic-db-hpijs-20090901.tar.gz

Jiří Popelka jpopelka at fedoraproject.org
Thu Aug 19 11:15:11 UTC 2010 

commit 4e1db041dacd70437bd1dcbe6d210b9d367cb864
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Aug 19 13:09:15 2010 +0200

    Updated to foomatic-db-4.0-20100819, foomatic-db-hpijs-20090901.tar.gz

 .gitignore                                         |    2 +
 foomatic-db-bad-margins.patch                      | 3656 --
 ...tic-db-device-id-hp-ps2570-dj959c-ojpk550.patch |   47 -
 foomatic-db-device-id-kyocera-mita-fs-1020d.patch  |   90 -
 foomatic-db-device-ids-20100416.patch              |   51 -
 foomatic-db-device-ids-20100506.patch              |   72 -
 foomatic-db-device-ids-ricoh.patch                 |40198 --------------------
 foomatic-db.spec                                   |   45 +-
 sources                                            |    4 +-
 9 files changed, 19 insertions(+), 44146 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6bdde5f..8bb1478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ foomatic-db-hpijs-20090701.tar.gz
 foomatic-db-4.0-20090819.tar.gz
 foomatic-db-4.0-20091126.tar.gz
 foomatic-db-4.0-20100204.tar.gz
+/foomatic-db-4.0-20100819.tar.gz
+/foomatic-db-hpijs-20090901.tar.gz
diff --git a/foomatic-db-device-ids-20100416.patch b/foomatic-db-device-ids-20100416.patch
index 44bc7c6..3596c8d 100644
--- a/foomatic-db-device-ids-20100416.patch
+++ b/foomatic-db-device-ids-20100416.patch
@@ -1,38 +1,3 @@
-diff -U0 foomatic-db-20100204/ChangeLog.device-ids-20100416 foomatic-db-20100204/ChangeLog
-diff -up foomatic-db-20100204/db/source/printer/Brother-HL-2140.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/Brother-HL-2140.xml
---- foomatic-db-20100204/db/source/printer/Brother-HL-2140.xml.device-ids-20100416	2010-04-16 19:07:14.770273169 +0100
-+++ foomatic-db-20100204/db/source/printer/Brother-HL-2140.xml	2010-04-16 19:08:42.567147839 +0100
-@@ -19,6 +19,13 @@
-       <charset>us-ascii</charset>
-     </text>
-   </lang>
-+  <autodetect>
-+    <usb>
-+      <commandset>PJL,HBP</commandset>
-+      <manufacturer>Brother</manufacturer>
-+      <model>HL-2140 series</model>
-+    </usb>
-+  </autodetect>
-   <functionality>B</functionality>
-   <driver>hpijs-pcl5e</driver>
-   <comments>
-diff -up foomatic-db-20100204/db/source/printer/Canon-BJC-4100.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/Canon-BJC-4100.xml
---- foomatic-db-20100204/db/source/printer/Canon-BJC-4100.xml.device-ids-20100416	2010-04-16 19:07:14.794273136 +0100
-+++ foomatic-db-20100204/db/source/printer/Canon-BJC-4100.xml	2010-04-16 19:08:42.568147973 +0100
-@@ -18,6 +18,13 @@
-       <charset>us-ascii</charset>
-     </text>
-   </lang>
-+  <autodetect>
-+    <general>
-+      <commandset>BJ,LQ,BJL,BJRaster</commandset>
-+      <manufacturer>Canon</manufacturer>
-+      <model>BJC-4100</model>
-+    </general>
-+  </autodetect>
-   <functionality>A</functionality>
-   <driver>bjc600</driver>
-   <comments>
 diff -up foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml
 --- foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml.device-ids-20100416	2010-04-16 19:07:15.569148536 +0100
 +++ foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_3800.xml	2010-04-16 19:08:42.589148242 +0100
@@ -101,22 +66,6 @@ diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_F2100.xml.device-ids-
      </general>
    </autodetect>
    <functionality>B</functionality>
-diff -up foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml
---- foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml.device-ids-20100416	2010-04-16 19:07:15.671273689 +0100
-+++ foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml	2010-04-16 19:08:42.592147514 +0100
-@@ -19,9 +19,9 @@
-   </lang>
-   <autodetect>
-     <general>
--      <commandset>MLC,PCL,PML,DW-PCL,DYN</commandset>
--      <manufacturer>Hewlett-Packard</manufacturer>
--      <model>OfficeJet 6100 Series</model>
-+      <commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset>
-+      <manufacturer>HP</manufacturer>
-+      <model>Officejet 6100 series</model>
-     </general>
-   </autodetect>
-   <functionality>B</functionality>
 diff -up foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml.device-ids-20100416 foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml
 --- foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml.device-ids-20100416	2010-04-16 19:07:15.675273282 +0100
 +++ foomatic-db-20100204/db/source/printer/HP-OfficeJet_7300.xml	2010-04-16 19:08:42.593147690 +0100
diff --git a/foomatic-db-device-ids-20100506.patch b/foomatic-db-device-ids-20100506.patch
index ac0e7ea..5551aed 100644
--- a/foomatic-db-device-ids-20100506.patch
+++ b/foomatic-db-device-ids-20100506.patch
@@ -1,22 +1,3 @@
-diff -U0 foomatic-db-20100204/ChangeLog.device-ids-20100506 foomatic-db-20100204/ChangeLog
-diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd.device-ids-20100506 foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd
---- foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd.device-ids-20100506	2010-05-06 14:13:12.825050447 +0100
-+++ foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd	2010-05-06 14:13:27.623050310 +0100
-@@ -41,6 +41,7 @@
- *PSVersion: "(3015.102) 2"
- *ShortNickName: "Ricoh Aficio MP C3500 PS"
- *NickName: "Ricoh Aficio MP C3500 PS"
-+*1284DeviceID: "MFG:RICOH;MDL:Aficio MP C3500;CMD:PJL,RCS,PCL,PCLXL,POSTSCRIPT;"
- 
- *%========== Basic Device Capabilities ==========
- 
-@@ -2309,4 +2310,4 @@ cleartomark\n"
- *CloseGroup: JobLog/Job Log
- 
- 
--*% end of Printer Description file
-\ No newline at end of file
-+*% end of Printer Description file
 diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506 foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd
 --- foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506	2010-05-06 14:13:12.956050897 +0100
 +++ foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd	2010-05-06 14:13:27.625050334 +0100
@@ -35,17 +16,6 @@ diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.p
 -*% end of Printer Description file
 \ No newline at end of file
 +*% end of Printer Description file
-diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd.device-ids-20100506 foomatic-db-20100204/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd
---- foomatic-db-20100204/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd.device-ids-20100506	2010-05-06 14:13:12.675050584 +0100
-+++ foomatic-db-20100204/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd	2010-05-06 14:13:27.629926190 +0100
-@@ -42,6 +42,7 @@
- *PSVersion: "(3015.102) 2"
- *ShortNickName: "Ricoh Aficio MP C3500 PXL"
- *NickName: "Ricoh Aficio MP C3500 PXL"
-+*1284DeviceID: "MFG:RICOH;MDL:Aficio MP C3500;CMD:PJL,RCS,PCL,PCLXL,POSTSCRIPT;"
- 
- *cupsVersion:      1.1
- *cupsManualCopies: True
 diff -up foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml
 --- foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml.device-ids-20100506	2010-05-06 14:13:27.638050300 +0100
 +++ foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml	2010-05-06 14:13:27.638050300 +0100
@@ -99,45 +69,3 @@ diff -up foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml.dev
 +    </en>
 +  </comments>
 +</printer>
-diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_F300.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-DeskJet_F300.xml
---- foomatic-db-20100204/db/source/printer/HP-DeskJet_F300.xml.device-ids-20100506	2010-05-06 14:13:05.086050619 +0100
-+++ foomatic-db-20100204/db/source/printer/HP-DeskJet_F300.xml	2010-05-06 14:13:27.638050300 +0100
-@@ -16,11 +16,6 @@
-     <proprietary />
-   </lang>
-   <autodetect>
--    <general>
--      <commandset>LDL,MLC,PML,DYN</commandset>
--      <manufacturer>Hewlett-Packard</manufacturer>
--      <model>Deskjet F300 series</model>
--    </general>
-     <usb>
-       <commandset>LDL,MLC,PML,DYN</commandset>
-       <manufacturer>HP</manufacturer>
-diff -up foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml
---- foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml.device-ids-20100506	2010-05-06 14:13:18.466926042 +0100
-+++ foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml	2010-05-06 14:13:27.639050556 +0100
-@@ -21,7 +21,7 @@
-     <general>
-       <commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset>
-       <manufacturer>HP</manufacturer>
--      <model>Officejet 6100 series</model>
-+      <model>Officejet 6200 series</model>
-     </general>
-   </autodetect>
-   <functionality>B</functionality>
-diff -up foomatic-db-20100204/db/source/printer/HP-PSC_1400.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-PSC_1400.xml
---- foomatic-db-20100204/db/source/printer/HP-PSC_1400.xml.device-ids-20100506	2010-05-06 14:13:05.182049990 +0100
-+++ foomatic-db-20100204/db/source/printer/HP-PSC_1400.xml	2010-05-06 14:13:27.639926552 +0100
-@@ -16,11 +16,6 @@
-     <proprietary />
-   </lang>
-   <autodetect>
--    <general>
--      <commandset>LDL,MLC,PML,DYN</commandset>
--      <manufacturer>Hewlett-Packard</manufacturer>
--      <model>psc 1200 series</model>
--    </general>
-     <usb>
-       <commandset>LDL,MLC,PML,DYN</commandset>
-       <manufacturer>HP</manufacturer>
diff --git a/foomatic-db.spec b/foomatic-db.spec
index 69b534b..88a2540 100644
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@ -1,25 +1,22 @@
 %define dbver_rel 4.0
-%define dbver_snap 20100204
-%define hpijsver 20090701
+%define dbver_snap 20100819
+%define hpijsver 20090901
 
 Summary: Database of printers and printer drivers
 Name: foomatic-db
 Version: %{dbver_rel}
-Release: 18.%{dbver_snap}%{?dist}
+Release: 19.%{dbver_snap}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Requires: %{name}-filesystem = %{version}-%{release}
 Requires: %{name}-ppds = %{version}-%{release}
 
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
-Source1: http://www.openprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
+Source1: http://www.openprinting.org/download/foomatic/oldstuff/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
-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
-Patch4: foomatic-db-device-ids-20100416.patch
-Patch5: foomatic-db-device-ids-20100506.patch
-Patch6: foomatic-db-device-ids-ricoh.patch
+Patch1: foomatic-db-device-ids-20100416.patch
+Patch2: foomatic-db-device-ids-20100506.patch
+Patch3: foomatic-db-device-id-C3170.patch
 
 Url: http://www.openprinting.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,18 +94,7 @@ popd
 # Don't use "-b" when patching PPD files as the backups will be
 # packaged.
 
-# Device ID for Kyocera Mita FS-1020D (bug #575063).
-%patch1 -p1
-
-# 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
-
 # Device IDs for:
-# - Canon BJC-4100 (bug #583060)
 # - HP Color LaserJet 3800 (bug #581936).
 # - HP DeskJet D2300 (bug #580341).
 # - HP DeskJet F2100 (bug #579245).
@@ -116,21 +102,16 @@ popd
 # - Lexmark E120 (bug #577881).
 # - HP DeskJet 1280 (bug #577870).
 # - HP PhotoSmart 7400 (bug #577866).
-# - Brother HL-2140 (bug #577863).
-# - HP OfficeJet 6200 (bug #215063).
 # - HP PSC 2400 (bug #188419).
-%patch4 -p1 -b .device-ids-20100416
+%patch1 -p1 -b .device-ids-20100416
 
 # Device IDs for:
 # - HP Color LaserJet 2605dn (bug #583909).
-# - HP DeskJet F300 (bug #585644).
-# - HP OfficeJet 6200 (bug #215063).
-# - HP PSC 1400 (bug #586381).
-# - Ricoh Aficio MP C3500 (bug #589527).
 # - Ricoh Aficio SP C420DN (bug #589533).
-%patch5 -p1
+%patch2 -p1
 
-%patch6 -p1
+# Device ID for Canon iR 3170C (bug #617493).
+%patch3 -p1 -b .C3170
 
 # Use sed instead of perl in the PPDs (bug #512739).
 find db/source/PPD -type f -name '*.ppd' | xargs perl -pi -e 's,perl -p,sed,'
@@ -201,6 +182,10 @@ rm -rf %{buildroot}
 %{_datadir}/cups/model/foomatic-db-ppds
 
 %changelog
+* Thu Aug 19 2010 Jiri Popelka <jpopelka at redhat.com> 4.0-19.20100819
+- Updated to foomatic-db-4.0-20100819, foomatic-db-hpijs-20090901.tar.gz
+- Device ID for Canon iR 3170C (bug #617493).
+
 * Mon Jul 12 2010 Jiri Popelka <jpopelka at redhat.com> 4.0-18.20100204
 - Moved COPYING file to ppds sub-package.
 
diff --git a/sources b/sources
index 2bce79f..6424854 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
-49eacf0b2ad92445b9703e7fe36d9b6a  foomatic-db-4.0-20100204.tar.gz
+0ed5d8d37cb80defa720aef07af07e1e  foomatic-db-4.0-20100819.tar.gz
+beb05c3a335e8a1e5aea5a030badc35d  foomatic-db-hpijs-20090901.tar.gz

More information about the scm-commits mailing list