New upstream version 5.2.12~pre2

7 files changed, 24 insertions, 156 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index ed7cf3f..ca19758 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.23 2008/04/01 00:53:41 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -37,18 +36,13 @@ if BUILD_ESCPUTIL
 ESCPUTIL_MAN = escputil.1
 endif
 
-if BUILD_GHOSTSCRIPT
-GHOSTSCRIPT_MAN = ijsgutenprint.1
-endif
-
-man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN) $(GHOSTSCRIPT_MAN)
+man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN)
 
 EXTRA_man_MANS = \
 	cups-calibrate.8 \
 	cups-genppd.8 \
 	cups-genppdupdate.8 \
-	escputil.1 \
-	ijsgutenprint.1
+	escputil.1
 
 
 ## Clean
diff --git a/man/Makefile.in b/man/Makefile.in
index a9c4658..8254928 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -83,29 +83,27 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/scripts/mkinstalldirs \
-	$(srcdir)/cups-calibrate.8.in $(srcdir)/cups-genppd.8.in \
-	$(srcdir)/cups-genppdupdate.8.in $(srcdir)/escputil.1.in \
-	$(srcdir)/ijsgutenprint.1.in
+	$(srcdir)/Makefile.am $(srcdir)/cups-calibrate.8.in \
+	$(srcdir)/cups-genppd.8.in $(srcdir)/cups-genppdupdate.8.in \
+	$(srcdir)/escputil.1.in
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
-	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
-	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = cups-calibrate.8 cups-genppd.8 \
-	cups-genppdupdate.8 escputil.1 ijsgutenprint.1
+	cups-genppdupdate.8 escputil.1
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -202,9 +200,6 @@ ENABLE_STATIC = @ENABLE_STATIC@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FIND = @FIND@
-FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
-FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
-FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
 GENPPD_LIBS = @GENPPD_LIBS@
 GIMP2_CFLAGS = @GIMP2_CFLAGS@
 GIMP2_LIBS = @GIMP2_LIBS@
@@ -237,9 +232,6 @@ GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
 GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
 GUTENPRINT_RELEASE_VERSION = @GUTENPRINT_RELEASE_VERSION@
 GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
-IJS_CFLAGS = @IJS_CFLAGS@
-IJS_CONFIG = @IJS_CONFIG@
-IJS_LIBS = @IJS_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -260,6 +252,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIBUSB_BACKEND_LIBDEPS = @LIBUSB_BACKEND_LIBDEPS@
 LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
 LIBUSB_LIBS = @LIBUSB_LIBS@
 LIPO = @LIPO@
@@ -389,14 +382,12 @@ GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 @BUILD_CUPS_TRUE@	cups-genppdupdate.8
 
 @BUILD_ESCPUTIL_TRUE@ESCPUTIL_MAN = escputil.1
-@BUILD_GHOSTSCRIPT_TRUE@GHOSTSCRIPT_MAN = ijsgutenprint.1
-man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN) $(GHOSTSCRIPT_MAN)
+man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN)
 EXTRA_man_MANS = \
 	cups-calibrate.8 \
 	cups-genppd.8 \
 	cups-genppdupdate.8 \
-	escputil.1 \
-	ijsgutenprint.1
+	escputil.1
 
 DISTCLEANFILES = $(MAIN_MAN) $(EXTRA_man_MANS)
 MAINTAINERCLEANFILES = Makefile.in
@@ -442,8 +433,6 @@ cups-genppdupdate.8: $(top_builddir)/config.status $(srcdir)/cups-genppdupdate.8
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 escputil.1: $(top_builddir)/config.status $(srcdir)/escputil.1.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ijsgutenprint.1: $(top_builddir)/config.status $(srcdir)/ijsgutenprint.1.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/man/cups-calibrate.8.in b/man/cups-calibrate.8.in
index fe19d81..935f297 100644
--- a/man/cups-calibrate.8.in
+++ b/man/cups-calibrate.8.in
@@ -1,4 +1,3 @@
-.\" $Id: cups-calibrate.8.in,v 1.8 2004/09/17 18:38:02 rleigh Exp $
 .\" Copyright (C) 2000-2004 Roger Leigh <rleigh@debian.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
