Imported Upstream version 5.1.98.2

3 files changed, 9 insertions, 105 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index 8c75859..ed7cf3f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.22 2005/11/21 11:16:22 rleigh Exp $
+## $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
@@ -30,7 +30,6 @@ if BUILD_CUPS
 CUPS_MAN = \
 	cups-calibrate.8 \
 	cups-genppd.8 \
-	cups-genppdconfig.8 \
 	cups-genppdupdate.8
 endif
 
@@ -47,7 +46,6 @@ man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN) $(GHOSTSCRIPT_MAN)
 EXTRA_man_MANS = \
 	cups-calibrate.8 \
 	cups-genppd.8 \
-	cups-genppdconfig.8 \
 	cups-genppdupdate.8 \
 	escputil.1 \
 	ijsgutenprint.1
diff --git a/man/Makefile.in b/man/Makefile.in
index 5ed9567..1315e57 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -38,26 +38,23 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/cups-calibrate.8.in $(srcdir)/cups-genppd.8.in \
-	$(srcdir)/cups-genppdconfig.8.in \
 	$(srcdir)/cups-genppdupdate.8.in $(srcdir)/escputil.1.in \
 	$(srcdir)/ijsgutenprint.1.in $(top_srcdir)/scripts/global.mk
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gimp.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/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/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.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
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = cups-calibrate.8 cups-genppd.8 \
-	cups-genppdconfig.8 cups-genppdupdate.8 escputil.1 \
-	ijsgutenprint.1
+	cups-genppdupdate.8 escputil.1 ijsgutenprint.1
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
@@ -114,27 +111,13 @@ FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
 GENPPD_LIBS = @GENPPD_LIBS@
 GIMP2_CFLAGS = @GIMP2_CFLAGS@
 GIMP2_LIBS = @GIMP2_LIBS@
-GIMPTOOL = @GIMPTOOL@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
-GIMPTOOL_CHECK = @GIMPTOOL_CHECK@
-GIMP_CFLAGS = @GIMP_CFLAGS@
-GIMP_CFLAGS_NOUI = @GIMP_CFLAGS_NOUI@
-GIMP_DATA_DIR = @GIMP_DATA_DIR@
-GIMP_LIBS = @GIMP_LIBS@
-GIMP_LIBS_NOUI = @GIMP_LIBS_NOUI@
-GIMP_PLUGIN_DIR = @GIMP_PLUGIN_DIR@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
 GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
 GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
 GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
@@ -142,13 +125,6 @@ GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
 GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
 GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
 GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
-GUTENPRINTUI_BINARY_AGE = @GUTENPRINTUI_BINARY_AGE@
-GUTENPRINTUI_CFLAGS = @GUTENPRINTUI_CFLAGS@
-GUTENPRINTUI_CURRENT_INTERFACE = @GUTENPRINTUI_CURRENT_INTERFACE@
-GUTENPRINTUI_INTERFACE_AGE = @GUTENPRINTUI_INTERFACE_AGE@
-GUTENPRINTUI_LIBDEPS = @GUTENPRINTUI_LIBDEPS@
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
-GUTENPRINTUI_VERSION = @GUTENPRINTUI_VERSION@
 GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
 GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
 GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
@@ -253,16 +229,12 @@ docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
-gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
 gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
 gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
-gutenprintui_cflags = @gutenprintui_cflags@
-gutenprintui_libdeps = @gutenprintui_libdeps@
-gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -291,12 +263,12 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 
 # Conditional installation of manpages is currently broken in automake...
 @BUILD_CUPS_TRUE@CUPS_MAN = \
 @BUILD_CUPS_TRUE@	cups-calibrate.8 \
 @BUILD_CUPS_TRUE@	cups-genppd.8 \
-@BUILD_CUPS_TRUE@	cups-genppdconfig.8 \
 @BUILD_CUPS_TRUE@	cups-genppdupdate.8
 
 @BUILD_ESCPUTIL_TRUE@ESCPUTIL_MAN = escputil.1
@@ -305,7 +277,6 @@ man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN) $(GHOSTSCRIPT_MAN)
 EXTRA_man_MANS = \
 	cups-calibrate.8 \
 	cups-genppd.8 \
-	cups-genppdconfig.8 \
 	cups-genppdupdate.8 \
 	escputil.1 \
 	ijsgutenprint.1
@@ -348,8 +319,6 @@ cups-calibrate.8: $(top_builddir)/config.status $(srcdir)/cups-calibrate.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 cups-genppd.8: $(top_builddir)/config.status $(srcdir)/cups-genppd.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-cups-genppdconfig.8: $(top_builddir)/config.status $(srcdir)/cups-genppdconfig.8.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 cups-genppdupdate.8: $(top_builddir)/config.status $(srcdir)/cups-genppdupdate.8.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 escputil.1: $(top_builddir)/config.status $(srcdir)/escputil.1.in
diff --git a/man/cups-genppdconfig.8.in b/man/cups-genppdconfig.8.in
deleted file mode 100644
index 946f5c0..0000000
--- a/man/cups-genppdconfig.8.in
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" $Id: cups-genppdconfig.8.in,v 1.6 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
-.\" 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 CUPS\-GENPPDCONFIG "8" "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages"
-.SH NAME
-cups\-genppdconfig \- a user-friendly interface to generate Gutenprint PPD files for use with CUPS
-.SH SYNOPSIS
-.B cups\-genppdconfig
-[\fI\-d ppd_directory\fR]
-.br
-.B update\-cups\-genppd
-[\fI\-d pdd_directory\fR]
-.SH DESCRIPTION
-\fBcups\-genppdconfig\fR generates \fIGutenprint\fR PPD files for use with CUPS.
-The program allows the selection of the base directory to create the PPDs in,
-and the printers and languages desired.  The default settings are taken from
-the contents of the base directory.  Note that unselecting an item will
-\fBnot\fP remove it from the disk; you must remove unwanted printers and
-languages by deleting the files and directories respectively.
-.PP
-If \fBdialog\fP is installed, it will be used to create the user interface,
-using colour, 3D-look dialog boxes etc.  If dialog cannot be found, perlmenu
-will be used instead to create a simpler, though functionally identical,
-interface.
-.SH OPTIONS
-.TP
-.B \-d \fIppd-directory\fP
-Use \fIppd-directory\fP as the base directory to create PPD files in.  The
-default printer and language selections will also be obtained from this
-directory.  By default, the base directory is
-\fP@cups_conf_datadir@/model/gutenprint\fP.
-.SH SEE ALSO
-.BR cups\-genppd (8),
-.BR cups\-genppdupdate (8),
-.BR dialog (1),
-CUPS Software Administrators Manual, http://localhost:631/documentation.html
-.SH COPYRIGHT
-Copyright \(co  2002\-2003 Roger Leigh (rleigh@debian.org)
-.PP
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License, version 2, as
-published by the Free Software Foundation.
-.PP
-This manual page was written by Roger Leigh (rleigh@debian.org).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End: