Merge branch 'upstream'

Conflicts:
	debian/README.Debian
	debian/changelog
	debian/control
	debian/copyright
	debian/foomatic-filters.config
	debian/foomatic-filters.postinst
	debian/foomatic-filters.postrm
	debian/foomatic-filters.templates
	debian/parseconfig.pl
	debian/po/de.po
	debian/po/fr.po
	debian/po/ja.po
	debian/po/nl.po
	debian/po/pt_BR.po
	debian/po/templates.pot
	debian/po/tr.po
	debian/rules

1 files changed, 83 insertions, 76 deletions

diff --git a/USAGE b/USAGE
index 38c9190..cb809ce 100644
--- a/USAGE
+++ b/USAGE
@@ -1,5 +1,5 @@
 
-Foomatic 3.0.2
+Foomatic 4.0.0
 ==============
 
 foomatic-filters
@@ -10,6 +10,7 @@ PostScript data into the printer's native format using a
 printer/driver specific, but spooler-independent PPD file.
 
 Till Kamppeter <till.kamppeter@gmail.com>
+Lars Uebernickel <larsuebernickel@gmx.de>
 
 http://www.openprinting.org/
 
@@ -20,46 +21,38 @@ Intro
 -----
 
 Foomatic is a database providing information about the usage of
-printers with free operating systems and free printer drivers, where
-"free" is meant as free software in the sense of the Free Software
-Foundation (http://www.gnu.org). Therefore the database only contains
-information about printer drivers which are free software. The
-technology of this database can also be used for non-free drivers, but
-the database entries have to be published in separate packages
-then. The database can also be run under non-free operating systems
-(as commercial Unixes) as they often use GhostScript and free printer
-drivers.
-
-Since most free operating systems (GNU/Linux, *BSD, ...) are
-compatible to Unix, their applications send PostScript to the printer
-queues. Therefore one usually hands over the PostScript directly to a
-PostScript printer (sometimes with some prepended PostScript commands
-for options) or uses GhostScript for generating the data format the
-printer needs. This is done by the printer spooler which also stores
-the data in a spool directory when the printer is still occupied by
-another job, transmits the data to a print server in the network, and
-so on.
+printers with Unix-like operating systems (Linux, Solaris, ...).
+
+The applications of these operating systems send PostScript or PDF to
+the printer queues. Therefore one usually hands over the PostScript
+directly to a PostScript printer (sometimes with some inserted
+PostScript commands for options) or uses Ghostscript for generating
+the data format the printer needs from PostScript or PDF input. This
+is done by the printer spooler which also stores the data in a spool
+directory when the printer is still occupied by another job, transmits
+the data to a print server in the network, and so on.
 
 The printer drivers for non-PostScript printers are either compiled
-into GhostScript, a plug-in for GhostScript (e. g. IJS drivers), or
+into Ghostscript, a plug-in for Ghostscript (e. g. IJS drivers), or
 they are an extra filter which converts a generic bitmap generated by
-GhostScript into the printer's data format. For this the spooler has
-to call complicated command lines of GhostScript and the extra filter
-(if needed). The user of a free operating system normally does not see
-these command lines because an installation program takes appropriate
-filter scripts and/or description files from a database and assigns
-them to the printer queue.
+Ghostscript into the printer's data format. For this the spooler has
+to call complicated command lines of Ghostscript and the extra filter
+(if needed). The user of a Unix-like operating system normally does
+not see these command lines because an installation program takes
+appropriate filter scripts and/or description files from a database
+and assigns them to the printer queue.
 
 Widely used databases were the RHS-Printfilters and the APS
 filters. Their disadvantages were that they only supported one spooler
 (LPD/LPRng) and only a small part of the driver's options (mostly page
 size and resolution). Foomatic supports all options of the drivers and
