Hello community,
here is the log from the commit of package cups-drivers
checked in at Thu Oct 19 13:19:37 CEST 2006.
--------
--- cups-drivers/cups-drivers.changes 2006-09-20 13:56:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/cups-drivers/cups-drivers.changes 2006-10-18 17:22:32.000000000 +0200
@@ -1,0 +2,20 @@
+Wed Oct 18 17:14:03 CEST 2006 - kssingvo@suse.de
+
+- update to foomatic DB from 2006-10-18:
+ * updated printer descriptions
+ * new printers: HP LaserJet P2015, HP LaserJet M3035_MFP,
+ HP LaserJet M5035_MFP, HP LaserJet M4345_MFP, HP LaserJet P3004,
+ HP LaserJet P3005
+ * fixed link from HP LaserJet 4M
+ * PostScript driver has now "%!PS-Adobe" instead of only "%!"
+ at beginning of output
+ * new printers: HP DeskJet 3940, HP DeskJet 3920, HP OfficeJet 5600
+ * new printers: Toshiba 282, Toshiba 451c, Toshiba 452, Toshiba 850
+- update to foomatic DB engine from 2006-10-18:
+ * let CUPS only list PPD files which are really valid
+ * In some cases printer/driver combos with empty command line prototye
+ were still listed by CUPS.
+ * some (unknown) Debian changes
+- cleaned up specfile
+
+-------------------------------------------------------------------
Old:
----
foomatic-db-cvs-20060919.tar.bz2
foomatic-db-engine-cvs-20060919.tar.bz2
foomatic-filters-cvs-20060919.tar.bz2
New:
----
foomatic-db-cvs-20061018.tar.bz2
foomatic-db-engine-cvs-20061018.tar.bz2
foomatic-filters-cvs-20061018.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups-drivers.spec ++++++
--- /var/tmp/diff_new_pack.9b1Dri/_old 2006-10-19 13:18:50.000000000 +0200
+++ /var/tmp/diff_new_pack.9b1Dri/_new 2006-10-19 13:18:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cups-drivers (Version 1.2.3)
+# spec file for package cups-drivers (Version 1.2.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,10 +12,10 @@
Name: cups-drivers
BuildRequires: a2ps cups-devel gcc-c++ ghostscript-library gtk2-devel libgimpprint-devel libpng-devel libtiff-devel libxml2-devel libxslt openssl-devel
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: Hardware/Printing
Summary: Drivers for the Common UNIX Printing System
-Version: 1.2.3
+Version: 1.2.4
Release: 1
Provides: cups_drv
Requires: ghostscript-library >= 7.05, foomatic-filters
@@ -26,16 +26,13 @@
# number of jobs to run simultaneously
%define numprocs %(cat %_sourcedir/CPUs 2>/dev/null || echo 1)
# linuxprinting.org database variables
-%define DBDate 20060919
+%define DBDate 20061018
%define foomaticver cvs
%define gutenprintver 5.0.0
#URL: http://www.linuxprinting.org/download/foomatic/
Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{foomaticver}-%{DBDate}.tar.bz2
-# Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-3.0.1.tar....
Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{foomaticver}-%{DBDate}.tar.bz2
-# Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-3.0.1.tar.bz...
Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{foomaticver}-%{DBDate}.tar.bz2
-# Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{DBDate}.tar.bz2
# make sure that gimp-print version NEVER differs from ghostscript-library
Source3: gutenprint-%{gutenprintver}.tar.bz2
Source100: foomatic-driver.known
@@ -419,6 +416,23 @@
%{_libdir}/pkgconfig/gutenprint*
%changelog -n cups-drivers
+* Wed Oct 18 2006 - kssingvo@suse.de
+- update to foomatic DB from 2006-10-18:
+ * updated printer descriptions
+ * new printers: HP LaserJet P2015, HP LaserJet M3035_MFP,
+ HP LaserJet M5035_MFP, HP LaserJet M4345_MFP, HP LaserJet P3004,
+ HP LaserJet P3005
+ * fixed link from HP LaserJet 4M
+ * PostScript driver has now "%%!PS-Adobe" instead of only "%%!"
+ at beginning of output
+ * new printers: HP DeskJet 3940, HP DeskJet 3920, HP OfficeJet 5600
+ * new printers: Toshiba 282, Toshiba 451c, Toshiba 452, Toshiba 850
+- update to foomatic DB engine from 2006-10-18:
+ * let CUPS only list PPD files which are really valid
+ * In some cases printer/driver combos with empty command line prototye
+ were still listed by CUPS.
+ * some (unknown) Debian changes
+- cleaned up specfile
* Wed Sep 20 2006 - kssingvo@suse.de
- updated to foomatic DB from 2006-09-19:
* new Samsung laser printers, new driver "splix"
++++++ foomatic-db-cvs-20060919.tar.bz2 -> foomatic-db-cvs-20061018.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/ChangeLog new/foomatic-db-cvs-20061018/ChangeLog
--- old/foomatic-db-cvs-20060919/ChangeLog 2006-09-19 11:17:21.000000000 +0200
+++ new/foomatic-db-cvs-20061018/ChangeLog 2006-10-18 16:02:49.000000000 +0200
@@ -1,3 +1,73 @@
+2006-10-17 Till Kamppeter
+
+ * printer/Toshiba-e-Studio_520.xml,
+ printer/Toshiba-e-Studio_600.xml,
+ printer/Toshiba-e-Studio_720.xml,
+ printer/Toshiba-e-Studio_850.xml: Removed '^M' (carriage return)
+ characters from comment text. Some printer setup tools break on
+ them.
+
+2006-10-16 John Hosszu
+
+ * printer/: Added
+ HP-LaserJet_P2015.xml
+ HP-LaserJet_M3035_MFP.xml
+ HP-LaserJet_M5035_MFP.xml
+ HP-LaserJet_M4345_MFP.xml
+ HP-LaserJet_P3004.xml
+ HP-LaserJet_P3005.xml
+
+2006-10-03 Till Kamppeter
+
+ * printer/HP-LaserJet_4M.xml: Fixed link to the
+ manufacturer-supplied PPD file.
+
+ * driver/Postscript.xml: Let "%!PS-Adobe" instead of only "%!" be
+ put as "magic string" into the beginning of the output. This
+ makes auto-detection of the PostScript output format much more
+ reliable, especially for PostScript/PCL printers (Thanks to
+ Ronald Hoogenboom, RHoogenboom at irdeto dot com).
+
+2006-09-26 Till Kamppeter
+
+ * driver/tosh282.xml, driver/tosh451c.xml, driver/tosh452.xml,
+ driver/tosh850.xml: Made command line prototype really empty, so
+ that no broken PPD files get generated by Foomatic.
+
+2006-09-22 John Hosszu
+ * printer/: Changed
+ HP-DeskJet_3940.xml
+ HP-DeskJet_3920.xml
+ HP-OfficeJet_5600.xml
+
+2006-09-21 Erica Brown
+ * Added:
+ db/source/driver/tosh282.xml
+ db/source/driver/tosh451c.xml
+ db/source/driver/tosh452.xml
+ db/source/driver/tosh850.xml
+
+ * Modified:
+ db/source/printer/Toshiba-e-Studio_200L.xml
+ db/source/printer/Toshiba-e-Studio_202L.xml
+ db/source/printer/Toshiba-e-Studio_230.xml
+ db/source/printer/Toshiba-e-Studio_232.xml
+ db/source/printer/Toshiba-e-Studio_280.xml
+ db/source/printer/Toshiba-e-Studio_281c.xml
+ db/source/printer/Toshiba-e-Studio_282.xml
+ db/source/printer/Toshiba-e-Studio_350.xml
+ db/source/printer/Toshiba-e-Studio_3511.xml
+ db/source/printer/Toshiba-e-Studio_351c.xml
+ db/source/printer/Toshiba-e-Studio_352.xml
+ db/source/printer/Toshiba-e-Studio_450.xml
+ db/source/printer/Toshiba-e-Studio_4511.xml
+ db/source/printer/Toshiba-e-Studio_451c.xml
+ db/source/printer/Toshiba-e-Studio_452.xml
+ db/source/printer/Toshiba-e-Studio_520.xml
+ db/source/printer/Toshiba-e-Studio_600.xml
+ db/source/printer/Toshiba-e-Studio_720.xml
+ db/source/printer/Toshiba-e-Studio_850.xml
+
2006-09-18 Till Kamppeter
* printer/Epson-Stylus_C63.xml, printer/Epson-Stylus_C62.xml,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/driver/Postscript.xml new/foomatic-db-cvs-20061018/db/source/driver/Postscript.xml
--- old/foomatic-db-cvs-20060919/db/source/driver/Postscript.xml 2006-09-19 11:17:10.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/driver/Postscript.xml 2006-10-18 16:02:44.000000000 +0200
@@ -3,7 +3,7 @@
<url>http://partners.adobe.com/public/developer/ps/index_specs.html</url>
<execution>
<postscript/>
- <prototype>level=%D; /usr/bin/printf "%%!\n%%%% %%%%\n%C"; if [ $level -gt 0 ]; then if [ $level -lt 99 ]; then level=" -dLanguageLevel=$level"; else level=""; fi; gs -q -dPARANOIDSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite$level%A%Z -sOutputFile=- -; else cat; fi</prototype>
+ <prototype>level=%D; /usr/bin/printf "%%!PS-Adobe\n%%%% %%%%\n%C"; if [ $level -gt 0 ]; then if [ $level -lt 99 ]; then level=" -dLanguageLevel=$level"; else level=""; fi; gs -q -dPARANOIDSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite$level%A%Z -sOutputFile=- -; else cat; fi</prototype>
</execution>
<comments>
<en>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-DeskJet_3920.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-DeskJet_3920.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-DeskJet_3920.xml 2006-08-17 20:01:25.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-DeskJet_3920.xml 2006-10-18 16:02:48.000000000 +0200
@@ -18,10 +18,7 @@
</mechanism>
<url>http://www.hp.com</url>
<lang>
- <pcl level="3"/><!--no pjl-->
- <text>
- <charset>us-ascii</charset>
- </text>
+ <proprietary /><!--no pjl-->
</lang>
<autodetect>
<!--no known parport probe information--></autodetect>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-DeskJet_3940.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-DeskJet_3940.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-DeskJet_3940.xml 2006-08-17 20:01:25.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-DeskJet_3940.xml 2006-10-18 16:02:47.000000000 +0200
@@ -18,7 +18,7 @@
</mechanism>
<url>http://www.hp.com</url>
<lang>
- <pcl level="3"/><!--no pjl-->
+ <proprietary /><!--no pjl-->
<text>
<charset>us-ascii</charset>
</text>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_4M.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_4M.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_4M.xml 2006-08-17 20:01:26.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_4M.xml 2006-10-18 16:02:46.000000000 +0200
@@ -17,7 +17,7 @@
</mechanism><!--no "url"-->
<lang>
<postscript level="2">
- <ppd>PPD/HP/mono_laser/LaserJet_4.ppd</ppd>
+ <ppd>PPD/HP/mono_laser/HP_LaserJet_4.ppd</ppd>
</postscript>
<pjl/>
<text>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_M3035_MFP.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_M3035_MFP.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_M3035_MFP.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_M3035_MFP.xml 2006-10-18 16:02:49.000000000 +0200
@@ -0,0 +1,52 @@
+<printer id="printer/HP-LaserJet_M3035_MFP">
+ <make>HP</make>
+ <model>LaserJet M3035 MFP</model>
+ <mechanism>
+ <laser/><!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>1200</x>
+ <y>1200</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner and drum in one cartridge (18000 pages)</en>
+ </comments>
+ <!--one or more "partno" elements.--></consumables>
+ </mechanism>
+ <url></url>
+ <lang>
+ <postscript level="3">
+ <ppd>PPD/HP/mono_laser/HP_LaserJet_M3035_MFP.ppd</ppd></postscript>
+ <pjl/>
+ <pcl level="6" />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <ieee1284>MFG:Hewlett-Packard;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,XHTML,MIME,POSTSCRIPT;1284.4DL:4d,4e,1;MDL:HP LaserJet M3035 MFP;CLS:PRINTER;DES:Hewlett-Packard LaserJet M3035 MFP</ieee1284>
+ <parallel>
+ <commandset>PJL,MLC,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet M3035 MFP</model>
+ </parallel>
+ <snmp>
+ <description>HP LaserJet M3035 MFP</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver><!--verified--><!--no "contrib_url"-->
+ <comments>
+ <en>
+
+ For basic printing functionality use the Postscript PPD.
+ For advanced functionality such as printer status, maintenance
+ features, scanning and photo card unload use the <a href="
+ http://hplip.sf.net/">HPLIP driver</a> (which includes
+ HPIJS). <p>
+
+ </en>
+ </comments>
+</printer>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_M4345_MFP.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_M4345_MFP.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_M4345_MFP.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_M4345_MFP.xml 2006-10-18 16:02:46.000000000 +0200
@@ -0,0 +1,52 @@
+<printer id="printer/HP-LaserJet_M4345_MFP">
+ <make>HP</make>
+ <model>LaserJet M4345 MFP</model>
+ <mechanism>
+ <laser/><!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>1200</x>
+ <y>1200</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner and drum in one cartridge (18000 pages)</en>
+ </comments>
+ <!--one or more "partno" elements.--></consumables>
+ </mechanism>
+ <url></url>
+ <lang>
+ <postscript level="3">
+ <ppd>PPD/HP/mono_laser/HP_LaserJet_M4345_MFP.ppd</ppd></postscript>
+ <pjl/>
+ <pcl level="6" />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <ieee1284>MFG:Hewlett-Packard;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,XHTML,MIME,POSTSCRIPT;1284.4DL:4d,4e,1;MDL:HP LaserJet M4345 MFP;CLS:PRINTER;DES:Hewlett-Packard LaserJet M4345 MFP</ieee1284>
+ <parallel>
+ <commandset>PJL,MLC,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet M4345 MFP</model>
+ </parallel>
+ <snmp>
+ <description>HP LaserJet M4345 MFP</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver><!--verified--><!--no "contrib_url"-->
+ <comments>
+ <en>
+
+ For basic printing functionality use the Postscript PPD.
+ For advanced functionality such as printer status, maintenance
+ features, scanning and photo card unload use the <a href="
+ http://hplip.sf.net/">HPLIP driver</a> (which includes
+ HPIJS). <p>
+
+ </en>
+ </comments>
+</printer>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_M5035_MFP.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_M5035_MFP.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_M5035_MFP.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_M5035_MFP.xml 2006-10-18 16:02:49.000000000 +0200
@@ -0,0 +1,52 @@
+<printer id="printer/HP-LaserJet_M5035_MFP">
+ <make>HP</make>
+ <model>LaserJet M5035 MFP</model>
+ <mechanism>
+ <laser/><!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>1200</x>
+ <y>1200</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner and drum in one cartridge (18000 pages)</en>
+ </comments>
+ <!--one or more "partno" elements.--></consumables>
+ </mechanism>
+ <url></url>
+ <lang>
+ <postscript level="3">
+ <ppd>PPD/HP/mono_laser/HP_LaserJet_M5035_MFP.ppd</ppd></postscript>
+ <pjl/>
+ <pcl level="6" />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <ieee1284>MFG:Hewlett-Packard;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,XHTML,MIME,POSTSCRIPT;1284.4DL:4d,4e,1;MDL:HP LaserJet M5035 MFP;CLS:PRINTER;DES:Hewlett-Packard LaserJet M5035 MFP</ieee1284>
+ <parallel>
+ <commandset>PJL,MLC,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet M5035 MFP</model>
+ </parallel>
+ <snmp>
+ <description>HP LaserJet M5035 MFP</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver><!--verified--><!--no "contrib_url"-->
+ <comments>
+ <en>
+
+ For basic printing functionality use the Postscript PPD.
+ For advanced functionality such as printer status, maintenance
+ features, scanning and photo card unload use the <a href="
+ http://hplip.sf.net/">HPLIP driver</a> (which includes
+ HPIJS). <p>
+
+ </en>
+ </comments>
+</printer>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_P2015.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_P2015.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_P2015.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_P2015.xml 2006-10-18 16:02:48.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/HP-LaserJet_P2015">
+ <make>HP</make>
+ <model>LaserJet P2015</model>
+ <mechanism>
+ <laser/><!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>600</x>
+ <y>600</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ </consumables>
+ </mechanism>
+ <url>http://www.hp.com</url>
+ <lang>
+ <postscript level="2">
+ <ppd>PPD/HP/mono_laser/HP_LaserJet_P2015.ppd</ppd>
+ </postscript>
+ <pcl level="6"/>
+ <pjl/>
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <general>
+ <commandset>PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL</commandset>
+ <description>Hewlett-Packard LaserJet P2015 series</description>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet P2015 Series</model>
+ </general>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver><!--verified--> <!--no "contrib_url"-->
+ <comments>
+ <en>
+
+ For basic printing functionality use the Postscript PPD. For advanced functionality such
+ as printer status and maintenance features, use the
+ <a href="http://hplip.sf.net/">
+ HPLIP driver</a> (which includes HPIJS). <p>
+
+ PCL 5e and 6 with Postscript 2 emulation, out of the box, parallel and
+USB connection, 250-sheet tray built-in, extra 250-sheet tray available.<p>
+
+ </en>
+ </comments>
+</printer>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_P3004.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_P3004.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_P3004.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_P3004.xml 2006-10-18 16:02:48.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/HP-LaserJet_P3004">
+ <make>HP</make>
+ <model>LaserJet P3004</model>
+ <mechanism>
+ <laser/><!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>1200</x>
+ <y>1200</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ </consumables>
+ </mechanism>
+ <url>http://www.hp.com</url>
+ <lang>
+ <postscript level="2">
+ <ppd>PPD/HP/mono_laser/HP_LaserJet_P3004.ppd</ppd>
+ </postscript>
+ <pcl level="6"/>
+ <pjl/>
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <general>
+ <commandset>PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL</commandset>
+ <description>Hewlett-Packard LaserJet P3004 Series</description>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet P3004 Series</model>
+ </general>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver><!--verified--> <!--no "contrib_url"-->
+ <comments>
+ <en>
+
+ For basic printing functionality use the Postscript PPD. For advanced functionality such
+ as printer status and maintenance features, use the
+ <a href="http://hplip.sf.net/">
+ HPLIP driver</a> (which includes HPIJS). <p>
+
+ PCL 5e and 6 with Postscript 2 emulation, out of the box, parallel and
+USB connection, 250-sheet tray built-in, extra 250-sheet tray available.<p>
+
+ </en>
+ </comments>
+</printer>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_P3005.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_P3005.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-LaserJet_P3005.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-LaserJet_P3005.xml 2006-10-18 16:02:49.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/HP-LaserJet_P3005">
+ <make>HP</make>
+ <model>LaserJet P3005</model>
+ <mechanism>
+ <laser/><!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>1200</x>
+ <y>1200</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ </consumables>
+ </mechanism>
+ <url>http://www.hp.com</url>
+ <lang>
+ <postscript level="2">
+ <ppd>PPD/HP/mono_laser/HP_LaserJet_P3005.ppd</ppd>
+ </postscript>
+ <pcl level="6"/>
+ <pjl/>
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <general>
+ <commandset>PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL</commandset>
+ <description>Hewlett-Packard LaserJet P3005 Series</description>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet P3005 Series</model>
+ </general>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver><!--verified--> <!--no "contrib_url"-->
+ <comments>
+ <en>
+
+ For basic printing functionality use the Postscript PPD. For advanced functionality such
+ as printer status and maintenance features, use the
+ <a href="http://hplip.sf.net/">
+ HPLIP driver</a> (which includes HPIJS). <p>
+
+ PCL 5e and 6 with Postscript 2 emulation, out of the box, parallel and
+USB connection, 250-sheet tray built-in, extra 250-sheet tray available.<p>
+
+ </en>
+ </comments>
+</printer>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/HP-OfficeJet_5600.xml new/foomatic-db-cvs-20061018/db/source/printer/HP-OfficeJet_5600.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/HP-OfficeJet_5600.xml 2006-08-17 20:01:27.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/HP-OfficeJet_5600.xml 2006-10-18 16:02:49.000000000 +0200
@@ -18,10 +18,7 @@
</mechanism>
<url>http://www.hp.com</url>
<lang>
- <pcl level="3"/><!--no pjl-->
- <text>
- <charset>us-ascii</charset>
- </text>
+ <proprietary /><!--no pjl-->
</lang>
<autodetect>
<usb>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-GL_1010.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-GL_1010.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-GL_1010.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-GL_1010.xml 2006-10-18 16:02:49.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/Toshiba-GL_1010">
+ <make>Toshiba</make>
+ <model>GL 1010</model>
+ <mechanism>
+ <laser />
+ <!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>600</x>
+ <y>600</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner</en>
+ </comments>
+ <!--one or more "partno" elements-->
+ </consumables>
+ </mechanism>
+ <url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
+ <lang>
+ <postscript level="3">
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
+ </postscript>
+ <pcl level="3" />
+ <hpgl2 />
+ <tiff />
+ <pjl />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <snmp>
+ <description>TOSHIBA GL 1010</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver>
+ <drivers>
+ <driver>
+ <id>Postscript</id>
+ <ppd>PPD/Toshiba/Toshiba_GL1010_CUPS.ppd</ppd>
+ </driver>
+ </drivers>
+ <!--no "contrib_url"-->
+ <!--not "unverified"-->
+ <!--no "comments"-->
+</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-GL_1020.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-GL_1020.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-GL_1020.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-GL_1020.xml 2006-10-18 16:02:46.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/Toshiba-GL_1020">
+ <make>Toshiba</make>
+ <model>GL 1020</model>
+ <mechanism>
+ <laser />
+ <!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>600</x>
+ <y>600</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner</en>
+ </comments>
+ <!--one or more "partno" elements-->
+ </consumables>
+ </mechanism>
+ <url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
+ <lang>
+ <postscript level="3">
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
+ </postscript>
+ <pcl level="3" />
+ <hpgl2 />
+ <tiff />
+ <pjl />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <snmp>
+ <description>TOSHIBA GL 1020</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver>
+ <drivers>
+ <driver>
+ <id>Postscript</id>
+ <ppd>PPD/Toshiba/Toshiba_GL1020_CUPS.ppd</ppd>
+ </driver>
+ </drivers>
+ <!--no "contrib_url"-->
+ <!--not "unverified"-->
+ <!--no "comments"-->
+</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_165.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_165.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_165.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_165.xml 2006-10-18 16:02:49.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/Toshiba-e-Studio_165">
+ <make>Toshiba</make>
+ <model>e-Studio 165</model>
+ <mechanism>
+ <laser />
+ <!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>600</x>
+ <y>600</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner</en>
+ </comments>
+ <!--one or more "partno" elements-->
+ </consumables>
+ </mechanism>
+ <url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
+ <lang>
+ <postscript level="3">
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
+ </postscript>
+ <pcl level="3" />
+ <hpgl2 />
+ <tiff />
+ <pjl />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <snmp>
+ <description>TOSHIBA e-STUDIO165</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver>
+ <drivers>
+ <driver>
+ <id>Postscript</id>
+ <ppd>PPD/Toshiba/TOSHIBA_EST205_CUPS.ppd</ppd>
+ </driver>
+ </drivers>
+ <!--no "contrib_url"-->
+ <!--not "unverified"-->
+ <!--no "comments"-->
+</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_200L.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_200L.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_200L.xml 2006-09-19 11:17:17.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_200L.xml 2006-10-18 16:02:47.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST280_282_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_202L.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_202L.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_202L.xml 2006-09-19 11:17:19.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_202L.xml 2006-10-18 16:02:48.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST280_282_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_205.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_205.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_205.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_205.xml 2006-10-18 16:02:48.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/Toshiba-e-Studio_205">
+ <make>Toshiba</make>
+ <model>e-Studio 205</model>
+ <mechanism>
+ <laser />
+ <!--not "color"-->
+ <resolution>
+ <dpi>
+ <x>600</x>
+ <y>600</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner</en>
+ </comments>
+ <!--one or more "partno" elements-->
+ </consumables>
+ </mechanism>
+ <url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
+ <lang>
+ <postscript level="3">
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
+ </postscript>
+ <pcl level="3" />
+ <hpgl2 />
+ <tiff />
+ <pjl />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <snmp>
+ <description>TOSHIBA e-STUDIO205</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver>
+ <drivers>
+ <driver>
+ <id>Postscript</id>
+ <ppd>PPD/Toshiba/TOSHIBA_EST205_CUPS.ppd</ppd>
+ </driver>
+ </drivers>
+ <!--no "contrib_url"-->
+ <!--not "unverified"-->
+ <!--no "comments"-->
+</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_230.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_230.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_230.xml 2006-09-19 11:17:20.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_230.xml 2006-10-18 16:02:48.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST280_282_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_232.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_232.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_232.xml 2006-09-19 11:17:14.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_232.xml 2006-10-18 16:02:45.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST280_282_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_2500c.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_2500c.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_2500c.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_2500c.xml 2006-10-18 16:02:46.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/Toshiba-e-Studio_2500c">
+ <make>Toshiba</make>
+ <model>e-Studio 2500c</model>
+ <mechanism>
+ <laser />
+ <color />
+ <resolution>
+ <dpi>
+ <x>1200</x>
+ <y>600</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner</en>
+ </comments>
+ <!--one or more "partno" elements-->
+ </consumables>
+ </mechanism>
+ <url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
+ <lang>
+ <postscript level="3">
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
+ </postscript>
+ <pcl level="3" />
+ <hpgl2 />
+ <tiff />
+ <pjl />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <snmp>
+ <description>TOSHIBA e-STUDIO2500c</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver>
+ <drivers>
+ <driver>
+ <id>Postscript</id>
+ <ppd>PPD/Toshiba/TOSHIBA_EST3510c_CUPS.ppd</ppd>
+ </driver>
+ </drivers>
+ <!--no "contrib_url"-->
+ <!--not "unverified"-->
+ <!--no "comments"-->
+</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_280.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_280.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_280.xml 2006-09-19 11:17:21.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_280.xml 2006-10-18 16:02:49.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST280_282_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_281c.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_281c.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_281c.xml 2006-09-19 11:17:15.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_281c.xml 2006-10-18 16:02:49.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST4511_451c_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_282.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_282.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_282.xml 2006-09-19 11:17:20.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_282.xml 2006-10-18 16:02:48.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST280_282_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_350.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_350.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_350.xml 2006-09-19 11:17:15.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_350.xml 2006-10-18 16:02:46.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST450_452_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_3500c.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_3500c.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_3500c.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_3500c.xml 2006-10-18 16:02:49.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/Toshiba-e-Studio_3500c">
+ <make>Toshiba</make>
+ <model>e-Studio 3500c</model>
+ <mechanism>
+ <laser />
+ <color />
+ <resolution>
+ <dpi>
+ <x>1200</x>
+ <y>600</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner</en>
+ </comments>
+ <!--one or more "partno" elements-->
+ </consumables>
+ </mechanism>
+ <url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
+ <lang>
+ <postscript level="3">
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
+ </postscript>
+ <pcl level="3" />
+ <hpgl2 />
+ <tiff />
+ <pjl />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <snmp>
+ <description>TOSHIBA e-STUDIO3500c</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver>
+ <drivers>
+ <driver>
+ <id>Postscript</id>
+ <ppd>PPD/Toshiba/TOSHIBA_EST3510c_CUPS.ppd</ppd>
+ </driver>
+ </drivers>
+ <!--no "contrib_url"-->
+ <!--not "unverified"-->
+ <!--no "comments"-->
+</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_3510c.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_3510c.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_3510c.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_3510c.xml 2006-10-18 16:02:43.000000000 +0200
@@ -0,0 +1,49 @@
+<printer id="printer/Toshiba-e-Studio_3510c">
+ <make>Toshiba</make>
+ <model>e-Studio 3510c</model>
+ <mechanism>
+ <laser />
+ <color />
+ <resolution>
+ <dpi>
+ <x>1200</x>
+ <y>600</y>
+ </dpi>
+ </resolution>
+ <consumables>
+ <comments>
+ <en>Toner</en>
+ </comments>
+ <!--one or more "partno" elements-->
+ </consumables>
+ </mechanism>
+ <url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
+ <lang>
+ <postscript level="3">
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
+ </postscript>
+ <pcl level="3" />
+ <hpgl2 />
+ <tiff />
+ <pjl />
+ <text>
+ <charset>us-ascii</charset>
+ </text>
+ </lang>
+ <autodetect>
+ <snmp>
+ <description>TOSHIBA e-STUDIO3510c</description>
+ </snmp>
+ </autodetect>
+ <functionality>A</functionality>
+ <driver>Postscript</driver>
+ <drivers>
+ <driver>
+ <id>Postscript</id>
+ <ppd>PPD/Toshiba/TOSHIBA_EST3510c_CUPS.ppd</ppd>
+ </driver>
+ </drivers>
+ <!--no "contrib_url"-->
+ <!--not "unverified"-->
+ <!--no "comments"-->
+</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_3511.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_3511.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_3511.xml 2006-09-19 11:17:16.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_3511.xml 2006-10-18 16:02:46.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST4511_451c_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_351c.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_351c.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_351c.xml 2006-09-19 11:17:21.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_351c.xml 2006-10-18 16:02:49.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST4511_451c_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_352.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_352.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_352.xml 2006-09-19 11:17:21.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_352.xml 2006-10-18 16:02:49.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST450_452_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_450.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_450.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_450.xml 2006-09-19 11:17:10.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_450.xml 2006-10-18 16:02:47.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST450_452_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_4511.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_4511.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_4511.xml 2006-09-19 11:17:15.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_4511.xml 2006-10-18 16:02:45.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST4511_451c_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_451c.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_451c.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_451c.xml 2006-09-19 11:17:20.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_451c.xml 2006-10-18 16:02:48.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST4511_451c_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_452.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_452.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_452.xml 2006-09-19 11:17:18.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_452.xml 2006-10-18 16:02:49.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,7 +40,7 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST450_452_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_520.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_520.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_520.xml 2006-09-19 11:17:14.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_520.xml 2006-10-18 16:02:46.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3" />
<hpgl2 />
@@ -40,14 +40,14 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST850_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
<!--not "unverified"-->
<comments>
- <en>All printer settings can be changed via a web browser, and it seems to work fine with Firefox.<p>
-
+ <en>All printer settings can be changed via a web browser, and it seems to work fine with Firefox.<p>
+
</en>
</comments>
</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_600.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_600.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_600.xml 2006-09-19 11:17:15.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_600.xml 2006-10-18 16:02:46.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3.0" />
<hpgl2 />
@@ -40,14 +40,14 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST850_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
<!--not "unverified"-->
<comments>
- <en>All printer settings can be changed via a web browser, and it seems to work fine with Firefox.<p>
-
+ <en>All printer settings can be changed via a web browser, and it seems to work fine with Firefox.<p>
+
</en>
</comments>
</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_720.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_720.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_720.xml 2006-09-19 11:17:19.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_720.xml 2006-10-18 16:02:48.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3.0" />
<hpgl2 />
@@ -40,14 +40,14 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST850_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
<!--not "unverified"-->
<comments>
- <en>All printer settings can be changed via a web browser, and it seems to work fine with Firefox.<p>
-
+ <en>All printer settings can be changed via a web browser, and it seems to work fine with Firefox.<p>
+
</en>
</comments>
</printer>
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_850.xml new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_850.xml
--- old/foomatic-db-cvs-20060919/db/source/printer/Toshiba-e-Studio_850.xml 2006-09-19 11:17:15.000000000 +0200
+++ new/foomatic-db-cvs-20061018/db/source/printer/Toshiba-e-Studio_850.xml 2006-10-18 16:02:46.000000000 +0200
@@ -20,7 +20,7 @@
<url>http://www.eid.toshiba.com/support/drivers/index.shtml</url>
<lang>
<postscript level="3">
- <!--no URL for manufacturer's "ppd" file-->
+ <url>http://www.linuxprinting.org/download/PPD/Toshiba/</url>
</postscript>
<pcl level="3.0" />
<hpgl2 />
@@ -40,15 +40,15 @@
<drivers>
<driver>
<id>Postscript</id>
- <!--no "comments"-->
+ <ppd>PPD/Toshiba/TOSHIBA_EST850_CUPS.ppd</ppd>
</driver>
</drivers>
<!--no "contrib_url"-->
<!--not "unverified"-->
<comments>
- <en>All printer settings can be changed via a web browser, and it seems to work fine with Firefox.<p>
-
-IPP is problematic (the printer runs a version of CUPS which times out connections after one second) so large print jobs won't go through (latest firmware as of 2006-08-03), however LPD works fine.
+ <en>All printer settings can be changed via a web browser, and it seems to work fine with Firefox.<p>
+
+IPP is problematic (the printer runs a version of CUPS which times out connections after one second) so large print jobs won't go through (latest firmware as of 2006-08-03), however LPD works fine.
</en>
</comments>
</printer>
\ No newline at end of file
++++++ foomatic-db-engine-cvs-20060919.tar.bz2 -> foomatic-db-engine-cvs-20061018.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/ChangeLog new/foomatic-db-engine-cvs-20061018/ChangeLog
--- old/foomatic-db-engine-cvs-20060919/ChangeLog 2006-08-17 17:49:52.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/ChangeLog 2006-10-18 16:03:23.000000000 +0200
@@ -1,3 +1,39 @@
+2006-09-25 Till Kamppeter
+
+ * Makefile.in: Added forgotten DESTDIR (upstream merge from Debian
+ patch).
+
+ * foomatic-combo-xml.c: Several small stability fixes in the C code
+ (upstream merge from Debian patch).
+
+ * foomatic-configure.in: If there is a user named "cupsys", switch
+ the ownership of the PPD files to "cupsys", this way Ubuntu does
+ not break on running CUPS as non-root. This does not affect
+ other distributions (upstream merge from Debian patch).
+
+ * foomatic-printjob.in: Added help for the printer-specific
+ options (upstream merge from Debian patch).
+
+ * foomatic-getpjloptions.8.in: Typo fix (upstream merge from
+ Debian patch).
+
+ * foomatic-printjob.1.in: Text fixes, new help on printer options
+ mentioned (upstream merge from Debian patch).
+
+2006-09-22 Till Kamppeter
+
+ * foomatic-combo-xml.c, foomatic-ppdfile.in, lib/Foomatic/DB.pm:
+ Let the listing of auto-generatable PPD files for CUPS 1.2
+ ("foomatic-ppdfile list") not contain entries for combos of
+ printers with driver entries which do not have a command line
+ prototype (these indicate only that the printer/driver combo
+ works, but do not produce PPD files). Allow defining valid
+ printer/driver combos also by only defining the driver in the
+ "<drivers>" section of the printer entry. So for a printer with
+ ready-made PPD it is enough to add a driver entry with link to
+ the PPD in its "<drivers>" section so that "foomatic-ppdfile"
+ lists and returns the PPD.
+
2006-07-20 Till Kamppeter
* lib/Foomatic/DB.pm: For get_javascript2() building the printer
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/Makefile.in new/foomatic-db-engine-cvs-20061018/Makefile.in
--- old/foomatic-db-engine-cvs-20060919/Makefile.in 2006-08-17 17:49:53.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/Makefile.in 2006-10-18 16:03:24.000000000 +0200
@@ -188,7 +188,7 @@
# $(DESTDIR) properly
( cd lib && \
$(MAKE) PREFIX=$(PERLPREFIX) && \
- $(MAKE) PREFIX=$(PERLPREFIX) pure_install \
+ $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
)
${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/foomatic-combo-xml.c new/foomatic-db-engine-cvs-20061018/foomatic-combo-xml.c
--- old/foomatic-db-engine-cvs-20060919/foomatic-combo-xml.c 2006-08-17 17:49:53.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/foomatic-combo-xml.c 2006-10-18 16:03:23.000000000 +0200
@@ -76,8 +76,6 @@
FILE *inputfile; /* file to be read currently */
char buffer[blocksize + 1];/* data block currently read */
char *data = NULL; /* the read data */
- char *readpointer = NULL; /* pointer where next block of data should be
- written */
int size = 1; /* size of the data in memory */
int bytesread; /* bytes actually read */
@@ -91,19 +89,18 @@
/* Read the whole file into the memory */
- data = (char *)malloc(1);
+ data = (char *)malloc(size);
data[0] = '\0';
- while(bytesread = fread(buffer,1,blocksize,inputfile)) {
+ while((bytesread = fread(buffer,1,blocksize,inputfile))) {
data = (char *)realloc(data, size + bytesread);
buffer[bytesread] = '\0';
strcat(data, buffer);
size += bytesread;
}
fclose(inputfile);
- /* Make space for an additional line, needed for the default value in an
- option file */
- data = (char *)realloc(data, size + 128);
- if (data != "") return(data); else { free((void *)data); return(NULL); }
+ /* Make space for additional data */
+ data = (char *)realloc(data, size + 4096);
+ if (strcmp(data, "")) return(data); else { free((void *)data); return(NULL); }
}
/*
@@ -207,8 +204,9 @@
* function to parse an XML file and do a task on it
*/
-void /* No return value */
-parse(const char **data, /* I/O - Data to process */
+int /* O - Is the requested printer driver combo already confirmed by the
+ <drivers> section in the printer XML file (operation = 0 only) */
+parse(char **data, /* I/O - Data to process */
const char *pid, /* I - Foomatic printer ID */
const char *driver,/* I - driver name */
const char *filename, /* I - file name for error messages */
@@ -247,6 +245,7 @@
int indriver = 0;
int indrivers = 0;
int inexecution = 0;
+ int inprototype = 0;
int innopjl = 0;
int inprinters = 0;
int inid = 0;
@@ -323,6 +322,9 @@
static char make[256]; /* Printer make/model read from printer */
static char model[256]; /* XML file needed by constraints in */
/* option XML files */
+ int comboconfirmed = 0;
+ int driverhasproto = 0;
+
char *s;
int l;
int j;
@@ -336,7 +338,7 @@
ppdlist_t *ppdlist = NULL;
/* Translate printer ID */
- if (pid) trpid = translateid(pid, idlist);
+ if ((pid) && (operation < 3)) trpid = translateid(pid, idlist);
j = 0;
datalength = strlen(*data); /* Compute the length of the file once,
@@ -404,6 +406,20 @@
inmodel = nestinglevel + 1;
} else if (strcmp(currtagname, "autodetect") == 0) {
inautodetect = nestinglevel + 1;
+ } else if (strcmp(currtagname, "driver") == 0) {
+ indriver = nestinglevel + 1;
+ if (indrivers) {
+ if (tagtype == 1) {
+ if (debug)
+ fprintf(stderr,
+ " Resetting Driver.\n");
+ cid[0] = '\0';
+ }
+ }
+ } else if (strcmp(currtagname, "drivers") == 0) {
+ indrivers = nestinglevel + 1;
+ } else if (strcmp(currtagname, "id") == 0) {
+ inid = nestinglevel + 1;
} else if (strcmp(currtagname, "printer") == 0) {
inprinter = nestinglevel + 1;
}
@@ -522,6 +538,10 @@
cprinter[0] = '\0';
} else if (strcmp(currtagname, "id") == 0) {
inid = nestinglevel + 1;
+ } else if (strcmp(currtagname, "execution") == 0) {
+ inexecution = nestinglevel + 1;
+ } else if (strcmp(currtagname, "prototype") == 0) {
+ inprototype = nestinglevel + 1;
} else if (strcmp(currtagname, "printers") == 0) {
inprinters = nestinglevel + 1;
} else if (strcmp(currtagname, "driver") == 0) {
@@ -656,11 +676,13 @@
currtagname, currtagparam);
if (strcmp(currtagname, "printer") == 0) {
if ((s = strstr(currtagparam, "id")) != NULL) {
- /* Get the short printer name (w/o "printer/") */
- s = strstr(s + 2, "printer/") + 8;
- /* Cut off trailing '"' */
- s[strlen(s)-1] = '\0';
- strcpy(cprinter, s);
+ /* Get the short printer name (w/o "printer/") */
+ if ((s = strstr(s + 2, "printer/")) != NULL) {
+ s += 8;
+ /* Cut off trailing '"' */
+ s[strlen(s)-1] = '\0';
+ strcpy(cprinter, s);
+ }
}
}
}
@@ -716,6 +738,35 @@
if (!inautodetect) strcat(model, currtagbody);
}
if (nestinglevel < inautodetect) inautodetect = 0;
+ if (nestinglevel < indrivers) indrivers = 0;
+ if (nestinglevel < indriver) {
+ indriver = 0;
+ if (indrivers) {
+ if (debug) fprintf(stderr,
+ " Printer/Driver: %s %s\n",
+ pid, cid);
+ if (cid[0] != '\0') {
+ if (debug)
+ fprintf(stderr,
+ " Printer XML: Printer: %s Driver: %s\n",
+ pid, cid);
+ if (!strcmp(cid, driver)) {
+ /* Printer/driver combo already confirmed by
+ <drivers> section of printer XML file */
+ if (debug)
+ fprintf(stderr,
+ " Printer XML: Printer/Driver combo confirmed!\n");
+ comboconfirmed = 1;
+ }
+ }
+ }
+ }
+ if (nestinglevel < inid) {
+ inid = 0;
+ strcpy(cid, currtagbody);
+ if (debug) fprintf(stderr,
+ " Printer XML: Driver ID: %s\n", cid);
+ }
} else if (operation == 1) { /* Driver XML file */
if (nestinglevel < inexecution) inexecution = 0;
if (nestinglevel < innopjl) innopjl = 0;
@@ -1194,6 +1245,7 @@
if (nestinglevel < indriver) indriver = 0;
if (nestinglevel < inprinters) inprinters = 0;
if (nestinglevel < inprinter) inprinter = 0;
+ if (nestinglevel < inexecution) inexecution = 0;
if (nestinglevel < inid) {
inid = 0;
/* Get the short printer ID (w/o "printer/") */
@@ -1243,6 +1295,59 @@
else
plistpointer->drivers = dlistpointer;
}
+ if (nestinglevel < inprototype) {
+ inprototype = 0;
+ if (pid) { /* We abuse pid here to tell that we want
+ to have an overview of available PPDs and
+ not of all possible printer/driver combos.
+ pid is never used for a printer ID when
+ building the overview XML file. */
+ /* Get the command line prototype without leading
+ white space, is empty on empty command line*/
+ for (s = currtagbody;
+ (*s != '\0') && (strchr(" \n\r\t", *s) != NULL);
+ s ++);
+ if (debug)
+ fprintf(stderr,
+ " Overview: Driver: %s Command line: |%s|\n",
+ cdriver, s);
+ if (*s == '\0') {
+ /* We have found an empty command line prototype, so]
+ this driver does not produce any PPD file,
+ mark this driver as not having a command line
+ prototype, remove the file from memory and
+ return. */
+ /* Add the driver to the first entry in the printer
+ list, the pseudo printer "noproto" */
+ plistpointer = *printerlist;
+ plistpreventry = NULL;
+ dlistpointer = plistpointer->drivers;
+ dlistpreventry = NULL;
+ while ((dlistpointer != 0) &&
+ (strcasecmp(dlistpointer->name, cdriver))) {
+ dlistpreventry = dlistpointer;
+ dlistpointer = (driverlist_t *)(dlistpointer->next);
+ }
+ if (dlistpointer == 0) {
+ dlistpointer =
+ (driverlist_t *)malloc(sizeof(driverlist_t));
+ strcpy(dlistpointer->name, cdriver);
+ dlistpointer->next = NULL;
+ if (dlistpreventry != NULL)
+ dlistpreventry->next =
+ (struct driverlist_t *)dlistpointer;
+ else
+ plistpointer->drivers = dlistpointer;
+ }
+ /* Renove the driver XML data from memory */
+ free((void *)(*data));
+ *data = NULL;
+ if (debug)
+ fprintf(stderr, " Driver entry does not produce PPDs!\n");
+ return;
+ }
+ }
+ }
} else if (operation == 4) { /* Printer XML file (Overview) */
if (debug)
fprintf(stderr,
@@ -1272,8 +1377,84 @@
if (nestinglevel < inpostscript) inpostscript = 0;
if (indrivers || inlang) {
if (debug) fprintf(stderr,
- " Driver/PPD: %s %s\n",
- cid, cppd);
+ " Printer/Driver/PPD: %s %s %s\n",
+ cprinter, cid, cppd);
+ driverhasproto = 0;
+ if ((cid[0] != '\0') && (pid)) {
+ /* Check if our driver has a command line prototype,
+ it should not be driver of the pseudo-printer
+ "noproto" (first item in the printer list) then */
+ plistpointer = *printerlist;
+ plistpreventry = NULL;
+ dlistpointer = plistpointer->drivers;
+ dlistpreventry = NULL;
+ while ((dlistpointer != 0) &&
+ (strcasecmp(dlistpointer->name, cid))) {
+ dlistpreventry = dlistpointer;
+ dlistpointer = (driverlist_t *)(dlistpointer->next);
+ }
+ if (dlistpointer == 0) {
+ driverhasproto = 1;
+ }
+ }
+ if ((cid[0] != '\0') &&
+ ((!pid) || /* We want to see all combos, not only
+ the ones which provide a PPD file
+ If pid is set, we want only combos
+ which provide PPDs and if we do
+ not have a ready-made PPD we must */
+ (driverhasproto) || /* have a command line
+ prototype */
+ ((cppd[0] != '\0')))) { /* We have a ready-made
+ PPD file */
+ if (debug)
+ fprintf(stderr,
+ " Overview: Printer: %s Driver: %s\n",
+ cprinter, cid);
+ /* Add this driver to the current printer's entry in
+ the printer list, create the printer entry if
+ necessary */
+ plistpointer = *printerlist;
+ plistpreventry = NULL;
+ /* Search printer in list */
+ while ((plistpointer != NULL) &&
+ (strcmp(plistpointer->id, cprinter) != 0)) {
+ plistpreventry = plistpointer;
+ plistpointer = (printerlist_t *)(plistpointer->next);
+ }
+ if (plistpointer == NULL) {
+ /* printer not found, create new entry */
+ plistpointer =
+ (printerlist_t *)malloc(sizeof(printerlist_t));
+ strcpy(plistpointer->id, cprinter);
+ plistpointer->drivers = NULL;
+ plistpointer->next = NULL;
+ if (plistpreventry != NULL)
+ plistpreventry->next =
+ (struct printerlist_t *)plistpointer;
+ else
+ *printerlist = plistpointer;
+ }
+ /* Add driver entry */
+ dlistpointer = plistpointer->drivers;
+ dlistpreventry = NULL;
+ while ((dlistpointer != 0) &&
+ (strcasecmp(dlistpointer->name, cid))) {
+ dlistpreventry = dlistpointer;
+ dlistpointer = (driverlist_t *)(dlistpointer->next);
+ }
+ if (dlistpointer == 0) {
+ dlistpointer =
+ (driverlist_t *)malloc(sizeof(driverlist_t));
+ strcpy(dlistpointer->name, cid);
+ dlistpointer->next = NULL;
+ if (dlistpreventry != NULL)
+ dlistpreventry->next =
+ (struct driverlist_t *)dlistpointer;
+ else
+ plistpointer->drivers = dlistpointer;
+ }
+ }
if ((cid[0] != '\0') && (cppd[0] != '\0')) {
if (debug)
fprintf(stderr,
@@ -1382,15 +1563,13 @@
fprintf(stderr,
" nopjl: %d (1: driver does not allow PJL options)\n",
*nopjl);
- if (printerentryfound == 0) { /* the printer is not in the listing of the
+ if (printerentryfound != 0) { /* the printer is in the listing of the
driver */
- fprintf(stderr, "The printer %s %s (ID: %s) is not supported by the driver %s!\n",
- make, model, pid, driver);
- exit(1);
+ comboconfirmed = 1;
}
} else if (operation == 4) { /* Printer XML file (Overview) */
/* Remove the printer input data */
- strcpy((char *)(*data), "");
+ **data = '\0';
/* Build the printer entry for the overview in the memory which was used
for the former input data, the overview entry is always shorter than
the original printer XML file. */
@@ -1462,6 +1641,7 @@
} else if (operation == 2) { /* Option XML file */
if (debug) fprintf(stderr, " Resulting option XML:\n%s\n", *data);
}
+ return(comboconfirmed);
}
/*
@@ -1492,8 +1672,8 @@
char oldidfilename[1024]; /* Name of the file with the
translation table for old printer
IDs */
- const char *printerbuffer = NULL;
- const char *driverbuffer = NULL;
+ char *printerbuffer = NULL;
+ char *driverbuffer = NULL;
char **optbuffers = NULL;
int num_optbuffers = 0;
char **defaultsettings = NULL; /* User-supplied option settings*/
@@ -1502,6 +1682,8 @@
int nopjl = 0;
int debug = 0;
int debug2 = 0;
+ int comboconfirmed = 0;
+ int comboconfirmed2 = 0;
DIR *optiondir;
DIR *driverdir;
DIR *printerdir;
@@ -1523,6 +1705,9 @@
fprintf(stderr, " -o option2 Default option settings for the\n");
fprintf(stderr, " generated file\n");
fprintf(stderr, " -O Generate overview XML file\n");
+ fprintf(stderr, " -C Generate overview XML file only\n");
+ fprintf(stderr, " containing combos leading to a valid\n");
+ fprintf(stderr, " PPD file (for CUPS PPD list)\n");
fprintf(stderr, " -l dir Directory where the Foomatic database is located\n");
fprintf(stderr, " -v Verbose (debug) mode\n");
fprintf(stderr, " -vv Very Verbose (debug) mode\n");
@@ -1566,6 +1751,9 @@
case 'O' : /* Overview */
overview = 1;
break;
+ case 'C' : /* Overview for CUPS PPD list */
+ overview = 2;
+ break;
case 'l' : /* libdir */
if (argv[i][2] != '\0')
libdir = argv[i] + 2;
@@ -1657,78 +1845,89 @@
}
}
if (debug) fprintf(stderr, " Printer file loaded!\n");
- parse(&printerbuffer, pid, driver, printerfilename, NULL, 0,
- (const char **)defaultsettings, num_defaultsettings, &nopjl,
- idlist, debug2);
+ comboconfirmed =
+ parse(&printerbuffer, pid, driver, printerfilename, NULL, 0,
+ (const char **)defaultsettings, num_defaultsettings, &nopjl,
+ idlist, debug2);
/* Read the driver file and check whether the printer is present */
if (debug) fprintf(stderr, "Driver file: %s\n", driverfilename);
driverbuffer = loadfile(driverfilename);
if (driverbuffer == NULL) {
- fprintf(stderr,
- "Driver file %s corrupted, missing, or not readable!\n",
- driverfilename);
- exit(1);
- }
- if (debug) fprintf(stderr, " Driver file loaded!\n");
- parse(&driverbuffer, pid, driver, driverfilename, NULL, 1,
- (const char **)defaultsettings, num_defaultsettings, &nopjl,
- idlist, debug2);
- if (debug) {
- if (nopjl) {
- fprintf(stderr, " Driver forbids PJL options!\n");
+ if (!comboconfirmed) {
+ fprintf(stderr,
+ "Driver file %s corrupted, missing, or not readable!\n",
+ driverfilename);
+ exit(1);
+ } else {
+ driverbuffer = malloc(1024);
+ sprintf((char *)driverbuffer, "\n <name>%s</name>\n <url></url>\n <execution>\n <filter />\n <prototype></prototype>\n </execution>\n <printers>\n <printer>\n <id>printer/%s</id>\n </printer>\n </printers>\n</driver>", driver, driver, pid);
+ }
+ } else {
+ if (debug) fprintf(stderr, " Driver file loaded!\n");
+ comboconfirmed2 =
+ parse(&driverbuffer, pid, driver, driverfilename, NULL, 1,
+ (const char **)defaultsettings, num_defaultsettings, &nopjl,
+ idlist, debug2);
+ if ((!comboconfirmed) && (!comboconfirmed2)) {
+ fprintf(stderr, "The printer %s %s (ID: %s) is not supported by the driver %s!\n",
+ make, model, pid, driver);
+ exit(1);
+ }
+ if (debug) {
+ if (nopjl) {
+ fprintf(stderr, " Driver forbids PJL options!\n");
+ }
}
- }
- /* Search the Foomatic option directory and read all xml files found
- there. Check whether and how they apply to the given printer/driver
+ /* Search the Foomatic option directory and read all xml files found
+ there. Check whether and how they apply to the given printer/driver
combo */
- optiondir = opendir(optiondirname);
- if (optiondir == NULL) {
- fprintf(stderr, "Cannot read directory %s!\n", optiondirname);
- exit(1);
- }
+ optiondir = opendir(optiondirname);
+ if (optiondir == NULL) {
+ fprintf(stderr, "Cannot read directory %s!\n", optiondirname);
+ exit(1);
+ }
- while((direntry = readdir(optiondir)) != NULL) {
- sprintf(optionfilename, "%s/db/source/opt/%s",
- libdir, direntry->d_name);
- if (debug) fprintf(stderr, "Option file: %s\n",
- optionfilename);
- if (strcmp((optionfilename + strlen(optionfilename) - 4), ".xml") == 0) {
- /* Process only XML files */
- /* Make space for a pointer to the data */
- num_optbuffers ++;
- optbuffers = (char **)realloc((char **)optbuffers,
- sizeof(char *) * num_optbuffers);
- /* load the current option's XML file */
- optbuffers[num_optbuffers-1] = loadfile(optionfilename);
- if (optbuffers[num_optbuffers-1] == NULL) {
- fprintf(stderr,
- "Option file %s corrupted, missing, or not readable!\n",
- optionfilename);
- exit(1);
- }
- if (debug) fprintf(stderr, " Option file loaded!\n");
- /* process it */
- parse((const char **)(&(optbuffers[num_optbuffers-1])), pid, driver,
- optionfilename, NULL, 2,
- (const char **)defaultsettings, num_defaultsettings, &nopjl,
- idlist, debug2);
- /* If the parser discarded it (because it does not apply to our
- printer/driver combo) remove the space for the pointer to it */
- if (optbuffers[num_optbuffers-1] == NULL) {
- if (debug) fprintf(stderr, " Option does not apply, removed!\n");
- num_optbuffers --;
+ while((direntry = readdir(optiondir)) != NULL) {
+ sprintf(optionfilename, "%s/db/source/opt/%s",
+ libdir, direntry->d_name);
+ if (debug) fprintf(stderr, "Option file: %s\n",
+ optionfilename);
+ if (strcmp((optionfilename + strlen(optionfilename) - 4), ".xml") == 0) {
+ /* Process only XML files */
+ /* Make space for a pointer to the data */
+ num_optbuffers ++;
optbuffers = (char **)realloc((char **)optbuffers,
sizeof(char *) * num_optbuffers);
- } else {
- if (debug) fprintf(stderr, " Option applies!\n");
+ /* load the current option's XML file */
+ optbuffers[num_optbuffers-1] = loadfile(optionfilename);
+ if (optbuffers[num_optbuffers-1] == NULL) {
+ fprintf(stderr,
+ "Option file %s corrupted, missing, or not readable!\n",
+ optionfilename);
+ exit(1);
+ }
+ if (debug) fprintf(stderr, " Option file loaded!\n");
+ /* process it */
+ parse((char **)&(optbuffers[num_optbuffers-1]), pid, driver,
+ optionfilename, NULL, 2,
+ (const char **)defaultsettings, num_defaultsettings, &nopjl,
+ idlist, debug2);
+ /* If the parser discarded it (because it does not apply to our
+ printer/driver combo) remove the space for the pointer to it */
+ if (optbuffers[num_optbuffers-1] == NULL) {
+ if (debug) fprintf(stderr, " Option does not apply, removed!\n");
+ num_optbuffers --;
+ } else {
+ if (debug) fprintf(stderr, " Option applies!\n");
+ }
}
}
+ closedir(optiondir);
}
- closedir(optiondir);
/* Output the result on STDOUT */
if (debug) fprintf(stderr, "Putting out result!\n");
@@ -1751,6 +1950,24 @@
sprintf(printerdirname, "%s/db/source/printer",
libdir);
+ /* Mark overview mode */
+ if (overview == 2)
+ pid = "C";
+ else
+ pid = NULL;
+
+ /* Add a pseudo-printer to the printer list to which we assign all
+ drivers without command line prototype, so we can determine
+ which printer/driver combos do not provide a PPD file. */
+ if (pid) {
+ plistpointer =
+ (printerlist_t *)malloc(sizeof(printerlist_t));
+ strcpy(plistpointer->id, "noproto");
+ plistpointer->drivers = NULL;
+ plistpointer->next = NULL;
+ printerlist = plistpointer;
+ }
+
/* Search the Foomatic driver directory and read all xml files found
there. Read out the printers which the driver supports and add them
to the printer's driver list */
@@ -1777,7 +1994,7 @@
}
if (debug) fprintf(stderr, " Driver file loaded!\n");
/* process it */
- parse(&driverbuffer, NULL, NULL, driverfilename, &printerlist, 3,
+ parse(&driverbuffer, pid, NULL, driverfilename, &printerlist, 3,
(const char **)defaultsettings, num_defaultsettings, &nopjl,
idlist, debug2);
/* Delete the driver file from memory */
@@ -1829,7 +2046,7 @@
}
if (debug) fprintf(stderr, " Printer file loaded!\n");
/* process it */
- parse(&printerbuffer, NULL, NULL, printerfilename, &printerlist, 4,
+ parse(&printerbuffer, pid, NULL, printerfilename, &printerlist, 4,
(const char **)defaultsettings, num_defaultsettings, &nopjl,
idlist, debug2);
/* put it out */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/foomatic-configure.in new/foomatic-db-engine-cvs-20061018/foomatic-configure.in
--- old/foomatic-db-engine-cvs-20060919/foomatic-configure.in 2006-08-17 17:49:53.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/foomatic-configure.in 2006-10-18 16:03:23.000000000 +0200
@@ -409,6 +409,21 @@
($config->{'spooler'} eq "cups" ? $beh : ()));
}
+#fix to work on Ubuntu, where cupd runs not as root, but as cupsys user
+#like system ("chown cupsys $ppdfile"), but
+#changeowner function changes owner only if user exists on system
+sub changeowner {
+
+ my ($username, $file) = @_;
+
+ my ($uid,$gid) = (-1, -1);
+ my $l;
+ $l = getpwnam($username); $uid = $l if defined($l);
+ $l = getgrnam($username); $gid = $l if defined($l);
+ chown $uid, $gid, $file;
+
+}
+
sub writeppdfile {
my ($config, $ppdfile, $rawqueue, $newfoomaticdata) = @_;
@@ -431,6 +446,10 @@
close PPDFILE;
$db->ppdsetdefaults($ppdfile);
chmod 0644, $ppdfile;
+ #fix to work on Ubuntu, where cupd runs not as root, but as cupsys user
+ #system ("chown cupsys $ppdfile");
+ #changeowner function changes owner only if user exists on system
+ changeowner("cupsys", $ppdfile);
} else {
if (-f $ppdfile) {
unlink "$ppdfile" or die "Cannot delete \'$ppdfile\'!\n";
@@ -464,6 +483,10 @@
}
# Correct the permissions of the PPD file
chmod 0644, $ppdfile;
+ #fix to work on Ubuntu, where cupd runs not as root, but as cupsys user
+ #system ("chown cupsys $ppdfile");
+ #changeowner function changes owner only if user exists on system
+ changeowner("cupsys", $ppdfile);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/foomatic-getpjloptions.8.in new/foomatic-db-engine-cvs-20061018/foomatic-getpjloptions.8.in
--- old/foomatic-db-engine-cvs-20060919/foomatic-getpjloptions.8.in 2006-08-17 17:49:53.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/foomatic-getpjloptions.8.in 2006-10-18 16:03:24.000000000 +0200
@@ -50,5 +50,5 @@
.SH WARNINGS
Uni-directional protocols as remote LPD are not supported as no status is returned.
Some network print servers which attach to a printer parallel port do not
-support birectional mode.
+support bidirectional mode.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/foomatic-ppdfile.in new/foomatic-db-engine-cvs-20061018/foomatic-ppdfile.in
--- old/foomatic-db-engine-cvs-20060919/foomatic-ppdfile.in 2006-08-17 17:49:53.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/foomatic-ppdfile.in 2006-10-18 16:03:23.000000000 +0200
@@ -58,7 +58,7 @@
sub cupslistppds {
my $db = Foomatic::DB->new();
- $db->get_overview();
+ $db->get_overview(1, 1);
# Read configuration in /etc/cups/foomatic.conf
my $conffilename;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/foomatic-printjob.1.in new/foomatic-db-engine-cvs-20061018/foomatic-printjob.1.in
--- old/foomatic-db-engine-cvs-20060919/foomatic-printjob.1.in 2006-08-17 17:49:53.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/foomatic-printjob.1.in 2006-10-18 16:03:23.000000000 +0200
@@ -2,7 +2,7 @@
.\"
.TH FOOMATIC-PRINTJOB 1 "2001-01-06" "Foomatic Project"
.SH NAME
-foomatic-printjob \- <put a short description here>
+foomatic-printjob \- manage printer jobs in a spooler-independent fashion
.SH SYNOPSIS
.B foomatic-printjob [ -s spooler ] [ -P queuename ]
.B [ -o option1=value1 -o option2 ... ] [ -i ]
@@ -11,8 +11,8 @@
.B foomatic-printjob -Q [ -s spooler ] [ -P queuename ] [ -i ] [ -a ]
.B [ user1 user2 ... ]
-.B foomatic-printjob -R [ -s spooler ] [ -P queuename ] [ - ] [ -i ]
-.B [ jobid1 jobid2 ... ]
+.B foomatic-printjob -R [ -s spooler ] [ -P queuename ] [ -i ]
+.B [ \- | jobid1 jobid2 ... ]
.B foomatic-printjob -C [ -s spooler ] [ -i ] command [ arguments ]
@@ -20,14 +20,21 @@
.B foomatic-printjob -h [ -s spooler ] [ -P queuename ] [ -i ]
-.SS Options
+.SH DESCRIPTION
+.B foomatic-printjob
+provides a spooler-independent interface to creating and managing
+printer jobs and print queues. Note that the first argument changes
+the mode of the command, as it combines the functionality of several
+System V-style printing commands.
+
+.SS OPTIONS
.TP 10
.BI \-s spooler
-Explicit spooler type (cups,lpd,lprng,pdq)
+Explicit spooler type.
.TP 10
.BI \-P queuename
-Command should apply to this queue
+Any commands specified should apply to this queue instead of the default.
.TP 10
.BI \-o option=value
@@ -47,46 +54,31 @@
.TP 10
.BI \-Q
-Query the jobs in a queue
-
-.TP 10
-.BI \-a
-Query the jobs in all queues
-
-.TP 10
-.BI user1\ \ user2\ \ ...
-Users whose jobs should be listed
-
-.TP 10
-.BI \-R
-Remove a job from a queue
-
-.TP 10
-.BI \-
-Remove all your jobs
+Query the jobs in a queue. If a list of users is specified, only
+those users' jobs will be queried.
.TP 10
-.BI jobid1\ \ jobid2
-IDs of the jobs to be removed
+.BI \-Q\ \-a
+Query the jobs in all queues. If a list of users is specified, only
+those users' jobs will be queried.
.TP 10
-.BI \-C
-Execute control commands for queue/job manipulation
+.BI \-R\ [\ \-\ |\ jobid1\ jobid2\ ...\ ]
+Remove a job from a queue. Using \fI-\fR will remove all jobs.
.TP 10
-.BI command\ [\ arguments\ ]
-Control command for queue/job manipulation. The
-commands are the ones of the BSD "lpc" utility. Use
-the control command "help" to get a list of supported
-commands. Note: the amount of commands varies with the
-spooler, but the same commands given under different
-spoolers do the same thing.
+.BI \-C\ command\ [\ arguments\ ]
+Execute control commands for queue/job manipulation. The commands are
+the ones of the BSD "lpc" utility. Use the control command "help" to
+get a list of supported commands. Note: the amount of commands varies
+with the spooler, but the same commands given under different spoolers
+do the same thing.
.TP 10
.BI \-i
-Interactive mode: You will be asked if foomatic-printjob
-is in doubt about something. Otherwise foomatic-printjob
-uses auto-detection or quits with an error.
+Interactive mode: You will be asked if foomatic-printjob is in doubt
+about something. Otherwise foomatic-printjob uses auto-detection or
+quits with an error.
.TP 10
.BI \-S
@@ -96,18 +88,13 @@
.BI \-h
Show this message or show a list of available options if a queue is specified
-
-.\".SH SEE ALSO
-.\".IR foomatic-XXX (1),
-
-.SH EXIT STATUS
-.B foomatic-printjob
-returns ...
+.SH SEE ALSO
+foomatic-configure(1) and the documentation for your print spooler.
.SH AUTHOR
-Manfred Wassmann <\fImanolo@NCC-1701.B.Shuttle.de\fR> for the foomatic
-project using output from the associated binary.
+Manfred Wassmann <\fImanolo@NCC-1701.B.Shuttle.de\fR> and Chris
+Lawrence <\fIlawrencc@debian.org\fR> for the foomatic project using
+output from the associated binary.
.SH BUGS
-This manpage needs some editing.
-
+This manpage still needs some editing.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/foomatic-printjob.in new/foomatic-db-engine-cvs-20061018/foomatic-printjob.in
--- old/foomatic-db-engine-cvs-20060919/foomatic-printjob.in 2006-08-17 17:49:53.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/foomatic-printjob.in 2006-10-18 16:03:23.000000000 +0200
@@ -1,5 +1,5 @@
#!@PERL@
-
+# -*- perl -*-
# This is foomatic-printjob, a program to print and manage printing
# jobs with the same commands independent whether the spooler is CUPS,
# LPD, LPRng, or PDQ.
@@ -138,6 +138,9 @@
}
}
+# Exception...
+help_options($in_config) if ($opt_h);
+
# Call proper proc
exit &{$procs->{$in_config->{'spooler'}}{$action}}($in_config);
@@ -1143,3 +1146,25 @@
exit 0;
}
+
+# Help on printer-specific options
+sub help_options {
+ my ($config) = $_[0];
+
+ # Is there an easier way to do this?
+ eval `foomatic-configure -P -n $config->{'queue'} -s $config->{'spooler'}`;
+ print "Available options for queue $config->{'queue'}:\n";
+
+ foreach my $arg (@{$QUEUES[0]->{'args'}}) {
+ next if $arg->{'hidden'};
+ my @vals = ();
+
+ print " $arg->{'name'} : < ";
+ foreach my $val (@{$arg->{'vals'}}) {
+ push @vals, $val->{'value'};
+ }
+ print join(' | ', @vals) . " >\n";
+ }
+
+ exit 0;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-db-engine-cvs-20060919/lib/Foomatic/DB.pm new/foomatic-db-engine-cvs-20061018/lib/Foomatic/DB.pm
--- old/foomatic-db-engine-cvs-20060919/lib/Foomatic/DB.pm 2006-08-17 17:49:53.000000000 +0200
+++ new/foomatic-db-engine-cvs-20061018/lib/Foomatic/DB.pm 2006-10-18 16:03:23.000000000 +0200
@@ -65,14 +65,15 @@
}
sub get_overview {
- my ($this, $rebuild) = @_;
+ my ($this, $rebuild, $cupsppds) = @_;
# "$this->{'overview'}" is a memory cache only for the current process
if ((!defined($this->{'overview'}))
or (defined($rebuild) and $rebuild)) {
+ my $otype = ($cupsppds ? '-C' : '-O');
# Generate overview Perl data structure from database
my $VAR1;
- eval (`$bindir/foomatic-combo-xml -O -l '$libdir' | $bindir/foomatic-perl-data -O`) ||
+ eval (`$bindir/foomatic-combo-xml $otype -l '$libdir' | $bindir/foomatic-perl-data -O`) ||
die ("Could not run \"foomatic-combo-xml\"/\"foomatic-perl-data\"!");
$this->{'overview'} = $VAR1;
}
++++++ foomatic-filters-cvs-20060919.tar.bz2 -> foomatic-filters-cvs-20061018.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-filters-cvs-20060919/ChangeLog new/foomatic-filters-cvs-20061018/ChangeLog
--- old/foomatic-filters-cvs-20060919/ChangeLog 2006-08-30 19:31:17.000000000 +0200
+++ new/foomatic-filters-cvs-20061018/ChangeLog 2006-10-18 16:03:46.000000000 +0200
@@ -1,3 +1,7 @@
+2006-10-03 Till Kamppeter
+
+ * foomatic-rip.in: Fixed bashism.
+
2006-08-27 Till Kamppeter
* foomatic-gswrapper.in: Support for built-in redirection of
@@ -14,7 +18,7 @@
2006-06-15 Norm Jacobs
- * foomatid-rip.in: failing to open IPP attributes file shouldn't be
+ * foomatic-rip.in: failing to open IPP attributes file shouldn't be
fatal
2006-06-01 Norm Jacobs
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/foomatic-filters-cvs-20060919/foomatic-rip.in new/foomatic-filters-cvs-20061018/foomatic-rip.in
--- old/foomatic-filters-cvs-20060919/foomatic-rip.in 2006-08-17 17:57:39.000000000 +0200
+++ new/foomatic-filters-cvs-20061018/foomatic-rip.in 2006-10-18 16:03:46.000000000 +0200
@@ -6116,7 +6116,7 @@
" # Custom page size settings\n",
" # We aren't really checking for " .
"legal vals.\n",
- " if [ \"x\${$varn}\" == 'x$val' ]; " .
+ " if [ \"x\${$varn}\" = 'x$val' ]; " .
"then\n",
" $varn=\"\${$varn}.\${PageWidth}" .
"x\${PageHeight}\${PageSizeUnit}\"\n",
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org