@@ -21,16 +20,11 @@ cups\-calibrate \- ESP CUPS Printer Calibration Tool
 .B cups\-calibrate
 .SH DESCRIPTION
 This program allows you to calibrate the color output of printers using the
-\fBGutenprint\fR \fICUPS\fR or \fIESP Print Pro\fR drivers.
+\fBGutenprint\fR \fICUPS\fR driver. Please note that this program \fBonly\fP
+works with the \fBGutenprint\fR \fICUPS\fR driver.
 .PP
-Please note that this program \fBonly\fP works with the \fBGutenprint\fR
-\fICUPS\fR or \fIESP Print Pro\fR drivers. If you are using the Gutenprint
-\fIstp\fR or \fIijsgimmprint\fR driver for GhostScript or the drivers for the
-Gutenprint Print plug-in for \fIThe GIMP\fR, the calibration will not work.
-.PP
-These drivers are identified by the text \fICUPS+Gutenprint\fR or \fIESP Print
-Pro\fR in the model description displayed by the CUPS web interface, KUPS, the
-ESP Print Pro Printer Manager, or printerdrake.
+These drivers are identified by the text \fICUPS+Gutenprint\fR in the model
+description displayed by the CUPS web interface.
 .PP
 To make a calibration profile for all users, run this program as
 the \fBroot\fR user.  The program displays a series of prompts which should
diff --git a/man/cups-genppd.8.in b/man/cups-genppd.8.in
index e2d8070..5d40c85 100644
--- a/man/cups-genppd.8.in
+++ b/man/cups-genppd.8.in
@@ -1,4 +1,3 @@
-.\" $Id: cups-genppd.8.in,v 1.6 2008/09/17 02:35:48 mbroughtn Exp $
 .\" Copyright (C) 2000-2004 Roger Leigh <rleigh@debian.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
diff --git a/man/cups-genppdupdate.8.in b/man/cups-genppdupdate.8.in
index 9f4e70b..62ca6ff 100644
--- a/man/cups-genppdupdate.8.in
+++ b/man/cups-genppdupdate.8.in
@@ -1,4 +1,3 @@
-.\" $Id: cups-genppdupdate.8.in,v 1.5 2006/03/29 02:35:25 rlk Exp $
 .\" Copyright (C) 2000 Roger Leigh <rleigh@debian.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
@@ -38,8 +37,7 @@ Gutenprint PPD files in \fI@cups_conf_serverroot@/ppd\fP.  Otherwise,
 \fBcups\-genppdupdate\fP updates all files or queues listed on the command
 line.
 .PP
-\fBcups\-genppdupdate\fP does not update Foomatic PPD files or PPD files from
-Gimp-Print 4.2 or earlier.
+\fBcups\-genppdupdate\fP does not update PPD files from Gimp-Print 4.2 or earlier.
 .PP
 \fBcups\-genppdupdate\fP does \fBnot\fP restart cupsd.  cupsd will need
 manually reloading (or send SIGHUP) once \fBcups\-genppdupdate\fP has
diff --git a/man/escputil.1.in b/man/escputil.1.in
index b447c5f..d39f213 100644
--- a/man/escputil.1.in
+++ b/man/escputil.1.in
@@ -1,4 +1,3 @@
-.\" $Id: escputil.1.in,v 1.11 2004/09/17 18:38:02 rleigh Exp $
 .\" Copyright (C) 2000-2002 Robert Krawitz <rlk@alum.mit.edu>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
