Hello community,
here is the log from the commit of package cups-drivers
checked in at Fri Sep 12 23:59:42 CEST 2008.
--------
--- cups-drivers/cups-drivers.changes 2008-03-18 17:22:55.000000000 +0100
+++ cups-drivers/cups-drivers.changes 2008-09-12 23:55:53.563273000 +0200
@@ -1,0 +2,13 @@
+Tue Sep 9 17:54:19 CEST 2008 - kssingvo@suse.de
+
+- updated to OpenPrinting database from 2008-SEP-09:
+ * new printers: Epson, Lexmark, HP, Xerox, Oki, Sharp, Oce, Brother
+ * new messages
+ * fix for PPDtoXML
+ * for full list see included ChangeLog file
+- fixed some drivers
+- adapted old patches
+- fixed compiler warnings for generation tool (bnc#360063)
+- worked on rpmlint warnings
+
+-------------------------------------------------------------------
Old:
----
cups-drivers-1.2.12-A4.patch
cups-drivers-1.2.12-hl7x0_language.patch
cups-drivers-1.2.2-samsunggdi.patch
foomatic-db-bzr-20080317.tar.bz2
foomatic-db-engine-bzr-20080317.tar.bz2
foomatic-filters-bzr-20080317.tar.bz2
New:
----
cups-drivers-1.3.8-A4.patch
cups-drivers-1.3.8-gcc_warn.patch
cups-drivers-1.3.8-hl7x0_language.patch
cups-drivers-1.3.8-missing_xml_close.patch
cups-drivers-1.3.8-Samsung-CLP-550.patch
cups-drivers-1.3.8-samsunggdi.patch
foomatic-db-bzr-20080909.tar.bz2
foomatic-db-engine-bzr-20080909.tar.bz2
foomatic-filters-bzr-20080909.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups-drivers.spec ++++++
--- /var/tmp/diff_new_pack.rj3876/_old 2008-09-12 23:57:51.000000000 +0200
+++ /var/tmp/diff_new_pack.rj3876/_new 2008-09-12 23:57:51.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package cups-drivers (Version 1.3.6)
+# spec file for package cups-drivers (Version 1.3.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -20,7 +27,7 @@
License: GPL v2 only; GPL v2 or later
Group: Hardware/Printing
Summary: Drivers for the Common UNIX Printing System
-Version: 1.3.6
+Version: 1.3.8
Release: 1
Provides: cups_drv
Requires: ghostscript-library >= 7.05, foomatic-filters
@@ -31,7 +38,7 @@
# number of jobs to run simultaneously
%define numprocs %(cat %_sourcedir/CPUs 2>/dev/null || echo 1)
# linuxprinting.org database variables
-%define DBDate 20080317
+%define DBDate 20080909
%define foomaticver bzr
%define gutenprintver 5.0.2
%define splixver 1.0.2
@@ -46,10 +53,13 @@
Source5: http://heanet.dl.sourceforge.net/sourceforge/m2300w/m2300w-%{m2300wver}.tar.bz2
Source100: foomatic-driver.known
Source101: foomatic-driver.unsupported
-Patch0: cups-drivers-1.2.12-A4.patch
-Patch1: cups-drivers-1.2.2-samsunggdi.patch
+Patch0: cups-drivers-1.3.8-A4.patch
+Patch1: cups-drivers-1.3.8-samsunggdi.patch
Patch2: cups-drivers-1.1.23-stcolor.patch
-Patch3: cups-drivers-1.2.12-hl7x0_language.patch
+Patch3: cups-drivers-1.3.8-hl7x0_language.patch
+Patch4: cups-drivers-1.3.8-missing_xml_close.patch
+Patch5: cups-drivers-1.3.8-Samsung-CLP-550.patch
+Patch6: cups-drivers-1.3.8-gcc_warn.patch
Patch300: gutenprint-5.0.0-A4.patch
Patch301: gutenprint-5.0.2-resolution.patch
Patch400: splix-1.0.1_beta2-install.patch
@@ -69,11 +79,12 @@
Grant Taylor
%package -n gutenprint
+License: GPL v2 or later
Summary: Gutenprint drivers for CUPS
Group: Hardware/Printing
Requires: ghostscript-library >= 7.05, cups >= 1.2.2, pstoraster
Version: %{gutenprintver}
-Release: 1
+Release: 14
Obsoletes: cups-drivers-stp
Provides: cups-drivers-stp
PreReq: procps
@@ -85,11 +96,12 @@
%package -n gutenprint-devel
+License: GPL v2 or later
Summary: Development Environment for Gutenprint
Group: Hardware/Printing
Version: %{gutenprintver}
-Release: 1
-Requires: ghostscript-library >= 7.05, cups >= 1.2.2, gutenprint >= 1.2.2
+Release: 14
+Requires: ghostscript-library >= 7.05, cups >= 1.2.2, gutenprint = %{gutenprintver}
Requires: gtk2-devel, glibc-devel
%description -n gutenprint-devel
@@ -103,10 +115,11 @@
Grant Taylor
%package -n gutenprint-gimpplugin
+License: GPL v2 or later
Summary: GIMP plug-in for gutenprint
Group: Hardware/Printing
Version: %{gutenprintver}
-Release: 1
+Release: 4
%description -n gutenprint-gimpplugin
This package contains the gutenprint GIMP plug-in.
@@ -139,7 +152,10 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p0
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
#
pushd gutenprint
%patch300 -p1
@@ -392,7 +408,6 @@
# fix: set CompressionMethod to 0 for DeskJet_500 only
perl -pi -e 's(\(sModel=500\)")($1 -dCompressionMethod=0")' \
$RPM_BUILD_ROOT/usr/share/cups/model/HP/DeskJet_500-hpdj.ppd
-echo "ENABLE PPD compression on next submit!"
set +x
echo "Removing non conform Resolution values in PostScript"
find $RPM_BUILD_ROOT/usr/share/cups/model -name "*-Postscript.ppd" | \
@@ -542,6 +557,16 @@
%{_libdir}/gimp/2.0/plug-ins/*
%changelog
+* Tue Sep 09 2008 kssingvo@suse.de
+- updated to OpenPrinting database from 2008-SEP-09:
+ * new printers: Epson, Lexmark, HP, Xerox, Oki, Sharp, Oce, Brother
+ * new messages
+ * fix for PPDtoXML
+ * for full list see included ChangeLog file
+- fixed some drivers
+- adapted old patches
+- fixed compiler warnings for generation tool (bnc#360063)
+- worked on rpmlint warnings
* Tue Mar 18 2008 kssingvo@suse.de
- update OpenPrinting database to 2007-MAR-17:
* new printer: EPSON LP-S4000
@@ -723,7 +748,7 @@
- remove of PS printers from Ricoh and affiliate need new handling
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Jan 20 2006 mls@suse.de
+* Sat Jan 21 2006 mls@suse.de
- removed -ghostscript-fonts-std, it's no longer needed
* Wed Jan 18 2006 kssingvo@suse.de
- added for gimp-print same patches as used in ghostscript
++++++ cups-drivers-1.2.12-A4.patch -> cups-drivers-1.3.8-A4.patch ++++++
--- cups-drivers/cups-drivers-1.2.12-A4.patch 2007-07-31 18:56:49.000000000 +0200
+++ cups-drivers/cups-drivers-1.3.8-A4.patch 2008-09-09 15:17:11.255181000 +0200
@@ -221,8 +221,157 @@
</constraint>
</constraints>
---- cups-drivers/foomatic-db/db/source/opt/2.xml.orig 2006-08-17 20:01:19.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/2.xml 2007-07-31 18:43:55.000000000 +0200
+--- cups-drivers/foomatic-db/db/source/opt/drv_x125-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/drv_x125-PageSize.xml 2007-07-31 18:43:33.000000000 +0200
+@@ -18,7 +18,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>drv_x125</driver>
+- ev/drv_x125-PageSize-Letter
++ ev/drv_x125-PageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/drv_z42-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/drv_z42-PageSize.xml 2007-07-31 18:43:33.000000000 +0200
+@@ -18,7 +18,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>drv_z42</driver>
+- ev/drv_z42-PageSize-Letter
++ ev/drv_z42-PageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/gdi-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>gdi</driver>
+- ev/gdi-PageSizeJCL-Letter
++ ev/gdi-PageSizeJCL-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml.orig 2006-08-17 20:01:20.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>gdi</driver>
+- ev/gdi-PageSizeJCL-Letter
++ ev/gdi-PageSizeJCL-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/gdi-PageSizePS.xml.orig 2006-08-17 20:01:20.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSizePS.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>gdi</driver>
+- ev/gdi-PageSizePS-Letter
++ ev/gdi-PageSizePS-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>min12xxw</driver>
+- ev/min12xxw-DriverPageSize-Letter
++ ev/min12xxw-DriverPageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>min12xxw</driver>
+- ev/min12xxw-GSPageSize-Letter
++ ev/min12xxw-GSPageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/min12xxw-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/min12xxw-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>min12xxw</driver>
+- ev/min12xxw-PageSize-Letter
++ ev/min12xxw-PageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/oki4w-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/oki4w-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>oki4w</driver>
+- ev/oki4w-PageSize-Letter
++ ev/oki4w-PageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ <constraints>
+ <constraint sense='true'>
+ <driver>pbmtozjs</driver>
+- ev/pbmtozjs-PageSize-Letter
++ ev/pbmtozjs-PageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/pentaxpj-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/pentaxpj-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -19,12 +19,12 @@
+ <constraint sense="true">
+ <driver>pentaxpj</driver>
+ <printer>printer/Pentax-PocketJet_200</printer>
+- ev/pentaxpj-PageSize-200-Letter
++ ev/pentaxpj-PageSize-200-A4
+ </constraint>
+ <constraint sense="true">
+ <driver>pentaxpj</driver>
+ <printer>printer/Pentax-PocketJet_II</printer>
+- ev/pentaxpj-PageSize-300-Letter
++ ev/pentaxpj-PageSize-300-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/ppmtomd-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/ppmtomd-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -18,7 +18,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>ppmtomd</driver>
+- ev/ppmtomd-PageSize-Letter
++ ev/ppmtomd-PageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+@@ -18,7 +18,7 @@
+ <constraints>
+ <constraint sense="true">
+ <driver>sipixa6.upp</driver>
+- ev/sipixa6.upp-PageSize-Letter
++ ev/sipixa6.upp-PageSize-A4
+ </constraint>
+ </constraints>
+
+--- cups-drivers/foomatic-db/db/source/opt/2.xml.orig 2008-09-09 13:57:50.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/2.xml 2008-09-09 15:11:14.000000000 +0200
@@ -17,15 +17,15 @@
<constraints>
<constraint sense="true">
@@ -321,7 +470,7 @@
</constraint>
<constraint sense="false">
<driver>chp2200</driver>
-@@ -121,335 +121,335 @@
+@@ -121,323 +121,323 @@
</constraint>
<constraint sense="true">
<driver>cdj970</driver>
@@ -454,11 +603,6 @@
+ ev/3
</constraint>
<constraint sense="true">
- <driver>Postscript</driver>
-- ev/1
-+ ev/3
- </constraint>
- <constraint sense="true">
<driver>PM820p.upp</driver>
- ev/1
+ ev/3
@@ -723,79 +867,15 @@
- ev/1
+ ev/3
</constraint>
- <constraint sense="false">
- <make>HP</make>
- <model>DesignJet 3500CP</model>
- <driver>Postscript</driver>
-- ev/largeformat-PageSize-Letter
-+ ev/largeformat-PageSize-A4
+ <constraint sense="true">
+ <driver>Postscript1</driver>
+- ev/1
++ ev/3
</constraint>
<constraint sense="false">
<make>HP</make>
- <model>DesignJet 5500ps</model>
- <driver>Postscript</driver>
-- ev/largeformat-PageSize-Letter
-+ ev/largeformat-PageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/drv_x125-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/drv_x125-PageSize.xml 2007-07-31 18:43:33.000000000 +0200
-@@ -18,7 +18,7 @@
- <constraints>
- <constraint sense="true">
- <driver>drv_x125</driver>
-- ev/drv_x125-PageSize-Letter
-+ ev/drv_x125-PageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/drv_z42-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/drv_z42-PageSize.xml 2007-07-31 18:43:33.000000000 +0200
-@@ -18,7 +18,7 @@
- <constraints>
- <constraint sense="true">
- <driver>drv_z42</driver>
-- ev/drv_z42-PageSize-Letter
-+ ev/drv_z42-PageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/gdi-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- <constraints>
- <constraint sense="true">
- <driver>gdi</driver>
-- ev/gdi-PageSizeJCL-Letter
-+ ev/gdi-PageSizeJCL-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml.orig 2006-08-17 20:01:20.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- <constraints>
- <constraint sense="true">
- <driver>gdi</driver>
-- ev/gdi-PageSizeJCL-Letter
-+ ev/gdi-PageSizeJCL-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/gdi-PageSizePS.xml.orig 2006-08-17 20:01:20.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSizePS.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- <constraints>
- <constraint sense="true">
- <driver>gdi</driver>
-- ev/gdi-PageSizePS-Letter
-+ ev/gdi-PageSizePS-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/jap-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/jap-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+--- cups-drivers/foomatic-db/db/source/opt/jap-PageSize.xml.orig 2008-09-09 13:57:50.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/jap-PageSize.xml 2008-09-09 15:13:10.000000000 +0200
@@ -16,255 +16,255 @@
<constraint sense="true">
<printer>printer/Canon-BJ-10v</printer>
@@ -834,7 +914,7 @@
+ ev/jap-PageSize-A4
</constraint>
<constraint sense="true">
- <printer>printer/Okidata-DP_5000</printer> <!-- Okidata DP 5000 -->
+ <printer>printer/Oki-DP_5000</printer> <!-- Oki DP 5000 -->
<driver>md50Mono</driver>
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
@@ -989,7 +1069,7 @@
+ ev/jap-PageSize-A4
</constraint>
<constraint sense="true">
- <printer>printer/Okidata-DP_5000</printer> <!-- Okidata DP 5000 -->
+ <printer>printer/Oki-DP_5000</printer> <!-- Oki DP 5000 -->
<driver>md50Eco</driver>
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
@@ -1013,13 +1093,13 @@
+ ev/jap-PageSize-A4
</constraint>
<constraint sense="true">
- <printer>printer/Okidata-Microline_600CL</printer>
+ <printer>printer/Oki-Microline_600CL</printer>
<driver>ml600</driver>
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
</constraint>
<constraint sense="true">
- <printer>printer/Okidata-Microline_620CL</printer>
+ <printer>printer/Oki-Microline_620CL</printer>
<driver>ml600</driver>
- ev/jap-PageSize-Letter
+ ev/jap-PageSize-A4
@@ -1103,8 +1183,8 @@
</constraint>
</constraints>
---- cups-drivers/foomatic-db/db/source/opt/largeformat-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/largeformat-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
+--- cups-drivers/foomatic-db/db/source/opt/largeformat-PageSize.xml.orig 2008-09-09 13:57:51.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/opt/largeformat-PageSize.xml 2008-09-09 15:14:05.000000000 +0200
@@ -17,55 +17,55 @@
<constraints>
<constraint sense="true">
@@ -1157,110 +1237,16 @@
<constraint sense="true">
<make>HP</make>
<model>DesignJet 3500CP</model>
- <driver>Postscript</driver>
+ <driver>Postscript1</driver>
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
</constraint>
<constraint sense="true">
<make>HP</make>
<model>DesignJet 5500ps</model>
- <driver>Postscript</driver>
+ <driver>Postscript1</driver>
- ev/largeformat-PageSize-Letter
+ ev/largeformat-PageSize-A4
</constraint>
</constraints>
---- cups-drivers/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- <constraints>
- <constraint sense="true">
- <driver>min12xxw</driver>
-- ev/min12xxw-DriverPageSize-Letter
-+ ev/min12xxw-DriverPageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- <constraints>
- <constraint sense="true">
- <driver>min12xxw</driver>
-- ev/min12xxw-GSPageSize-Letter
-+ ev/min12xxw-GSPageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/min12xxw-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/min12xxw-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- <constraints>
- <constraint sense="true">
- <driver>min12xxw</driver>
-- ev/min12xxw-PageSize-Letter
-+ ev/min12xxw-PageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/oki4w-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/oki4w-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- <constraints>
- <constraint sense="true">
- <driver>oki4w</driver>
-- ev/oki4w-PageSize-Letter
-+ ev/oki4w-PageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -17,7 +17,7 @@
- <constraints>
- <constraint sense='true'>
- <driver>pbmtozjs</driver>
-- ev/pbmtozjs-PageSize-Letter
-+ ev/pbmtozjs-PageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/pentaxpj-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/pentaxpj-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -19,12 +19,12 @@
- <constraint sense="true">
- <driver>pentaxpj</driver>
- <printer>printer/Pentax-PocketJet_200</printer>
-- ev/pentaxpj-PageSize-200-Letter
-+ ev/pentaxpj-PageSize-200-A4
- </constraint>
- <constraint sense="true">
- <driver>pentaxpj</driver>
- <printer>printer/Pentax-PocketJet_II</printer>
-- ev/pentaxpj-PageSize-300-Letter
-+ ev/pentaxpj-PageSize-300-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/ppmtomd-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/ppmtomd-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -18,7 +18,7 @@
- <constraints>
- <constraint sense="true">
- <driver>ppmtomd</driver>
-- ev/ppmtomd-PageSize-Letter
-+ ev/ppmtomd-PageSize-A4
- </constraint>
- </constraints>
-
---- cups-drivers/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml 2007-07-31 18:43:55.000000000 +0200
-@@ -18,7 +18,7 @@
- <constraints>
- <constraint sense="true">
- <driver>sipixa6.upp</driver>
-- ev/sipixa6.upp-PageSize-Letter
-+ ev/sipixa6.upp-PageSize-A4
- </constraint>
- </constraints>
-
++++++ cups-drivers-1.3.8-gcc_warn.patch ++++++
--- cups-drivers/foomatic-db-engine/foomatic-combo-xml.c.orig 2008-09-09 13:59:14.000000000 +0200
+++ cups-drivers/foomatic-db-engine/foomatic-combo-xml.c 2008-09-09 16:12:35.000000000 +0200
@@ -540,7 +540,7 @@ parse(char **data, /* I/O - Data to proc
fprintf
(stderr,
" Driver does not allow PJL options and this is a PJL option -->\n Option does not apply!\n");
- return;
+ return 0;
}
}
} else if (strcmp(currtagname, "ev_shortname") == 0) {
@@ -1292,7 +1292,7 @@ parse(char **data, /* I/O - Data to proc
*data = NULL;
if (debug)
fprintf(stderr, " Option does not apply!\n");
- return;
+ return 0;
}
}
if (debug)
@@ -1352,7 +1352,7 @@ parse(char **data, /* I/O - Data to proc
free((void *)(*data));
*data = NULL;
if (debug) fprintf (stderr, " No enum. values, no constraints => Removing option!\n");
- return;
+ return 0;
}
/* Insert the line determining the default setting */
if ((argdefault[0]) || (userdefault)) {
@@ -1540,7 +1540,7 @@ parse(char **data, /* I/O - Data to proc
*data = NULL;
if (debug)
fprintf(stderr, " Driver entry does not produce PPDs!\n");
- return;
+ return 0;
}
}
/* Remove the whole <prototype> block */
++++++ cups-drivers-1.2.12-hl7x0_language.patch -> cups-drivers-1.3.8-hl7x0_language.patch ++++++
--- cups-drivers/cups-drivers-1.2.12-hl7x0_language.patch 2007-09-10 19:37:24.000000000 +0200
+++ cups-drivers/cups-drivers-1.3.8-hl7x0_language.patch 2008-09-09 15:21:34.000000000 +0200
@@ -1,5 +1,5 @@
---- foomatic-db/db/source/driver/hl7x0.xml.orig 2007-07-31 11:55:45.000000000 +0200
-+++ foomatic-db/db/source/driver/hl7x0.xml 2007-09-04 20:19:59.000000000 +0200
+--- cups-drivers/foomatic-db/db/source/driver/hl7x0.xml.orig 2008-09-09 13:57:49.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/driver/hl7x0.xml 2008-09-09 15:20:01.000000000 +0200
@@ -13,7 +13,7 @@
</supportcontacts>
<shortdescription>
@@ -9,10 +9,3 @@
</en>
</shortdescription>
<functionality>
-@@ -114,4 +114,4 @@
- </comments>
- </printer>
- </printers>
--</driver>
-\ No newline at end of file
-+</driver>
++++++ cups-drivers-1.3.8-missing_xml_close.patch ++++++
--- cups-drivers/foomatic-db/db/source/printer/Samsung-ML-6060.xml.orig 2008-09-09 15:22:50.000000000 +0200
+++ cups-drivers/foomatic-db/db/source/printer/Samsung-ML-6060.xml 2008-09-09 15:29:06.000000000 +0200
@@ -26,7 +26,7 @@
</lang>
<autodetect>
<parallel>
- <ieee1284>MFG:Samsung;CMD:PCL5E,PCL6;MDL:ML-6060;CLS:PRINTER;<ieee1284>
+ <ieee1284>MFG:Samsung;CMD:PCL5E,PCL6;MDL:ML-6060;CLS:PRINTER;</ieee1284>
<manufacturer>Samsung</manufacturer>
<model>ML-6060</model>
<commandset>PCL5E,PCL6</commandset>
++++++ cups-drivers-1.3.8-Samsung-CLP-550.patch ++++++
--- cups-drivers/foomatic-db/db/source/printer/Samsung-CLP-550.xml.orig 2008-09-09 13:57:56.000000000 +0200
+++ cups-drivers/foomatic-db/db/source/printer/Samsung-CLP-550.xml 2008-09-09 15:48:08.000000000 +0200
@@ -23,6 +23,8 @@
<pcl level="6"/>
<pjl/>
<text>
+ <charset>us-ascii</charset>
+ </text>
</lang>
<autodetect>
<usb>
++++++ cups-drivers-1.2.2-samsunggdi.patch -> cups-drivers-1.3.8-samsunggdi.patch ++++++
--- cups-drivers/cups-drivers-1.2.2-samsunggdi.patch 2003-07-26 15:50:28.000000000 +0200
+++ cups-drivers/cups-drivers-1.3.8-samsunggdi.patch 2008-09-09 15:19:15.000000000 +0200
@@ -1,11 +1,11 @@
---- cups-drivers/foomatic-db/db/source/driver/gdi.xml.orig 2003-07-25 19:24:58.000000000 +0200
-+++ cups-drivers/foomatic-db/db/source/driver/gdi.xml 2003-07-26 15:49:48.000000000 +0200
+--- cups-drivers/foomatic-db/db/source/driver/gdi.xml.orig 2008-09-09 13:57:47.000000000 +0200
++++ cups-drivers/foomatic-db/db/source/driver/gdi.xml 2008-09-09 15:18:52.000000000 +0200
@@ -3,7 +3,7 @@
- <url>http://www.linuxprinting.org/download/printing/samsung-gdi/</url>
+ <url>http://www.openprinting.org/download/printing/samsung-gdi/</url>
<execution>
<ghostscript />
-- <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=gdi%A%Z -sOutputFile=- - | perl -p -e '%E'</prototype>
-+ <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=samsunggdi%A%Z -sOutputFile=- - | perl -p -e '%E'</prototype>
+- <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=gdi%A%Z -sOutputFile=-%C -f - | perl -p -e '%E'</prototype>
++ <prototype>gs -q -dBATCH -dPARANOIDSAFER -dQUIET -dNOPAUSE -sDEVICE=samsunggdi%A%Z -sOutputFile=-%C -f - | perl -p -e '%E'</prototype>
</execution>
<comments>
<en>
++++++ foomatic-db-bzr-20080317.tar.bz2 -> foomatic-db-bzr-20080909.tar.bz2 ++++++
++++ 111023 lines of diff (skipped)
++++++ foomatic-db-engine-bzr-20080317.tar.bz2 -> foomatic-db-engine-bzr-20080909.tar.bz2 ++++++
++++ 2169 lines of diff (skipped)
++++++ foomatic-filters-bzr-20080317.tar.bz2 -> foomatic-filters-bzr-20080909.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-filters-bzr-20080317/ChangeLog new/foomatic-filters-bzr-20080909/ChangeLog
--- old/foomatic-filters-bzr-20080317/ChangeLog 2008-03-17 21:18:22.000000000 +0100
+++ new/foomatic-filters-bzr-20080909/ChangeLog 2008-09-09 13:59:45.000000000 +0200
@@ -1,3 +1,66 @@
+2008-09-05 Till Kamppeter
+
+ * foomatic-rip.in: Make foomatic-rip also working with PPD file
+ names which contain brackets or other special characters (Bug
+ #169).
+
+2008-04-23 Till Kamppeter
+
+ * make_configure: Only generate a version stamp if we have really
+ a BZR snapshot.
+
+2008-04-22 Till Kamppeter
+
+ * make_configure, Makefile.in, VERSION: Modified revision stamping
+ to let the revision number also contain the number of the last
+ release, not only the BZR revision number.
+
+2008-04-21 Till Kamppeter
+
+ * foomatic-rip.in: Added possibility to check the revision number
+ of the currently installed foomatic-rip, by calling foomatic-rip
+ on the command line with one of the options "-h", "-v",
+ "--help", or "--version" (all case-insensitive) and no other
+ option.
+
+ * make_configure: Add BZR revision number to the '$Revision$' entries
+ in the foomatic-rip.in and foomatic-gswrapper.in files when
+ make_configure is executed.
+
+ * Makefile.in: Remove revision number from foomatic-rip.in and
+ foomatic-gswrapper.in files when "make maintainer-clean" is
+ executed.
+
+2008-04-20 Till Kamppeter
+
+ * foomatic-rip.in: New placeholder "&rbinumcopies;" which gets
+ replaced by the value set in the "%RBINumCopies: ..." or
+ "%%RBINumCopies: ..." line in the PostScript input. If the
+ PostScript input does not contain such lines, the number of
+ copies according to the foomatic-rip command line is
+ inserted. Feature request of George Liu from Ricoh
+ (http://forums.linux-foundation.org/read.php?34,5410).
+
+ CUPS turns "Option=True" into "Option" and "Option=False" into
+ "noOption", even if the option is an enumerated choice option.
+ Applied several fixes so that foomatic-rip handles this correctly:
+ o Run buildcommandline() when the parsing of the PostScript
+ header ends, to make sure all option values for the "header"
+ option set are available choices in enumerated choice
+ options (and not "1" if the choices are "True" and "False".
+ o If CUPS has embedded an option in the PostScript data stream
+ and the value of the embedded version is not the value we
+ got (for example if the value of a numerical option was set
+ to a value which is not one of the listed choices), correct
+ the value only if we actually have a numerical or string
+ option.
+ Thanks to George Liu from Ricoh to report this problem
+ (http://forums.linux-foundation.org/read.php?34,5425).
+
+ Let option settings for the "PageSetup" sections of the
+ PostScript input file really be inserted in and not before the
+ "PageSetup" sections.
+
2008-03-12 Till Kamppeter
* foomatic-rip.in: foomatic-rip did not kill all its subprocesses
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-filters-bzr-20080317/foomatic-rip.in new/foomatic-filters-bzr-20080909/foomatic-rip.in
--- old/foomatic-filters-bzr-20080317/foomatic-rip.in 2008-03-17 21:18:23.000000000 +0100
+++ new/foomatic-filters-bzr-20080909/foomatic-rip.in 2008-09-09 13:59:45.000000000 +0200
@@ -114,7 +114,7 @@
#
# foomatic-rip spooler-independent PS->Printer filter (RIP) of Foomatic
#
-# Copyright 2002 - 2007 Grant Taylor
+# Copyright 2002 - 2008 Grant Taylor
# & Till Kamppeter
# & Helge Blischke
#
@@ -245,6 +245,7 @@
# Number of copies
my $copies = "1";
+my $rbinumcopies = "0";
# Post pipe (command into which the output of this filter should be piped)
my $postpipe = "";
@@ -424,6 +425,19 @@
my $argstr = "\x01" .
join("\x01", map { removeunprintables($_) } @ARGV) . "\x01";
+# Version check
+if ($argstr =~ /^\x01-(h|v|-help|-version)\x01$/i) {
+ my $ver;
+ if ($ripversion =~ /^\$Revision=(.*)\$$/) {
+ $ver = $1;
+ } else {
+ $ver = "Unknown";
+ }
+ print "foomatic-rip revision $ver\n";
+ print "\"man foomatic-rip\" for help.\n";
+ exit 0;
+}
+
# Debug mode activated via command line
if ($argstr =~ s/\x01--debug\x01/\x01/) {
$debug = 1;
@@ -503,10 +517,10 @@
# PPD file name given via the command line
# allow duplicates, and use the last specified one
while ( ($spooler ne 'lprng') and ($argstr =~ s/\x01-p(\x01|)([^\x01]+)\x01/\x01/)) {
- $ppdfile = removeshellescapes($2);
+ $ppdfile = $2;
}
while ($argstr =~ s/\x01--ppd(\x01|=|)([^\x01]+)\x01/\x01/) {
- $ppdfile = removeshellescapes($2);
+ $ppdfile = $2;
}
# Check for LPD/GNUlpr by typical options which the spooler puts onto
@@ -804,7 +818,7 @@
($spooler eq 'gnulpr')) {
# Get PPD file name as the last command line argument
- $ppdfile = removeshellescapes($rargs[$#rargs]);
+ $ppdfile = $rargs[$#rargs];
}
@@ -2588,7 +2602,7 @@
}
}
} else {
- if ($line =~ /^\%\%/) {
+ if ($line =~ /^\%/) {
if ($line =~ m/^\s*\%\%BeginDocument[: ]/) {
# Beginning of an embedded document
# Note that Adobe Acrobat has a bug and so uses
@@ -2744,6 +2758,8 @@
#$line .= "/foomatic-saved-state save def\n";
# Here begins a new page
if ($inheader) {
+ # One last update for the header
+ buildcommandline($dat, $optionset);
# Here we add some stuff which still belongs
# into the header
my $stillforheader;
@@ -2817,14 +2833,6 @@
}
}
}
- # Insert PostScript option settings
- # (options for section "PageSetup".
- if ($isdscjob) {
- $line .=
- makepagesetupsection($dat, $optionset,
- 0);
- $pagesetupfound = 1;
- }
# Now the page header comes, so buffer the data,
# because we must perhaps shut down and restart
# the renderer
@@ -2848,6 +2856,14 @@
} else {
$optionsalsointoheader = 0;
}
+ # Insert PostScript option settings
+ # (options for section "PageSetup".
+ if ($isdscjob) {
+ $line .=
+ makepagesetupsection($dat, $optionset,
+ 0);
+ $pagesetupfound = 1;
+ }
} elsif (($line =~ m/^\%\%EndPageSetup/) &&
($nestinglevel == 0) &&
(!$ignorepageheader)) {
@@ -2945,6 +2961,9 @@
push(@{$dest}, $arg->{'protof'} .
"\n");
}
+ # We have replaced this option on the
+ # FIFO
+ $optionreplaced = 1;
} elsif ((($arg->{'type'} eq 'enum') ||
($arg->{'type'} eq 'string') ||
($arg->{'type'} eq
@@ -2957,6 +2976,9 @@
"%%BeginFeature: " .
"*$option $arg->{$optionset}\n");
push(@{$dest}, $val->{'driverval'} . "\n");
+ # We have replaced this option on the
+ # FIFO
+ $optionreplaced = 1;
} elsif ((($arg->{'type'} eq 'string') ||
($arg->{'type'} eq
'password')) &&
@@ -2969,7 +2991,13 @@
my $driverval = $arg->{'proto'};
$driverval =~ s/\%s//g;
push(@{$dest}, $driverval . "\n");
- } else {
+ # We have replaced this option on the
+ # FIFO
+ $optionreplaced = 1;
+ } elsif (($arg->{'type'} eq 'int') ||
+ ($arg->{'type'} eq 'float') ||
+ ($arg->{'type'} eq 'string') ||
+ ($arg->{'type'} eq 'password')) {
# Setting for numerical or string
# option which is not under the
# enumerated choices
@@ -2982,20 +3010,24 @@
sprintf($sprintfproto,
$arg->{$optionset}) .
"\n");
+ # We have replaced this option on the
+ # FIFO
+ $optionreplaced = 1;
}
} else {
# Command line or JCL option
push(@{$dest},
"%% FoomaticRIPOptionSetting: " .
"$option=$arg->{$optionset}\n");
- }
- print $logh " --> Correcting numerical/string " .
- "option to $option=$arg->{$optionset}" .
- " (Command line argument)\n";
# We have replaced this option on the
# FIFO
$optionreplaced = 1;
}
+ print $logh " --> Correcting numerical/string " .
+ "option to $option=$arg->{$optionset}" .
+ " (Command line argument)\n" if
+ $optionreplaced;
+ }
# Mark that we have already found this option
$arg->{'notfirst'} = 1;
if (!$optionreplaced) {
@@ -3140,6 +3172,11 @@
$line;
}
$prologfound = 1;
+ } elsif (($line =~ m/^\s*\%(\%?)RBINumCopies:\s*(\d+)\s*$/) &&
+ ($nestinglevel == 0)) {
+ # RBINumCopies entry
+ $rbinumcopies = $2;
+ print $logh "Found: %${1}RBINumCopies: $rbinumcopies\n";
} elsif (($line =~ m/^\s*\%/) || ($line =~ m/^\s*$/)) {
# This is an unknown PostScript comment or a blank
# line, no active code
@@ -3211,6 +3248,14 @@
$ignorepageheader = 1;
$optionsalsointoheader = 0;
}
+ # Insert PostScript option settings
+ # (options for section "PageSetup".
+ if ($isdscjob && !$pagesetupfound) {
+ $line .=
+ makepagesetupsection($dat, $optionset,
+ 1);
+ $pagesetupfound = 1;
+ }
}
}
}
@@ -3388,6 +3433,8 @@
print $logh "Flushing FIFO.\n";
}
if ($inheader) {
+ # One last update for the header
+ buildcommandline($dat, $optionset);
# No page initialized yet? Copy the "header" option set into the
# "currentpage" option set, so that the renderer will find the
# options settings.
@@ -5041,11 +5088,13 @@
$str =~ s/\&/\&/g;
# Replace special entities by job data
+ $rbinumcopies = $copies if !$rbinumcopies;
$str =~ s/\&job;/$jobid/g;
$str =~ s/\&user;/$jobuser/g;
$str =~ s/\&host;/$jobhost/g;
$str =~ s/\&title;/$jobtitle/g;
$str =~ s/\&copies;/$copies/g;
+ $str =~ s/\&rbinumcopies;/$rbinumcopies/g;
$str =~ s/\&options;/$optstr/g;
my ($sec, $min, $hour, $mday, $mon, $year) = (localtime)[0..5];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-filters-bzr-20080317/make_configure new/foomatic-filters-bzr-20080909/make_configure
--- old/foomatic-filters-bzr-20080317/make_configure 2006-08-17 17:57:39.000000000 +0200
+++ new/foomatic-filters-bzr-20080909/make_configure 2008-04-29 17:17:41.000000000 +0200
@@ -1,3 +1,10 @@
+#!/bin/sh
+version=`cat VERSION 2> /dev/null`
+revision=`bzr revno 2> /dev/null`
+if [ ! -z $revision ]; then
+ version="$version.$revision"
+ perl -p -i -e 's/(\$Revision)[\w\=\.\_]*(\$)/$1='$version'$2/gi' foomatic-rip.in foomatic-gswrapper.in
+fi
aclocal
autoconf
-perl -p -i -e "s=\#include =\#include =g" configure
\ No newline at end of file
+perl -p -i -e "s=\#include =\#include =g" configure
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-filters-bzr-20080317/Makefile.in new/foomatic-filters-bzr-20080909/Makefile.in
--- old/foomatic-filters-bzr-20080317/Makefile.in 2006-08-17 17:57:39.000000000 +0200
+++ new/foomatic-filters-bzr-20080909/Makefile.in 2008-04-29 17:17:41.000000000 +0200
@@ -107,6 +107,7 @@
maintainer-clean: distclean
rm -f configure aclocal.m4
+ perl -p -i -e 's/(\$$Revision)[\w\=\.\_]*(\$$)/$$1$$2/gi' foomatic-rip.in foomatic-gswrapper.in
# Remove editor backup and temporary files
remove-trash:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-filters-bzr-20080317/VERSION new/foomatic-filters-bzr-20080909/VERSION
--- old/foomatic-filters-bzr-20080317/VERSION 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-filters-bzr-20080909/VERSION 2008-04-29 17:17:41.000000000 +0200
@@ -0,0 +1 @@
+3.0.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org