- Removed patch fuzz.
This commit is contained in:
Tim Waugh
parent
6a8bf0ab3d
commit
c6c2bc002f
@ -1,10 +1,11 @@
|
|||||||
--- foomatic-filters-3.0-20070614/foomatic-gswrapper.in.fontpath 2007-06-14 08:20:15.000000000 +0100
|
diff -up foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath foomatic-filters-3.0-20080710/foomatic-gswrapper.in
|
||||||
+++ foomatic-filters-3.0-20070614/foomatic-gswrapper.in 2007-06-14 10:33:10.000000000 +0100
|
--- foomatic-filters-3.0-20080710/foomatic-gswrapper.in.fontpath 2008-07-10 08:20:17.000000000 +0100
|
||||||
@@ -24,6 +24,7 @@
|
+++ foomatic-filters-3.0-20080710/foomatic-gswrapper.in 2008-09-02 13:14:12.000000000 +0100
|
||||||
|
@@ -24,6 +24,7 @@ my $execpath = "@EXECPATH@";
|
||||||
# Get execution path from config file
|
# Get execution path from config file
|
||||||
$execpath = $conf{execpath} if defined(%conf) and defined $conf{execpath};
|
$execpath = $conf{execpath} if defined(%conf) and defined $conf{execpath};
|
||||||
$ENV{'PATH'} = $execpath;
|
$ENV{'PATH'} = $execpath;
|
||||||
+$ENV{'GS_FONTPATH'} = '/usr/share/fonts';
|
+$ENV{'GS_FONTPATH'} = '/usr/share/fonts';
|
||||||
|
|
||||||
# Check whether we have a GhostScript version with redirection of the
|
# Check whether we have a Ghostscript version with redirection of the
|
||||||
# standard output of the PostScript programs via '-sstdout=%stderr'
|
# standard output of the PostScript programs via '-sstdout=%stderr'
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
--- foomatic-filters-3.0-20070614/configure.ac.libdir 2007-06-14 08:20:15.000000000 +0100
|
diff -up foomatic-filters-3.0-20080710/configure.ac.libdir foomatic-filters-3.0-20080710/configure.ac
|
||||||
+++ foomatic-filters-3.0-20070614/configure.ac 2007-06-14 10:30:50.000000000 +0100
|
--- foomatic-filters-3.0-20080710/configure.ac.libdir 2008-07-10 08:20:16.000000000 +0100
|
||||||
@@ -13,7 +13,7 @@
|
+++ foomatic-filters-3.0-20080710/configure.ac 2008-09-02 13:13:36.000000000 +0100
|
||||||
|
@@ -13,7 +13,7 @@ AC_PROG_LN_S
|
||||||
AC_PROG_MAKE_SET
|
AC_PROG_MAKE_SET
|
||||||
|
|
||||||
ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
|
ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
|
||||||
@ -9,7 +10,7 @@
|
|||||||
|
|
||||||
dnl Get the operating system and version number...
|
dnl Get the operating system and version number...
|
||||||
uname=`uname`
|
uname=`uname`
|
||||||
@@ -47,13 +47,13 @@
|
@@ -47,13 +47,13 @@ dnl Check for /usr/lib/cups/backend
|
||||||
AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
|
AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
|
||||||
|
|
||||||
dnl Check for /usr/lib/ppr
|
dnl Check for /usr/lib/ppr
|
||||||
|
|||||||
@ -1,5 +1,69 @@
|
|||||||
--- foomatic-db-engine-3.0-20031217/foomatic-ppdload.in.ppdload 2003-12-19 15:26:40.360620848 +0000
|
diff -up foomatic-db-engine-3.0-20080710/configure.ac.ppdload foomatic-db-engine-3.0-20080710/configure.ac
|
||||||
+++ foomatic-db-engine-3.0-20031217/foomatic-ppdload.in 2003-12-19 15:26:56.289725866 +0000
|
--- foomatic-db-engine-3.0-20080710/configure.ac.ppdload 2008-09-02 13:31:19.000000000 +0100
|
||||||
|
+++ foomatic-db-engine-3.0-20080710/configure.ac 2008-09-02 13:31:19.000000000 +0100
|
||||||
|
@@ -295,7 +295,7 @@ AC_OUTPUT(Makefile makeDefaults makeMan
|
||||||
|
foomatic-configure foomatic-printjob foomatic-kitload
|
||||||
|
foomatic-ppdfile foomatic-preferred-driver foomatic-cleanupdrivers
|
||||||
|
foomatic-getpjloptions foomatic-addpjloptions
|
||||||
|
-foomatic-compiledb foomatic-fix-xml
|
||||||
|
+foomatic-compiledb foomatic-fix-xml foomatic-ppdload
|
||||||
|
foomatic-nonumericalids foomatic-replaceoldprinterids
|
||||||
|
foomatic-ppd-options foomatic-printermap-to-gutenprint-xml
|
||||||
|
foomatic-extract-text foomatic-searchprinter
|
||||||
|
diff -up /dev/null foomatic-db-engine-3.0-20080710/foomatic-ppdload.8.in
|
||||||
|
--- /dev/null 2008-09-02 08:50:58.290000634 +0100
|
||||||
|
+++ foomatic-db-engine-3.0-20080710/foomatic-ppdload.8.in 2008-09-02 13:31:19.000000000 +0100
|
||||||
|
@@ -0,0 +1,47 @@
|
||||||
|
+.\" This -*- nroff -*- source file is part of foomatic.
|
||||||
|
+.\"
|
||||||
|
+.TH FOOMATIC-PPDLOAD 8 "2001-05-07" "Foomatic Project"
|
||||||
|
+.SH NAME
|
||||||
|
+foomatic-ppdload \- <put a short description here>
|
||||||
|
+.SH SYNOPSIS
|
||||||
|
+.B foomatic-ppdload \-h
|
||||||
|
+
|
||||||
|
+.B foomatic-ppdload
|
||||||
|
+\fIfilename.ppd printer-id\fR
|
||||||
|
+
|
||||||
|
+.B foomatic-ppdload \-R
|
||||||
|
+\fIprinter-id\fR
|
||||||
|
+
|
||||||
|
+.SH DESCRIPTION
|
||||||
|
+.B foomatic-ppdload
|
||||||
|
+takes a ppd filename and a printer ID as arguments. It
|
||||||
|
+parses a PPD file and writes option data into the foomatic database
|
||||||
|
+for use with the foomatic "ppd" driver and that printer.
|
||||||
|
+
|
||||||
|
+With the \fB-R\fR option you can remove a printer from the "ppd"
|
||||||
|
+driver, and with \fB-h\fR a short help text is shown.
|
||||||
|
+
|
||||||
|
+Right now, it will handle Boolean and PickOne options that go in the
|
||||||
|
+Prolog, DocumentSetup, or PageSetup spots. Also, PPD interoption
|
||||||
|
+constraints (not to be confused with foomatic option to printer and
|
||||||
|
+driver mapping constraints) are not supported by foomatic. And of
|
||||||
|
+course, the interesting color and font information from the PPD has
|
||||||
|
+no place in the current foomatic schema. All this will change over
|
||||||
|
+time.
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+.\".SH SEE ALSO
|
||||||
|
+.\".IR foomatic-XXX (1),
|
||||||
|
+
|
||||||
|
+.SH EXIT STATUS
|
||||||
|
+.B foomatic-ppdload
|
||||||
|
+returns ...
|
||||||
|
+
|
||||||
|
+.SH AUTHOR
|
||||||
|
+Manfred Wassmann <\fImanolo@NCC-1701.B.Shuttle.de\fR> for the foomatic
|
||||||
|
+project using output from the associated binary.
|
||||||
|
+
|
||||||
|
+.SH BUGS
|
||||||
|
+There are several limitations, but it's an interesting experiment.
|
||||||
|
+
|
||||||
|
+Please send bug reports to foomatic-devel@linuxprinting.org.
|
||||||
|
diff -up /dev/null foomatic-db-engine-3.0-20080710/foomatic-ppdload.in
|
||||||
|
--- /dev/null 2008-09-02 08:50:58.290000634 +0100
|
||||||
|
+++ foomatic-db-engine-3.0-20080710/foomatic-ppdload.in 2008-09-02 13:31:19.000000000 +0100
|
||||||
@@ -0,0 +1,118 @@
|
@@ -0,0 +1,118 @@
|
||||||
+#!@PERL@
|
+#!@PERL@
|
||||||
+
|
+
|
||||||
@ -119,83 +183,23 @@
|
|||||||
+ print "\n";
|
+ print "\n";
|
||||||
+ exit(1);
|
+ exit(1);
|
||||||
+}
|
+}
|
||||||
--- foomatic-db-engine-3.0-20031217/foomatic-ppdload.8.in.ppdload 2003-12-19 15:26:45.290034426 +0000
|
diff -up foomatic-db-engine-3.0-20080710/Makefile.in.ppdload foomatic-db-engine-3.0-20080710/Makefile.in
|
||||||
+++ foomatic-db-engine-3.0-20031217/foomatic-ppdload.8.in 2003-12-19 15:26:56.034756198 +0000
|
--- foomatic-db-engine-3.0-20080710/Makefile.in.ppdload 2008-07-10 08:20:10.000000000 +0100
|
||||||
@@ -0,0 +1,47 @@
|
+++ foomatic-db-engine-3.0-20080710/Makefile.in 2008-09-02 13:31:19.000000000 +0100
|
||||||
+.\" This -*- nroff -*- source file is part of foomatic.
|
@@ -147,6 +147,7 @@ AC_OUTPUT_FILES:=Makefile makeDefaults m
|
||||||
+.\"
|
|
||||||
+.TH FOOMATIC-PPDLOAD 8 "2001-05-07" "Foomatic Project"
|
|
||||||
+.SH NAME
|
|
||||||
+foomatic-ppdload \- <put a short description here>
|
|
||||||
+.SH SYNOPSIS
|
|
||||||
+.B foomatic-ppdload \-h
|
|
||||||
+
|
|
||||||
+.B foomatic-ppdload
|
|
||||||
+\fIfilename.ppd printer-id\fR
|
|
||||||
+
|
|
||||||
+.B foomatic-ppdload \-R
|
|
||||||
+\fIprinter-id\fR
|
|
||||||
+
|
|
||||||
+.SH DESCRIPTION
|
|
||||||
+.B foomatic-ppdload
|
|
||||||
+takes a ppd filename and a printer ID as arguments. It
|
|
||||||
+parses a PPD file and writes option data into the foomatic database
|
|
||||||
+for use with the foomatic "ppd" driver and that printer.
|
|
||||||
+
|
|
||||||
+With the \fB-R\fR option you can remove a printer from the "ppd"
|
|
||||||
+driver, and with \fB-h\fR a short help text is shown.
|
|
||||||
+
|
|
||||||
+Right now, it will handle Boolean and PickOne options that go in the
|
|
||||||
+Prolog, DocumentSetup, or PageSetup spots. Also, PPD interoption
|
|
||||||
+constraints (not to be confused with foomatic option to printer and
|
|
||||||
+driver mapping constraints) are not supported by foomatic. And of
|
|
||||||
+course, the interesting color and font information from the PPD has
|
|
||||||
+no place in the current foomatic schema. All this will change over
|
|
||||||
+time.
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+.\".SH SEE ALSO
|
|
||||||
+.\".IR foomatic-XXX (1),
|
|
||||||
+
|
|
||||||
+.SH EXIT STATUS
|
|
||||||
+.B foomatic-ppdload
|
|
||||||
+returns ...
|
|
||||||
+
|
|
||||||
+.SH AUTHOR
|
|
||||||
+Manfred Wassmann <\fImanolo@NCC-1701.B.Shuttle.de\fR> for the foomatic
|
|
||||||
+project using output from the associated binary.
|
|
||||||
+
|
|
||||||
+.SH BUGS
|
|
||||||
+There are several limitations, but it's an interesting experiment.
|
|
||||||
+
|
|
||||||
+Please send bug reports to foomatic-devel@linuxprinting.org.
|
|
||||||
--- foomatic-db-engine-3.0-20031217/configure.ac.ppdload 2003-12-19 15:27:03.188905120 +0000
|
|
||||||
+++ foomatic-db-engine-3.0-20031217/configure.ac 2003-12-19 15:27:21.165766554 +0000
|
|
||||||
@@ -280,7 +280,7 @@
|
|
||||||
foomatic-configure foomatic-printjob foomatic-kitload
|
|
||||||
foomatic-ppdfile foomatic-preferred-driver foomatic-cleanupdrivers
|
|
||||||
foomatic-getpjloptions foomatic-addpjloptions
|
|
||||||
-foomatic-compiledb foomatic-fix-xml
|
|
||||||
+foomatic-compiledb foomatic-fix-xml foomatic-ppdload
|
|
||||||
foomatic-nonumericalids foomatic-replaceoldprinterids
|
|
||||||
foomatic-ppd-options
|
|
||||||
)
|
|
||||||
--- foomatic-db-engine-3.0-20031217/Makefile.in.ppdload 2003-12-19 15:27:25.217284580 +0000
|
|
||||||
+++ foomatic-db-engine-3.0-20031217/Makefile.in 2003-12-19 15:28:09.349034667 +0000
|
|
||||||
@@ -145,6 +145,7 @@
|
|
||||||
foomatic-kitload foomatic-ppdfile foomatic-preferred-driver \
|
foomatic-kitload foomatic-ppdfile foomatic-preferred-driver \
|
||||||
foomatic-cleanupdrivers foomatic-getpjloptions \
|
foomatic-cleanupdrivers foomatic-getpjloptions \
|
||||||
foomatic-addpjloptions foomatic-compiledb foomatic-fix-xml \
|
foomatic-addpjloptions foomatic-compiledb foomatic-fix-xml \
|
||||||
+ foomatic-ppdload \
|
+ foomatic-ppdload \
|
||||||
foomatic-nonumericalids foomatic-replaceoldprinterids \
|
foomatic-nonumericalids foomatic-replaceoldprinterids \
|
||||||
foomatic-ppd-options
|
foomatic-ppd-options foomatic-printermap-to-gutenprint-xml \
|
||||||
|
foomatic-extract-text foomatic-searchprinter
|
||||||
@@ -155,7 +156,7 @@
|
@@ -158,7 +159,7 @@ BINFILES:=foomatic-printjob foomatic-con
|
||||||
foomatic-ppd-options
|
foomatic-ppd-options foomatic-searchprinter
|
||||||
|
|
||||||
# Administrative commands, only useful for admins
|
# Administrative commands, only useful for admins
|
||||||
-SBINFILES:=foomatic-kitload \
|
-SBINFILES:=foomatic-kitload \
|
||||||
+SBINFILES:=foomatic-kitload foomatic-ppdload \
|
+SBINFILES:=foomatic-kitload foomatic-ppdload \
|
||||||
foomatic-getpjloptions foomatic-addpjloptions \
|
foomatic-getpjloptions foomatic-addpjloptions \
|
||||||
foomatic-preferred-driver foomatic-fix-xml \
|
foomatic-preferred-driver foomatic-fix-xml \
|
||||||
foomatic-nonumericalids foomatic-replaceoldprinterids
|
foomatic-nonumericalids foomatic-replaceoldprinterids \
|
||||||
|
|||||||
@ -249,6 +249,7 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Sep 2 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-62
|
* Tue Sep 2 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-62
|
||||||
|
- Removed patch fuzz.
|
||||||
- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
|
- Fixed PPD generation for HP LaserJet 4345 MFP (bug #459847).
|
||||||
|
|
||||||
* Thu Jul 10 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-61
|
* Thu Jul 10 2008 Tim Waugh <twaugh@redhat.com> 3.0.2-61
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user