-all known spoolers (LPD, LPRng, GNUlpr, CUPS, Solaris LP, PPR, PDQ, CPS, direct
-spooler-less printing). In addition, all known free software printer
-drivers are supported. Foomatic also supports printing of various
-non-PostScript file types for spoolers which do not support this by
-themselves (LPD, LPRng, GNUlpr, spooler-less printing). To enable this
-feature you need to have "a2ps", "enscript", or "mpage" installed.
+all known spoolers (LPD, LPRng, GNUlpr, CUPS, Solaris LP, PPR, PDQ,
+CPS, direct spooler-less printing). In addition, all known free
+software printer drivers are supported. Foomatic also supports
+printing of various non-PostScript/PDF file types for spoolers which
+do not support these by themselves (LPD, LPRng, GNUlpr, spooler-less
+printing). To enable this feature you need to have "a2ps", "enscript",
+or "mpage" installed.
 
 Another problem is that the way how to install queues, to print files,
 and to handle jobs is very different with different spoolers. LPD for
@@ -79,17 +72,31 @@ Installation
 ------------
 
 Foomatic runs on all systems where one can run the Perl
-interpreter.
+interpreter and Ghostscript.
+
+foomatic-filters needs the Ghostscript library for foomatic-rip and
+the Perl interpreter for beh (Backend Error Handler) and the test
+suite.
+
+To build foomatic-rip you need a C compiler, its standard libraries,
+and the Ghostscript library (libgs, /usr/lib/libgs.so*). For the
+latter Ghostscript must be built in shared library mode ("make
+so"). If your libgs is provided by your operating system distribution,
+make sure that its C headers (package libgs.dev(el) or
+ghostscript.dev(el)) are installed.
 
-foomatic-filters needs nothing else than the Perl interpreter to build
-and run.
+To run foomatic-rip you need to have the Ghostscript library installed.
 
-To connect to remote printers, you need additional connectivity
-software (as "rlpr", "nc", "smbspool', ...). To print non-PostScript
-files with LPD, LPRng, GNUlpr, or without spooler, you will need a2ps,
-enscript, mpage, or similar filters which convert non-PostScript files
-to PostScript. a2ps, enscript, and mpage will be automatically used by
-the scripts when they are installed.
+To run beh (Backend Error Handler) or the test suite a Perl interpreter
+(5.6.0 and newer) is needed.
+
+To connect to remote printers with a non-CUPS printing system, you
+need additional connectivity software (as "rlpr", "nc", "smbspool',
+...). To print non-PostScript/PDF files with LPD, LPRng, GNUlpr, or
+without spooler, you will need a2ps, enscript, mpage, or similar
+filters which convert non-PostScript files to PostScript. a2ps,
+enscript, and mpage will be automatically used by the scripts when
+they are installed.
 
 Download sources:
 rlpr: http://freshmeat.net/projects/rlpr/ or
@@ -101,15 +108,16 @@ used with PPD files downloaded from the OpenPrinting site, with
 manufacturer-supplied PPDs for PostScript printers, and probably with
 other PPD files.
 
-For non-PostScript printers one also needs GhostScript (5.50 or newer,
-ESP GhostScript 7.05.4 or newer highly recommended) and the
-appropriate printer driver.
+For non-PostScript printers one also needs Ghostscript (5.50 or newer,
+GPL Ghostscript 8.63 or newer highly recommended) and the appropriate
+printer driver.
 
-For drivers which have to be compiled into GhostScript ("Execution
-style: GhostScript" on the driver pages on the OpenPrinting site)
-check with "gs -h" whether the driver is in your GhostScript. If not
-you need to compile the driver into your GhostScript or use a
-GhostScript version which already contains it.
+For drivers which have to be compiled into Ghostscript ("Execution
+style: Ghostscript built-in" on the driver pages on the OpenPrinting
+site) check with "gs -h" whether the driver is in your Ghostscript. If
+not you need to compile the driver into your Ghostscript or use a
+Ghostscript version which already contains it (preferably GPL
+Ghostscript 8.63 or newer).
 
 If the driver page says "Execution style: Uniprint", it is much
 easier, check whether the appropriate ".upp" file is in one of the
@@ -119,16 +127,15 @@ not there already.
 
 The third type of driver is marked with "Execution style: Filter",
 this means, that you have to install a filter executable in addition
-to GhostScript. Check with "which <name of the filter>" whether the
+to Ghostscript. Check with "which <name of the filter>" whether the
 filter is already there, otherwise download and install the
 appropriate package.
 
-
-
 foomatic-filters can be installed using these commands (if you have
-downloaded this package from CVS, run "./make_configure" at first, for
-that you will also need the "autoconf" and "aclocal" utilities,
-"aclocal" is in the "automake" package in some distributions):
+downloaded this package from the BZR repository, run
+"./make_configure" at first, for that you will also need the
+"autoconf" and "aclocal" utilities, "aclocal" is in the "automake"
+package in some distributions):
 
    ./configure
    make
@@ -137,19 +144,20 @@ that you will also need the "autoconf" and "aclocal" utilities,
 "make install" must be run as "root", the other commands can be run as
 a normal user.
 
-The "configure" script will auto-detect where the scripts have to be
-installed and where the Perl interpreter is located. If "configure"
-fails because of something not being installed, do
+The "configure" script will auto-detect where the programs have to be
+installed and where the Perl interpreter and the Ghostscript library
+are located. If "configure" fails because of something not being
+installed, do
 
    rm -rf config.cache autom*.cache
 
 before you run "configure" again (after installing the missing parts).
 
-By default, foomatic-filters is installed into subdirectories of /usr/local
-(e. g. /usr/local/bin/foomatic-gswrapper), to get it into subdirectories
-of /usr (/usr/bin/foomatic-gswrapper), enter:
+By default, foomatic-filters is installed into subdirectories of
+/usr/local (e. g. /usr/local/bin/foomatic-rip), to get it into
+subdirectories of /usr (/usr/bin/foomatic-rip), enter:
 
-   ./configure --prefix=/usr
+   ./configure --prefix=/usr --sysconfdir=/etc
    make
    make install
 
@@ -170,25 +178,24 @@ and enter the commands with "./" in the beginning
 (e. g. "./foomatic-rip ...", "man ./foomatic-rip.1"). This also works
 on a machine where a system-wide Foomatic is already installed.
 
-In addition, you should install a utility to make PostScript out of
-non-PostScript files, so that you can print those non-PostScript files
-and also a list of available options using the "docs" option. The
-supported utilities are "a2ps"
+In addition, if you do not use CUPS, you should install a utility to
+make PostScript out of non-PostScript files, so that you can print
+those non-PostScript files and also a list of available options using
+the "docs" option. The supported utilities are "a2ps"
 (http://www-inf.enst.fr/~demaille/a2ps/), "enscript"
 (http://people.ssh.fi/mtr/genscript/), and "mpage"
 (http://www.mesa.nl/pub/mpage). Recommended is "a2ps" because it
-detects many file types (text, PDF, most image formats) and together
-with ImageMagick (for images) and GNU/ESP/AFPL GhostScript 6.51 or
-newer (for PDF) it converts them to PostScript. The other tools
-convert only text files. The tool you have installed is auto-detected
-by foomatic-rip and used automatically if necessary. PPR needs this
-tool only for printing the option list, and CUPS does not need it at
-all. PPR and CUPS use internal filters for printing non-PostScript
-files.
+detects many file types (text, most image formats) and together with
+ImageMagick (for images) and Ghostscript it converts them to
+PostScript. The other tools convert only text files. The tool you have
+installed is auto-detected by foomatic-rip and used automatically if
+necessary. PPR needs this tool only for printing the option list, and
+CUPS does not need it at all. PPR and CUPS use internal filters for
+printing non-PostScript files.
 
 If you have a printer or multi-function device from HP, install HPLIP from
 
-   http://hpinkjet.sourceforge.net/
+   http://hplipopensource.com/
 
 before starting to set up printer queues with foomatic-filters. This
 is needed for printing on certain USB devices and for scanning and