diff --git a/pbm2ppa-20000205.diff b/pbm2ppa-20000205.diff index c688c2b..96fbae5 100644 --- a/pbm2ppa-20000205.diff +++ b/pbm2ppa-20000205.diff @@ -1,7 +1,7 @@ -diff -uNr pbm2ppa-0.8.6/CALIBRATION pbm2ppa-20000205/CALIBRATION ---- pbm2ppa-0.8.6/CALIBRATION Sat Aug 22 09:44:07 1998 -+++ pbm2ppa-20000205/CALIBRATION Sun Feb 6 01:32:25 2000 -@@ -10,9 +10,22 @@ +diff -up pbm2ppa-0.8.6/CALIBRATION.20000205 pbm2ppa-0.8.6/CALIBRATION +--- pbm2ppa-0.8.6/CALIBRATION.20000205 1998-08-22 14:44:07.000000000 +0100 ++++ pbm2ppa-0.8.6/CALIBRATION 2008-09-24 15:15:53.000000000 +0100 +@@ -10,9 +10,22 @@ during this procedure (like 600)] The 'pbmtpg' program generates a full-page (8.5"x11") test pattern in pbmraw (P4) format on stdout. The output may be fed directly into pbm2ppa in order to print a calibration pattern on your printer with commands such as: @@ -25,7 +25,7 @@ diff -uNr pbm2ppa-0.8.6/CALIBRATION pbm2ppa-20000205/CALIBRATION - or - -@@ -33,3 +46,7 @@ +@@ -33,3 +46,7 @@ paper. Also, the margins should be able causing the printer to choke with 'blinking lights syndrome'. [TODO: Add shearing adjustments to pbm2ppa and explain here] @@ -33,9 +33,135 @@ diff -uNr pbm2ppa-0.8.6/CALIBRATION pbm2ppa-20000205/CALIBRATION + + + -diff -uNr pbm2ppa-0.8.6/INSTALL pbm2ppa-20000205/INSTALL ---- pbm2ppa-0.8.6/INSTALL Sun Oct 18 21:27:16 1998 -+++ pbm2ppa-20000205/INSTALL Sat Feb 5 14:14:54 2000 +diff -up pbm2ppa-0.8.6/defaults.1000.h.20000205 pbm2ppa-0.8.6/defaults.1000.h +--- pbm2ppa-0.8.6/defaults.1000.h.20000205 1998-08-22 14:44:12.000000000 +0100 ++++ pbm2ppa-0.8.6/defaults.1000.h 2008-09-24 15:17:47.000000000 +0100 +@@ -1,19 +0,0 @@ +-/* defaults.h +- * Default printer values. Edit these and recompile if so desired. +- * [Note: a /etc/pbm2ppa.conf file will override these] +- */ +-#ifndef _DEFAULTS_H +-#define _DEFAULTS_H +- +-#define DEFAULT_PRINTER ( HP1000 ) +- +-/* Refer to CALIBRATION file about these settings */ +-#define DEFAULT_X_OFFSET ( 100 ) +-#define DEFAULT_Y_OFFSET ( -650 ) +- +-#define DEFAULT_TOP_MARGIN ( 150 ) +-#define DEFAULT_LEFT_MARGIN ( 150 ) +-#define DEFAULT_RIGHT_MARGIN ( 150 ) +-#define DEFAULT_BOTTOM_MARGIN ( 150 ) +- +-#endif +diff -up pbm2ppa-0.8.6/defaults.720.h.20000205 pbm2ppa-0.8.6/defaults.720.h +--- pbm2ppa-0.8.6/defaults.720.h.20000205 1998-08-22 14:44:12.000000000 +0100 ++++ pbm2ppa-0.8.6/defaults.720.h 2008-09-24 15:17:47.000000000 +0100 +@@ -1,19 +0,0 @@ +-/* defaults.h +- * Default printer values. Edit these and recompile if so desired. +- * [Note: a /etc/pbm2ppa.conf file will override these] +- */ +-#ifndef _DEFAULTS_H +-#define _DEFAULTS_H +- +-#define DEFAULT_PRINTER ( HP720 ) +- +-/* Refer to CALIBRATION file about these settings */ +-#define DEFAULT_X_OFFSET ( 169 ) +-#define DEFAULT_Y_OFFSET ( -569 ) +- +-#define DEFAULT_TOP_MARGIN ( 150 ) +-#define DEFAULT_LEFT_MARGIN ( 150 ) +-#define DEFAULT_RIGHT_MARGIN ( 150 ) +-#define DEFAULT_BOTTOM_MARGIN ( 150 ) +- +-#endif +diff -up pbm2ppa-0.8.6/defaults.820.h.20000205 pbm2ppa-0.8.6/defaults.820.h +--- pbm2ppa-0.8.6/defaults.820.h.20000205 1998-08-22 14:44:12.000000000 +0100 ++++ pbm2ppa-0.8.6/defaults.820.h 2008-09-24 15:17:47.000000000 +0100 +@@ -1,19 +0,0 @@ +-/* defaults.h +- * Default printer values. Edit these and recompile if so desired. +- * [Note: a /etc/pbm2ppa.conf file will override these] +- */ +-#ifndef _DEFAULTS_H +-#define _DEFAULTS_H +- +-#define DEFAULT_PRINTER ( HP820 ) +- +-/* Refer to CALIBRATION file about these settings */ +-#define DEFAULT_X_OFFSET ( 75 ) +-#define DEFAULT_Y_OFFSET ( -500 ) +- +-#define DEFAULT_TOP_MARGIN ( 80 ) +-#define DEFAULT_LEFT_MARGIN ( 80 ) +-#define DEFAULT_RIGHT_MARGIN ( 80 ) +-#define DEFAULT_BOTTOM_MARGIN ( 150 ) +- +-#endif +diff -up /dev/null pbm2ppa-0.8.6/defaults.h +--- /dev/null 2008-09-24 08:53:03.196006296 +0100 ++++ pbm2ppa-0.8.6/defaults.h 2008-09-24 15:15:53.000000000 +0100 +@@ -0,0 +1,53 @@ ++/* defaults.h ++ * Default printer values. Edit these and recompile if so desired. ++ * [Note: a /etc/pbm2ppa.conf file will override these] ++ */ ++ ++#ifndef _DEFAULTS_H ++#define _DEFAULTS_H ++ ++#ifndef DEFAULT_PRINTER ++#define DEFAULT_PRINTER ( HP720 ) ++#endif ++ ++/* for HP720 series */ ++/* Refer to CALIBRATION file about these settings */ ++#define HP720_X_OFFSET ( 169 ) ++#define HP720_Y_OFFSET ( -569 ) ++ ++#define HP720_TOP_MARGIN ( 150 ) ++#define HP720_LEFT_MARGIN ( 150 ) ++#define HP720_RIGHT_MARGIN ( 150 ) ++#define HP720_BOTTOM_MARGIN ( 150 ) ++ ++/* for HP820 series */ ++/* Refer to CALIBRATION file about these settings */ ++#define HP820_X_OFFSET ( 75 ) ++#define HP820_Y_OFFSET ( -500 ) ++ ++#define HP820_TOP_MARGIN ( 80 ) ++#define HP820_LEFT_MARGIN ( 80 ) ++#define HP820_RIGHT_MARGIN ( 80 ) ++#define HP820_BOTTOM_MARGIN ( 150 ) ++ ++/* for HP1000 series */ ++/* Refer to CALIBRATION file about these settings */ ++#define HP1000_X_OFFSET ( 100 ) ++#define HP1000_Y_OFFSET ( -650 ) ++ ++#define HP1000_TOP_MARGIN ( 150 ) ++#define HP1000_LEFT_MARGIN ( 150 ) ++#define HP1000_RIGHT_MARGIN ( 150 ) ++#define HP1000_BOTTOM_MARGIN ( 150 ) ++ ++#endif ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff -up pbm2ppa-0.8.6/INSTALL.20000205 pbm2ppa-0.8.6/INSTALL +--- pbm2ppa-0.8.6/INSTALL.20000205 1998-10-19 02:27:16.000000000 +0100 ++++ pbm2ppa-0.8.6/INSTALL 2008-09-24 15:15:53.000000000 +0100 @@ -1,6 +1,6 @@ Overview -------- @@ -44,7 +170,7 @@ diff -uNr pbm2ppa-0.8.6/INSTALL pbm2ppa-20000205/INSTALL complete step-by-step instruction on how to install pbm2ppa for your printer, please see INSTALL-MORE. (It was written for the 820, but it should work for all supported models) Thanks to Michael Buehlmann for -@@ -9,14 +9,19 @@ +@@ -9,14 +9,19 @@ writing that guide! Compilation ----------- To compile, you should simply run 'make' with the series of your @@ -67,7 +193,7 @@ diff -uNr pbm2ppa-0.8.6/INSTALL pbm2ppa-20000205/INSTALL Installation ------------ -@@ -26,17 +31,23 @@ +@@ -26,17 +31,23 @@ but you might want to tweak them). See The other binary created, pbm2ppa, is a converter from a PBM image to a stream of PPA data that can be sent directly to the printer. @@ -96,10 +222,10 @@ diff -uNr pbm2ppa-0.8.6/INSTALL pbm2ppa-20000205/INSTALL You can also set up a printer filter. See the documentation for your print spooler for information on how to do that, or look in -diff -uNr pbm2ppa-0.8.6/INSTALL-MORE pbm2ppa-20000205/INSTALL-MORE ---- pbm2ppa-0.8.6/INSTALL-MORE Sun Oct 18 21:27:17 1998 -+++ pbm2ppa-20000205/INSTALL-MORE Sat Feb 5 04:34:45 2000 -@@ -36,14 +36,21 @@ +diff -up pbm2ppa-0.8.6/INSTALL-MORE.20000205 pbm2ppa-0.8.6/INSTALL-MORE +--- pbm2ppa-0.8.6/INSTALL-MORE.20000205 1998-10-19 02:27:17.000000000 +0100 ++++ pbm2ppa-0.8.6/INSTALL-MORE 2008-09-24 15:15:53.000000000 +0100 +@@ -36,14 +36,21 @@ or put in your printer number (720, 820 file). @@ -124,9 +250,9 @@ diff -uNr pbm2ppa-0.8.6/INSTALL-MORE pbm2ppa-20000205/INSTALL-MORE For A4 size paper: # pbmtpg -a4 | pbm2ppa -s a4 > /dev/lp1 ( as root ) -diff -uNr pbm2ppa-0.8.6/Makefile pbm2ppa-20000205/Makefile ---- pbm2ppa-0.8.6/Makefile Sun Oct 11 11:17:16 1998 -+++ pbm2ppa-20000205/Makefile Sat Feb 5 04:34:45 2000 +diff -up pbm2ppa-0.8.6/Makefile.20000205 pbm2ppa-0.8.6/Makefile +--- pbm2ppa-0.8.6/Makefile.20000205 1998-10-11 16:17:16.000000000 +0100 ++++ pbm2ppa-0.8.6/Makefile 2008-09-24 15:15:53.000000000 +0100 @@ -1,36 +1,23 @@ CC=gcc -CFLAGS=-Wall -O2 @@ -175,7 +301,7 @@ diff -uNr pbm2ppa-0.8.6/Makefile pbm2ppa-20000205/Makefile pbm2ppa: pbm2ppa.o ppa.o pbm.o cutswath.o $(CC) $(LDFLAGS) -o pbm2ppa pbm2ppa.o ppa.o pbm.o cutswath.o -@@ -39,4 +26,11 @@ +@@ -39,4 +26,11 @@ pbmtpg: pbmtpg.o $(CC) $(CFLAGS) -o pbmtpg pbmtpg.o -lm .c.o: $*.c ppa.h pbm.h @@ -188,189 +314,9 @@ diff -uNr pbm2ppa-0.8.6/Makefile pbm2ppa-20000205/Makefile + + + -diff -uNr pbm2ppa-0.8.6/README.REDHAT pbm2ppa-20000205/README.REDHAT ---- pbm2ppa-0.8.6/README.REDHAT Sat Aug 22 09:48:40 1998 -+++ pbm2ppa-20000205/README.REDHAT Sun Feb 6 00:53:29 2000 -@@ -1,12 +1,28 @@ --RedHat users may find the following tip from Panayotis Vryonis --helpful! -+The best way to integrate support for the HP PPA Printers into RedHat's -+Linux Print System Manager (printtool) is to replace e.g., the -+rhs-printfilters-1.57-3 RPM package that comes with Red Hat 6.1, -+with a PPA-aware version from the pnm2ppa project whic h has a -+homepage at http://www.sourceforge.net/projects/?group_id=1322 - --Here is a tip to intergrate HP720C support in RedHat's printtool: -+At the time of writing, the latest release is -+ rhs-printfilters-1.57-4ppa1 -+This package includes support for both pbm2ppa and the new -+color driver pnm2ppa. - --Install pbm2ppa. Copy pbm2ppa to /usr/bin. --Edit "printerdb" (in my system it is found in --/usr/lib/rhs/rhs-printfilters ) --and append the following lines: -+ ------------------------------------- -+ -+If for some reason, they cannot use this PPA-aware version of -+rhs-printfilters, RedHat users may still find the following tip from -+Panayotis Vryonis helpful! -+It will work with the standard rhs-printfilters that comes with the -+Red Hat release: -+ -+ Here is a tip to integrate HP720C support in RedHat's printtool: -+ -+ Install pbm2ppa. Copy pbm2ppa to /usr/bin. -+ Edit "printerdb" (in my system it is found in -+ /usr/lib/rhs/rhs-printfilters ) -+ and append the following lines: - ----------------------Cut here - ------------------------------------------- - StartEntry: DeskJet720C -@@ -23,7 +39,11 @@ - EndEntry - -------------------------------------------------------------------------- - --Now you can add an HP720C printer just like any other, using printtool. -+ Now you can add an HP720C printer just like any other, using printtool. -+ -+ [Author's (P. Vryonis) Note: The same should work for the 820 and -+ 1000, but it hasn't been tested. Also, use the pbmraw GSDriver if -+ you have it; it's faster. ] -+ -+ - --[Author's Note: The same should work for the 820 and 1000, but it hasn't --been tested. Also, use the pbmraw GSDriver if you have it; it's faster. ] -diff -uNr pbm2ppa-0.8.6/defaults.1000.h pbm2ppa-20000205/defaults.1000.h ---- pbm2ppa-0.8.6/defaults.1000.h Sat Aug 22 09:44:12 1998 -+++ pbm2ppa-20000205/defaults.1000.h Wed Dec 31 19:00:00 1969 -@@ -1,19 +0,0 @@ --/* defaults.h -- * Default printer values. Edit these and recompile if so desired. -- * [Note: a /etc/pbm2ppa.conf file will override these] -- */ --#ifndef _DEFAULTS_H --#define _DEFAULTS_H -- --#define DEFAULT_PRINTER ( HP1000 ) -- --/* Refer to CALIBRATION file about these settings */ --#define DEFAULT_X_OFFSET ( 100 ) --#define DEFAULT_Y_OFFSET ( -650 ) -- --#define DEFAULT_TOP_MARGIN ( 150 ) --#define DEFAULT_LEFT_MARGIN ( 150 ) --#define DEFAULT_RIGHT_MARGIN ( 150 ) --#define DEFAULT_BOTTOM_MARGIN ( 150 ) -- --#endif -diff -uNr pbm2ppa-0.8.6/defaults.720.h pbm2ppa-20000205/defaults.720.h ---- pbm2ppa-0.8.6/defaults.720.h Sat Aug 22 09:44:12 1998 -+++ pbm2ppa-20000205/defaults.720.h Wed Dec 31 19:00:00 1969 -@@ -1,19 +0,0 @@ --/* defaults.h -- * Default printer values. Edit these and recompile if so desired. -- * [Note: a /etc/pbm2ppa.conf file will override these] -- */ --#ifndef _DEFAULTS_H --#define _DEFAULTS_H -- --#define DEFAULT_PRINTER ( HP720 ) -- --/* Refer to CALIBRATION file about these settings */ --#define DEFAULT_X_OFFSET ( 169 ) --#define DEFAULT_Y_OFFSET ( -569 ) -- --#define DEFAULT_TOP_MARGIN ( 150 ) --#define DEFAULT_LEFT_MARGIN ( 150 ) --#define DEFAULT_RIGHT_MARGIN ( 150 ) --#define DEFAULT_BOTTOM_MARGIN ( 150 ) -- --#endif -diff -uNr pbm2ppa-0.8.6/defaults.820.h pbm2ppa-20000205/defaults.820.h ---- pbm2ppa-0.8.6/defaults.820.h Sat Aug 22 09:44:12 1998 -+++ pbm2ppa-20000205/defaults.820.h Wed Dec 31 19:00:00 1969 -@@ -1,19 +0,0 @@ --/* defaults.h -- * Default printer values. Edit these and recompile if so desired. -- * [Note: a /etc/pbm2ppa.conf file will override these] -- */ --#ifndef _DEFAULTS_H --#define _DEFAULTS_H -- --#define DEFAULT_PRINTER ( HP820 ) -- --/* Refer to CALIBRATION file about these settings */ --#define DEFAULT_X_OFFSET ( 75 ) --#define DEFAULT_Y_OFFSET ( -500 ) -- --#define DEFAULT_TOP_MARGIN ( 80 ) --#define DEFAULT_LEFT_MARGIN ( 80 ) --#define DEFAULT_RIGHT_MARGIN ( 80 ) --#define DEFAULT_BOTTOM_MARGIN ( 150 ) -- --#endif -diff -uNr pbm2ppa-0.8.6/defaults.h pbm2ppa-20000205/defaults.h ---- pbm2ppa-0.8.6/defaults.h Wed Dec 31 19:00:00 1969 -+++ pbm2ppa-20000205/defaults.h Sat Feb 5 04:34:45 2000 -@@ -0,0 +1,53 @@ -+/* defaults.h -+ * Default printer values. Edit these and recompile if so desired. -+ * [Note: a /etc/pbm2ppa.conf file will override these] -+ */ -+ -+#ifndef _DEFAULTS_H -+#define _DEFAULTS_H -+ -+#ifndef DEFAULT_PRINTER -+#define DEFAULT_PRINTER ( HP720 ) -+#endif -+ -+/* for HP720 series */ -+/* Refer to CALIBRATION file about these settings */ -+#define HP720_X_OFFSET ( 169 ) -+#define HP720_Y_OFFSET ( -569 ) -+ -+#define HP720_TOP_MARGIN ( 150 ) -+#define HP720_LEFT_MARGIN ( 150 ) -+#define HP720_RIGHT_MARGIN ( 150 ) -+#define HP720_BOTTOM_MARGIN ( 150 ) -+ -+/* for HP820 series */ -+/* Refer to CALIBRATION file about these settings */ -+#define HP820_X_OFFSET ( 75 ) -+#define HP820_Y_OFFSET ( -500 ) -+ -+#define HP820_TOP_MARGIN ( 80 ) -+#define HP820_LEFT_MARGIN ( 80 ) -+#define HP820_RIGHT_MARGIN ( 80 ) -+#define HP820_BOTTOM_MARGIN ( 150 ) -+ -+/* for HP1000 series */ -+/* Refer to CALIBRATION file about these settings */ -+#define HP1000_X_OFFSET ( 100 ) -+#define HP1000_Y_OFFSET ( -650 ) -+ -+#define HP1000_TOP_MARGIN ( 150 ) -+#define HP1000_LEFT_MARGIN ( 150 ) -+#define HP1000_RIGHT_MARGIN ( 150 ) -+#define HP1000_BOTTOM_MARGIN ( 150 ) -+ -+#endif -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -uNr pbm2ppa-0.8.6/pbm2ppa.1 pbm2ppa-20000205/pbm2ppa.1 ---- pbm2ppa-0.8.6/pbm2ppa.1 Wed Dec 31 19:00:00 1969 -+++ pbm2ppa-20000205/pbm2ppa.1 Sun Feb 6 00:11:42 2000 +diff -up /dev/null pbm2ppa-0.8.6/pbm2ppa.1 +--- /dev/null 2008-09-24 08:53:03.196006296 +0100 ++++ pbm2ppa-0.8.6/pbm2ppa.1 2008-09-24 15:15:53.000000000 +0100 @@ -0,0 +1,135 @@ +.TH pnm2ppa "5 Feb 2000" +.SH NAME @@ -507,9 +453,9 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.1 pbm2ppa-20000205/pbm2ppa.1 + + + -diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c ---- pbm2ppa-0.8.6/pbm2ppa.c Tue Sep 15 20:00:27 1998 -+++ pbm2ppa-20000205/pbm2ppa.c Sat Feb 5 17:27:58 2000 +diff -up pbm2ppa-0.8.6/pbm2ppa.c.20000205 pbm2ppa-0.8.6/pbm2ppa.c +--- pbm2ppa-0.8.6/pbm2ppa.c.20000205 1998-09-16 01:00:27.000000000 +0100 ++++ pbm2ppa-0.8.6/pbm2ppa.c 2008-09-24 15:15:53.000000000 +0100 @@ -17,10 +17,15 @@ /* Paper sizes in 600ths of an inch. */ @@ -529,7 +475,7 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c /* A4 is 210 mm by 297 mm == 8.27 in by 11.69 in */ -@@ -121,16 +126,35 @@ +@@ -121,16 +126,35 @@ int print_pbm (FILE *in) void set_printer_specific_defaults() { @@ -567,7 +513,7 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c printer.marg_diff=0x62; printer.bufsize = 100*1024; break; -@@ -144,15 +168,17 @@ +@@ -144,15 +168,17 @@ void show_usage(char* prog) { printf("usage: %s [ options ] [ [ ] ]\n\n",prog); printf(" Prints a pbm- or pbmraw-format to HP720/820/1000-format .\n\n"); @@ -593,7 +539,7 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c printf(" The -x and -y options accumulate. The -v option resets the horizontal and\n"); printf(" vertical adjustments to an internal default. and default\n"); printf(" to stdin and stdout. '-' is a synonym for stdin and stdout.\n\n"); -@@ -173,7 +199,13 @@ +@@ -173,7 +199,13 @@ void show_usage(char* prog) void parm_version(char* arg) { @@ -608,7 +554,7 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c printer.version=HP720; else if(!strcasecmp(arg,"hp820") || !strcmp(arg,"820")) printer.version=HP820; -@@ -191,7 +223,10 @@ +@@ -191,7 +223,10 @@ void parm_iversion(int arg) { switch(arg) { @@ -619,7 +565,7 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c printer.version=HP720; break; case 820: -@@ -262,10 +297,15 @@ +@@ -262,10 +297,15 @@ void read_config_file(char* fname) printer.bottom_margin=value; else if(!strncmp(key,"papersize",len)) { @@ -638,7 +584,7 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c } else if(!strcmp(buf,"a4")) { -@@ -313,15 +353,9 @@ +@@ -313,15 +353,9 @@ int main (int argc, char *argv[]) FILE *in=stdin, *out=stdout; struct stat tmpstat; @@ -657,7 +603,7 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c set_printer_specific_defaults(); if(!stat(defaultcfgfile,&tmpstat)) -@@ -356,10 +390,15 @@ +@@ -356,10 +390,15 @@ int main (int argc, char *argv[]) else if(!strcmp(argv[argn],"-s")) { argn++; @@ -676,15 +622,14 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.c pbm2ppa-20000205/pbm2ppa.c } else if(!strcmp(argv[argn],"a4")) { -@@ -413,4 +452,5 @@ - +@@ -414,3 +453,4 @@ int main (int argc, char *argv[]) return print_pbm (in); } -+ -diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf pbm2ppa-20000205/pbm2ppa.conf ---- pbm2ppa-0.8.6/pbm2ppa.conf Wed Dec 31 19:00:00 1969 -+++ pbm2ppa-20000205/pbm2ppa.conf Sat Feb 5 17:27:58 2000 ++ +diff -up /dev/null pbm2ppa-0.8.6/pbm2ppa.conf +--- /dev/null 2008-09-24 08:53:03.196006296 +0100 ++++ pbm2ppa-0.8.6/pbm2ppa.conf 2008-09-24 15:15:53.000000000 +0100 @@ -0,0 +1,58 @@ +# Sample configuration file for the HP720/HP820/HP1000 PPA Printers +# @@ -744,9 +689,9 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf pbm2ppa-20000205/pbm2ppa.conf + + + -diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp1000 pbm2ppa-20000205/pbm2ppa.conf.hp1000 ---- pbm2ppa-0.8.6/pbm2ppa.conf.hp1000 Sun Oct 18 21:27:19 1998 -+++ pbm2ppa-20000205/pbm2ppa.conf.hp1000 Wed Dec 31 19:00:00 1969 +diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp1000.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp1000 +--- pbm2ppa-0.8.6/pbm2ppa.conf.hp1000.20000205 1998-10-19 02:27:19.000000000 +0100 ++++ pbm2ppa-0.8.6/pbm2ppa.conf.hp1000 2008-09-24 15:17:47.000000000 +0100 @@ -1,18 +0,0 @@ -# Sample configuration file for the HP720 -# @@ -766,9 +711,9 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp1000 pbm2ppa-20000205/pbm2ppa.conf.hp1000 -bottom 150 -left 150 -right 150 -diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp720 pbm2ppa-20000205/pbm2ppa.conf.hp720 ---- pbm2ppa-0.8.6/pbm2ppa.conf.hp720 Sun Oct 18 21:27:20 1998 -+++ pbm2ppa-20000205/pbm2ppa.conf.hp720 Wed Dec 31 19:00:00 1969 +diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp720.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp720 +--- pbm2ppa-0.8.6/pbm2ppa.conf.hp720.20000205 1998-10-19 02:27:20.000000000 +0100 ++++ pbm2ppa-0.8.6/pbm2ppa.conf.hp720 2008-09-24 15:17:47.000000000 +0100 @@ -1,18 +0,0 @@ -# Sample configuration file for the HP720 -# @@ -788,9 +733,9 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp720 pbm2ppa-20000205/pbm2ppa.conf.hp720 -bottom 150 -left 150 -right 150 -diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp820 pbm2ppa-20000205/pbm2ppa.conf.hp820 ---- pbm2ppa-0.8.6/pbm2ppa.conf.hp820 Sun Oct 18 21:27:21 1998 -+++ pbm2ppa-20000205/pbm2ppa.conf.hp820 Wed Dec 31 19:00:00 1969 +diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp820.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp820 +--- pbm2ppa-0.8.6/pbm2ppa.conf.hp820.20000205 1998-10-19 02:27:21.000000000 +0100 ++++ pbm2ppa-0.8.6/pbm2ppa.conf.hp820 2008-09-24 15:17:47.000000000 +0100 @@ -1,18 +0,0 @@ -# Sample configuration file for the HP820 -# @@ -810,10 +755,11 @@ diff -uNr pbm2ppa-0.8.6/pbm2ppa.conf.hp820 pbm2ppa-20000205/pbm2ppa.conf.hp820 -bottom 150 -left 80 -right 80 -diff -uNr pbm2ppa-0.8.6/pbmtpg.c pbm2ppa-20000205/pbmtpg.c ---- pbm2ppa-0.8.6/pbmtpg.c Tue Sep 15 20:00:28 1998 -+++ pbm2ppa-20000205/pbmtpg.c Sat Feb 5 04:34:45 2000 -@@ -2,12 +2,18 @@ +diff -up pbm2ppa-0.8.6/pbmtpg.c.20000205 pbm2ppa-0.8.6/pbmtpg.c +--- pbm2ppa-0.8.6/pbmtpg.c.20000205 1998-09-16 01:00:28.000000000 +0100 ++++ pbm2ppa-0.8.6/pbmtpg.c 2008-09-24 15:15:53.000000000 +0100 +@@ -1,13 +1,19 @@ + #include #include #include +#include @@ -836,7 +782,7 @@ diff -uNr pbm2ppa-0.8.6/pbmtpg.c pbm2ppa-20000205/pbmtpg.c /* A4 is 210 mm by 297 mm == 8.27 in by 11.69 in */ -@@ -137,8 +142,24 @@ +@@ -137,8 +143,24 @@ int main(int argc,char** argv) char buf[128]; char *progname = *argv; @@ -863,7 +809,7 @@ diff -uNr pbm2ppa-0.8.6/pbmtpg.c pbm2ppa-20000205/pbmtpg.c if(argc>1 && strcmp(argv[1], "-a4")==0) { Width = A4WIDTH; -@@ -146,6 +167,9 @@ +@@ -146,6 +168,9 @@ int main(int argc,char** argv) argc--; argv++; } @@ -873,7 +819,7 @@ diff -uNr pbm2ppa-0.8.6/pbmtpg.c pbm2ppa-20000205/pbmtpg.c Pwidth = (Width+7)/8; bitmap = (char *)malloc(Pwidth*Height); -@@ -192,6 +216,7 @@ +@@ -192,6 +217,7 @@ int main(int argc,char** argv) return 1; } @@ -881,7 +827,7 @@ diff -uNr pbm2ppa-0.8.6/pbmtpg.c pbm2ppa-20000205/pbmtpg.c printf("P4\n%d %d\n",Width,Height); for(x=0; x +-helpful! ++The best way to integrate support for the HP PPA Printers into RedHat's ++Linux Print System Manager (printtool) is to replace e.g., the ++rhs-printfilters-1.57-3 RPM package that comes with Red Hat 6.1, ++with a PPA-aware version from the pnm2ppa project whic h has a ++homepage at http://www.sourceforge.net/projects/?group_id=1322 + +-Here is a tip to intergrate HP720C support in RedHat's printtool: ++At the time of writing, the latest release is ++ rhs-printfilters-1.57-4ppa1 ++This package includes support for both pbm2ppa and the new ++color driver pnm2ppa. + +-Install pbm2ppa. Copy pbm2ppa to /usr/bin. +-Edit "printerdb" (in my system it is found in +-/usr/lib/rhs/rhs-printfilters ) +-and append the following lines: ++ ------------------------------------- ++ ++If for some reason, they cannot use this PPA-aware version of ++rhs-printfilters, RedHat users may still find the following tip from ++Panayotis Vryonis helpful! ++It will work with the standard rhs-printfilters that comes with the ++Red Hat release: ++ ++ Here is a tip to integrate HP720C support in RedHat's printtool: ++ ++ Install pbm2ppa. Copy pbm2ppa to /usr/bin. ++ Edit "printerdb" (in my system it is found in ++ /usr/lib/rhs/rhs-printfilters ) ++ and append the following lines: + ----------------------Cut here + ------------------------------------------- + StartEntry: DeskJet720C +@@ -23,7 +39,11 @@ StartEntry: DeskJet720C + EndEntry + -------------------------------------------------------------------------- + +-Now you can add an HP720C printer just like any other, using printtool. ++ Now you can add an HP720C printer just like any other, using printtool. ++ ++ [Author's (P. Vryonis) Note: The same should work for the 820 and ++ 1000, but it hasn't been tested. Also, use the pbmraw GSDriver if ++ you have it; it's faster. ] ++ ++ + +-[Author's Note: The same should work for the 820 and 1000, but it hasn't +-been tested. Also, use the pbmraw GSDriver if you have it; it's faster. ] diff --git a/pnm2ppa-redhat.patch b/pnm2ppa-redhat.patch index ce08819..f3294a1 100644 --- a/pnm2ppa-redhat.patch +++ b/pnm2ppa-redhat.patch @@ -1,16 +1,18 @@ -diff -uNr pnm2ppa-0.99pre3/pnm2ppa.conf pnm2ppa-0.99pre3-redhat/pnm2ppa.conf ---- pnm2ppa-0.99pre3/pnm2ppa.conf Fri May 26 01:35:52 2000 -+++ pnm2ppa-0.99pre3-redhat/pnm2ppa.conf Fri May 26 04:03:56 2000 -@@ -12,7 +12,6 @@ - # will be used. The printer version can also be set with the command line - # option e.g., "-v 720". +diff -up pnm2ppa-1.04/Makefile.rh pnm2ppa-1.04/Makefile +--- pnm2ppa-1.04/Makefile.rh 2000-11-02 18:33:08.000000000 +0000 ++++ pnm2ppa-1.04/Makefile 2008-09-24 15:18:26.000000000 +0100 +@@ -10,7 +10,7 @@ CC=gcc + INSTALL=install --version ERROR # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!! - #version 720 # 710, 712, 722 also acceptable - #version 820 - #version 1000 ---- pnm2ppa/pbm2ppa-0.8.6/Makefile.rh Thu Feb 10 15:28:55 2000 -+++ pnm2ppa/pbm2ppa-0.8.6/Makefile Thu Feb 10 15:30:06 2000 + # production build +-CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG ++CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG + LDFLAGS=-lm + OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o + SRC = pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c +diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile +--- pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh 2008-09-24 15:18:26.000000000 +0100 ++++ pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile 2008-09-24 15:18:26.000000000 +0100 @@ -1,5 +1,5 @@ CC=gcc -CFLAGS=-Wall -O2 @@ -18,17 +20,14 @@ diff -uNr pnm2ppa-0.99pre3/pnm2ppa.conf pnm2ppa-0.99pre3-redhat/pnm2ppa.conf LDFLAGS= PRINTER=HP720 ---- pnm2ppa/Makefile.rh Thu Feb 10 15:29:06 2000 -+++ pnm2ppa/Makefile Thu Feb 10 15:29:39 2000 -@@ -9,7 +9,7 @@ - INSTALL=install +diff -up pnm2ppa-1.04/pnm2ppa.conf.rh pnm2ppa-1.04/pnm2ppa.conf +--- pnm2ppa-1.04/pnm2ppa.conf.rh 2000-10-28 16:02:57.000000000 +0100 ++++ pnm2ppa-1.04/pnm2ppa.conf 2008-09-24 15:18:26.000000000 +0100 +@@ -12,7 +12,6 @@ + # will be used. The printer version can also be set with the command line + # option e.g., "-v 720". - # production build --CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG -+CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG - LDFLAGS=-lm - OBJS = pnm2ppa.o ppa.o image.o dither.o cutswath.o hash_ink.o - SRC = pnm3ppa.c ppa.c image.c dither.c cutswath.c hash_ink.c ---- pnm2ppa.conf Tue Dec 12 05:13:59 2000 -+++ foo Tue Dec 12 05:15:57 2000 - +-version ERROR # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!! + #version 720 # 710, 712, 722 also acceptable + #version 820 + #version 1000 diff --git a/pnm2ppa.spec b/pnm2ppa.spec index 2020191..a172726 100644 --- a/pnm2ppa.spec +++ b/pnm2ppa.spec @@ -3,7 +3,7 @@ Summary: Drivers for printing to HP PPA printers Epoch: 1 Obsoletes: ppa Version: 1.04 -Release: 15%{?dist} +Release: 16%{?dist} URL: http://sourceforge.net/projects/pnm2ppa Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz Source1: http://www.httptech.com/ppa/files/ppa-0.8.6.tar.gz @@ -29,7 +29,7 @@ rm -rf $RPM_BUILD_ROOT #pbm2ppa source %setup -T -D -a 1 -n %{topdir} -%patch2 -p0 +%patch2 -p0 -b .20000205 %patch3 -p1 -b .rh %build @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %config /etc/pbm2ppa.conf %changelog +* Wed Sep 24 2008 Tim Waugh 1:1.04-16 +- Removed patch fuzz. + * Wed Feb 13 2008 Tim Waugh 1:1.04-15 - Rebuild for GCC 4.3.