diff --git a/man/ijsgutenprint.1.in b/man/ijsgutenprint.1.in
deleted file mode 100644
index 1f7a0f9..0000000
--- a/man/ijsgutenprint.1.in
+++ /dev/null
@@ -1,105 +0,0 @@
-.\" t
-.\" $Id: ijsgutenprint.1.in,v 1.4 2006/05/24 11:25:42 rlk Exp $
-.\" Copyright (C) 2000-2002 Robert Krawitz <rlk@alum.mit.edu>
-.\"                         Roger Leigh <rleigh@debian.org>
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2, or (at your option)
-.\" any later version.
-.\"
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-.TH IJSGUTENPRINT 1 "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages"
-.SH NAME
-ijsgutenprint \- Ghostscript driver for Gutenprint
-.SH SYNOPSIS
-.B gs
-\-sDEVICE=ijs
-\-sIjsServer=@prefix@/bin/ijsgutenprint
-\-sDeviceManufacturer=\fIvendor\fP
-\-sDeviceModel=\fIname\fP
-[ \fI\-dIjsUseOutputFD\fP ]
-\-sIjsParams=[ \fIkey1\fP=\fIvalue1\fP,\fIkeyn\fP=\fIvaluen\fP... ]
-[ \fIoptions\fP ]
-[ \fIfiles\fP ]
-.SH DESCRIPTION
-.PP
-.B ijsgutenprint
-provides Ghostscript with a Gutenprint driver, supporting all printers
-supported by libgutenprint.
-.PP
-.B NOTE:
-ijsgutenprint should never be called directly.  Ghostscript will run it if the
-IjsServer parameter is set to IjsServer=ijsgutenprint when invoking the IJS
-driver.
-.PP
-.B NOTE:
-The only \fIsupported\fP method of running ijsgutenprint is via Foomatic.
-Users running ghostscript directly will not be supported.  The driver name used
-by Foomatic is \fIgutenprint\-ijs.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@\fP.
-.SH OPTIONS
-\fIijsgutenprint\fP accepts the following Ghostscript IJS options.  The
-Gutenprint-specific options are not documented here.
-.TP
-.B \-dIjsUseOutputFD
-This option should be specified whenever output from Ghostscript will go to
-stdout or into a pipe.  It may be specified in all other cases, with only a
-slight performance degradation.
-.TP
-\fB\-sIjsParams\fP=\fIOption1\fP=\fIValue1\fP,\fIOption2\fP=\fIValue2\fP
-This parameter contains a single string containing a comma-separated list of
-sub-options.
-.TP
-\fB\-sDeviceManufacturer\fP=\fIvendor\fP \fB\-sDeviceModel\fP=\fIname\fP
-This option must be supplied.  There is no default.  The IJS driver requires
-the \fIvendor\fP (it's part of the protocol), but the ijsgutenprint driver
-ignores it.
-.SH HISTORY
-The Ghostscript \fBstp\fP driver was originally written by Henryk Richter
-(buggs@comlab.uni\-rostock.de), and was integrated into Gutenprint during the
-3.1 development series.  Gutenprint (which was named Gimp-Print prior to
-release 5.0) itself was originally written by Michael Sweet <mike@easysw.com>,
-who released up to version 2.0; Robert Krawitz released version 3.0.  The
-Gutenprint development team (http://gimp\-print.sourceforge.net) now maintains
-the entire package.
-.PP
-The IJS driver was originally written by Russell Lang, and incorporated into
-Gutenprint (known then as Gimp-Print) in early 2002.  This driver corresponds
-with the IJS protocol 0.32.
-.PP
-The \fBstp\fP driver is no longer supported as of Gutenprint 5.0.
-.SH COPYRIGHT
-Copyright \(co  2001\-2006 Robert Krawitz (rlk@alum.mit.edu)
-.PP
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-.PP
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA.
-.SH AUTHORS
-Robert Krawitz.  Originally written by Russell Lang.
-.PP
-This manual page was written by Robert Krawitz (rlk@alum.mit.edu) and Roger
-Leigh (rleigh@debian.org).
-.SH SEE ALSO
-.BR gs (1)
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End: