--- pnm2ppa-1.10/docs/en/INSTALL.orig Tue Jul 9 06:23:19 2002 +++ pnm2ppa-1.10/docs/en/INSTALL Mon Jul 22 16:42:55 2002 @@ -63,8 +63,8 @@ make install -to install the binaries (by default, in /usr/local/bin/) , -the manpage (in /usr/local/man/man1), and the sample +to install the binaries (by default, in /usr/bin/) , +the manpage (in /usr/share/man/man1), and the sample configuration file (/etc/pnm2ppa.conf). You may change these locations by editing the Makefile. @@ -94,7 +94,7 @@ not really needed.) -If this script is placed in /usr/local/bin/ppaprint , +If this script is placed in /usr/bin/ppaprint , ppaprint file.ps diff -urN pnm2ppa.orig/docs/en/INSTALL.SUSE pnm2ppa/docs/en/INSTALL.SUSE --- pnm2ppa.orig/docs/en/INSTALL.SUSE Fri Oct 27 12:29:12 2000 +++ pnm2ppa/docs/en/INSTALL.SUSE Wed Apr 17 01:31:54 2002 @@ -5,8 +5,8 @@ Follow the standard installation instructions in INSTALL and CALIBRATION. -The driver pnm2ppa is installed to /usr/local/bin. The manual page -pnm2ppa.1 is installed in /usr/local/man/man1. +The driver pnm2ppa is installed to /usr/bin. The manual page +pnm2ppa.1 is installed in /usr/share/man/man1. 2. To integrate pnm2ppa into the BSD print spooler of the Linux system we create printer spoolers in /etc/printcap, to print diff -urN pnm2ppa.orig/lpd/README.lpd pnm2ppa/lpd/README.lpd --- pnm2ppa.orig/lpd/README.lpd Sat Oct 28 07:58:07 2000 +++ pnm2ppa/lpd/README.lpd Wed Apr 17 01:31:54 2002 @@ -22,7 +22,7 @@ ./lpdsetup a4 ./lpdsetup a3 -This installs the filters in /usr/local/bin and creates the corresponding +This installs the filters in /usr/bin and creates the corresponding spool directories /var/spool/lpd/color, etc, You must be root to do this. You may wish to edit the options specified in the filter files diff -urN pnm2ppa.orig/lpd/ascii.if pnm2ppa/lpd/ascii.if --- pnm2ppa.orig/lpd/ascii.if Sat Oct 28 07:58:07 2000 +++ pnm2ppa/lpd/ascii.if Wed Apr 17 01:31:54 2002 @@ -1,7 +1,7 @@ #! /bin/sh # for printing black and white text (ascii) files. -FILTER="/usr/local/bin/bw.if" -#FILTER="/usr/local/bin/bweco.if" +FILTER="/usr/bin/bw.if" +#FILTER="/usr/bin/bweco.if" #------enscript command line-------------------------- enscript -2rj -p- | $FILTER diff -urN pnm2ppa.orig/lpd/bw.if pnm2ppa/lpd/bw.if --- pnm2ppa.orig/lpd/bw.if Sat Oct 28 07:58:07 2000 +++ pnm2ppa/lpd/bw.if Wed Apr 17 01:31:54 2002 @@ -6,7 +6,7 @@ #PAPER=a4 #PAPER=a3 #PPAOPTS="-B 2" -PNM2PPA="/usr/local/bin/pnm2ppa" +PNM2PPA="/usr/bin/pnm2ppa" #------------------dont change below this line---------------------- gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ $PNM2PPA --bw $PPAOPTS -i - -o - diff -urN pnm2ppa.orig/lpd/bweco.if pnm2ppa/lpd/bweco.if --- pnm2ppa.orig/lpd/bweco.if Sat Oct 28 07:58:07 2000 +++ pnm2ppa/lpd/bweco.if Wed Apr 17 01:31:54 2002 @@ -6,7 +6,7 @@ #PAPER=a4 #PAPER=a3 #PPAOPTS="-B 2" -PNM2PPA="/usr/local/bin/pnm2ppa" +PNM2PPA="/usr/bin/pnm2ppa" #------------------dont change below this line---------------------- gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ $PNM2PPA --bw --eco $PPAOPTS -i - -o - diff -urN pnm2ppa.orig/lpd/color.if pnm2ppa/lpd/color.if --- pnm2ppa.orig/lpd/color.if Sat Oct 28 07:58:07 2000 +++ pnm2ppa/lpd/color.if Wed Apr 17 01:31:54 2002 @@ -6,7 +6,7 @@ #PAPER=a4 #PAPER=a3 #PPAOPTS="-p" -PNM2PPA="/usr/local/bin/pnm2ppa" +PNM2PPA="/usr/bin/pnm2ppa" #------------------dont change below this line---------------------- gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ $PNM2PPA $PPAOPTS -i - -o - diff -urN pnm2ppa.orig/lpd/coloreco.if pnm2ppa/lpd/coloreco.if --- pnm2ppa.orig/lpd/coloreco.if Sat Oct 28 07:58:07 2000 +++ pnm2ppa/lpd/coloreco.if Wed Apr 17 01:31:54 2002 @@ -6,7 +6,7 @@ #PAPER=a4 #PAPER=a3 #PPAOPTS="--fd" -PNM2PPA="/usr/local/bin/pnm2ppa" +PNM2PPA="/usr/bin/pnm2ppa" #------------------dont change below this line---------------------- gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \ $PNM2PPA --eco $PPAOPTS -i - -o - diff -urN pnm2ppa.orig/lpd/lpdsetup pnm2ppa/lpd/lpdsetup --- pnm2ppa.orig/lpd/lpdsetup Fri Oct 27 12:29:12 2000 +++ pnm2ppa/lpd/lpdsetup Wed Apr 17 01:31:54 2002 @@ -1,5 +1,5 @@ #!/bin/sh -INSTALLDIR="/usr/local/bin" +INSTALLDIR="/usr/bin" SPOOLDIR="/var/spool/lpd" PAPER=letter for paper in letter legal a3 a4 ; do diff -urN pnm2ppa.orig/lpd/printcap pnm2ppa/lpd/printcap --- pnm2ppa.orig/lpd/printcap Fri Oct 27 11:12:23 2000 +++ pnm2ppa/lpd/printcap Wed Apr 17 01:31:54 2002 @@ -6,7 +6,7 @@ :sd=/var/spool/lpd/coloreco:\ :lf=/var/spool/lpd/coloreco/log:\ :af=/var/spool/lpd/coloreco/acct:\ - :if=/usr/local/bin/coloreco.if:\ + :if=/usr/bin/coloreco.if:\ :la:mx#0:\ :sh:sf: @@ -16,7 +16,7 @@ :sd=/var/spool/lpd/color:\ :lf=/var/spool/lpd/color/log:\ :af=/var/spool/lpd/color/acct:\ - :if=/usr/local/bin/color.if:\ + :if=/usr/bin/color.if:\ :la:mx#0:\ :sh:sf: @@ -26,7 +26,7 @@ :sd=/var/spool/lpd/bw:\ :lf=/var/spool/lpd/bw/log:\ :af=/var/spool/lpd/bw/acct:\ - :if=/usr/local/bin/bw.if:\ + :if=/usr/bin/bw.if:\ :la:mx#0:\ :sh:sf: @@ -36,7 +36,7 @@ :sd=/var/spool/lpd/bweco:\ :lf=/var/spool/lpd/bweco/log:\ :af=/var/spool/lpd/bweco/acct:\ - :if=/usr/local/bin/bweco.if:\ + :if=/usr/bin/bweco.if:\ :la:mx#0:\ :sh:sf: @@ -46,7 +46,7 @@ :sd=/var/spool/lpd/ascii:\ :lf=/var/spool/lpd/ascii/log:\ :af=/var/spool/lpd/ascii/acct:\ - :if=/usr/local/bin/ascii.if:\ + :if=/usr/bin/ascii.if:\ :la:mx#0:\ :sh:sf: diff -urN pnm2ppa.orig/pnm2ppa.c pnm2ppa/pnm2ppa.c --- pnm2ppa.orig/pnm2ppa.c Sat Nov 11 11:53:03 2000 +++ pnm2ppa/pnm2ppa.c Wed Apr 17 01:32:35 2002 @@ -17,6 +17,7 @@ #include #include +#define _GNU_SOURCE #include #include #include --- pnm2ppa-1.10/pnm2ppa.conf.orig Mon Jul 22 16:17:59 2002 +++ pnm2ppa-1.10/pnm2ppa.conf Mon Jul 22 16:18:14 2002 @@ -12,7 +12,6 @@ # will be used. The printer version can also be set with the command line # option e.g., "-v 720". -version ERROR # PNM2PPA WILL *NOT* WORK UNTIL THIS ENTRY IS REMOVED!!!! #version 720 # 710, 712, 722 also acceptable #version 820 #version 1000