diff --git a/debian/patches/0001-Fix-signedness-of-c.patch b/debian/patches/0001-Fix-signedness-of-c.patch new file mode 100644 index 0000000..f6308b0 --- /dev/null +++ b/debian/patches/0001-Fix-signedness-of-c.patch @@ -0,0 +1,23 @@ +From: Chad Walstrom +Date: Sat, 10 Feb 2018 16:45:11 +0100 +Subject: Fix signedness of "c" + +Bugs-Debian: 177295 +Last-Update: 2003-10-26 +--- + calibrate_ppa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/calibrate_ppa.c b/calibrate_ppa.c +index d2eddb7..59f6231 100644 +--- a/calibrate_ppa.c ++++ b/calibrate_ppa.c +@@ -81,7 +81,7 @@ main (int argc, char *argv[]) + FILE *outFile = NULL ; + int testPattern = 0; + char *out_filepath = NULL; +- char c; ++ int c; + static struct option long_opts[] = { + {"gamma",0,0,'g'}, + {"align",0,0,0}, diff --git a/debian/patches/0002-Make-sure-examples-have-shebangs.patch b/debian/patches/0002-Make-sure-examples-have-shebangs.patch new file mode 100644 index 0000000..a04cbc3 --- /dev/null +++ b/debian/patches/0002-Make-sure-examples-have-shebangs.patch @@ -0,0 +1,38 @@ +From: Chad Walstrom +Date: Sat, 10 Feb 2018 16:45:12 +0100 +Subject: Make sure examples have shebangs + +Last-Update: 2004-11-12 +--- + sample_scripts/lprbw | 1 + + sample_scripts/lprcolor | 1 + + sample_scripts/lpreco | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/sample_scripts/lprbw b/sample_scripts/lprbw +index 17d281a..2311dd2 100755 +--- a/sample_scripts/lprbw ++++ b/sample_scripts/lprbw +@@ -1,3 +1,4 @@ ++#!/bin/sh + cat $1 | \ + gs -sDEVICE=pbmraw -q -sPAPERSIZE=a4 -dNOPAUSE -r600 -sOutputFile=- - | \ + pnm2ppa --bw --eco $2 $3 $4 $5 -i - -o /dev/lp0 +diff --git a/sample_scripts/lprcolor b/sample_scripts/lprcolor +index b745b5b..9ee223f 100755 +--- a/sample_scripts/lprcolor ++++ b/sample_scripts/lprcolor +@@ -1,3 +1,4 @@ ++#!/bin/sh + cat $1 | \ + gs -sDEVICE=ppmraw -q -sPAPERSIZE=a4 -dNOPAUSE -r600 -sOutputFile=- - | \ + pnm2ppa $2 $3 $4 $5 -i - -o /dev/lp0 +diff --git a/sample_scripts/lpreco b/sample_scripts/lpreco +index 450cbe3..7e0674e 100755 +--- a/sample_scripts/lpreco ++++ b/sample_scripts/lpreco +@@ -1,3 +1,4 @@ ++#!/bin/sh + cat $1 | \ + gs -sDEVICE=ppmraw -q -sPAPERSIZE=a4 -dNOPAUSE -r600 -sOutputFile=- - | \ + pnm2ppa --eco $2 $3 $4 $5 -i - -o /dev/lp0 diff --git a/debian/patches/0003-Fix-various-errors-in-the-pnm2ppa-manpage.patch b/debian/patches/0003-Fix-various-errors-in-the-pnm2ppa-manpage.patch new file mode 100644 index 0000000..b302604 --- /dev/null +++ b/debian/patches/0003-Fix-various-errors-in-the-pnm2ppa-manpage.patch @@ -0,0 +1,239 @@ +From: Didier Raboud +Date: Sat, 10 Feb 2018 16:45:13 +0100 +Subject: Fix various errors in the pnm2ppa manpage. + + Amongst those: hyphen-used-as-minus from lintian and the lack of section identifier. +Last-Update: 2011-05-26 +--- + docs/en/pnm2ppa.1 | 98 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 49 insertions(+), 49 deletions(-) + +diff --git a/docs/en/pnm2ppa.1 b/docs/en/pnm2ppa.1 +index 35fd7f1..1f7ded1 100644 +--- a/docs/en/pnm2ppa.1 ++++ b/docs/en/pnm2ppa.1 +@@ -1,8 +1,8 @@ +-.TH pnm2ppa "23 Jun 2002" ++.TH pnm2ppa 1 "23 Jun 2002" + .SH NAME + pnm2ppa - convert portable anymap (PNM) images to HP's PPA printer format. + .SH SYNOPSIS +-pnm2ppa [options] [ -i \fIinfile\fR ] [ -o \fIoutfile\fR ] ++pnm2ppa [options] [ \-i \fIinfile\fR ] [ \-o \fIoutfile\fR ] + + .SH DESCRIPTION + Reads portable anymap (PNM) format as input. Binary PNM formats pnmraw = +@@ -16,111 +16,111 @@ Printing Performance Architecture (PPA) printers (HP DeskJet 710C, 712C, 720C, + GhostScript output devices "pbmraw", "pgmraw" or "ppmraw", or by "pnmraw", + which will choose one of these formats as appropriate for the document.) + \fBpnm2ppa\fP assumes the input resolution is 600dpi (or 300dpi if +-the command-line option \fB--dpi300\fP is used): input at higher/lower ++the command-line option \fB\-\-dpi300\fP is used): input at higher/lower + resolutions will result in a correspondingly larger/smaller printed image, + provided it is within the printer's allowed size range. + .PP + + .SH OPTIONS +-.\"{{{ -b bottommargin ++.\"{{{ \-b bottommargin + .IP "\fB\-b \fIbottommargin\fR\fP" +-Sets the bottom margin \fIbottommargin\fR in units of 1/600 inches (e.g., \fB -b 150\fP corresponds to 0.25"). ++Sets the bottom margin \fIbottommargin\fR in units of 1/600 inches (e.g., \fB \-b 150\fP corresponds to 0.25"). + .\"}}} + +-.\"{{{ -B blackness ++.\"{{{ \-B blackness + .IP "\fB\-B \fIblackness\fR\fP" + Sets the black ink density \fIblackness\fR in drops per pixel (0,1,2,3,4). + .\"}}} + +-.\"{{{ --bi +-.IP "\fB\--bi\fP" ++.\"{{{ \-\-bi ++.IP "\fB\-\-bi\fP" + Force bidirectional print sweeps. + .\"}}} + + .\"{{{ --bw +-.IP "\fB\--bw\fP" ++.IP "\fB\-\-bw\fP" + Disables the color cartridge; will print in grey scale using only the black cartridge. + .\"}}} + +-.\"{{{ -d ++.\"{{{ \-d + .IP "\fB\-d\fP" + Displays the current configuration. + .\"}}} + +-.\"{{{ --dpi300 +-.IP "\fB\--dpi300\fP" ++.\"{{{ \-\-dpi300 ++.IP "\fB\-\-dpi300\fP" + Treat input resolution as 300dpi instead of 600dpi. + .\"}}} + +-.\"{{{ --eco +-.IP "\fB\--eco\fP" ++.\"{{{ \-\-eco ++.IP "\fB\-\-eco\fP" + Econofast mode: lower print quality that is faster and saves ink. + .\"}}} + +-.\"{{{ -f configFile ++.\"{{{ \-f configFile + .IP "\fB\-f \fIconfigFile\fR\fP" + Re-reads configuration from \fIconfigFile\fR (after + initially reading it from /etc/pnm2ppa.conf). + .\"}}} + +-.\"{{{ -F GammaFile ++.\"{{{ \-F GammaFile + .IP "\fB\-F \fIGammaFile\fR\fP" + Overrides reading the color-correction table (Gamma curve) from the default + file /etc/pnm2ppa.gamma, and uses \fIGammaFile\fR instead. + .\"}}} + +-.\"{{{ --fd +-.IP "\fB\--fd\fP" +-Enable fast ordered dithering instead of using the slower, but beautiful, Floyd-Steinberg dithering. (Has no effect in --bw mode.) ++.\"{{{ \-\-fd ++.IP "\fB\-\-fd\fP" ++Enable fast ordered dithering instead of using the slower, but beautiful, Floyd-Steinberg dithering. (Has no effect in \-\-bw mode.) + .\"}}} + +-.\"{{{ -g ++.\"{{{ \-g + .IP "\fB\-g\fP" + Prints a page of color intensity samples (for comparison with gamma.ppm + data produced by calibrate_ppa). + This is part of a \fBcolor-correction\fP procedure; see COLOR.txt for more details. + .\"}}} + +-.\"{{{ -h, --help +-.IP "\fB\-h, --help\fP" ++.\"{{{ \-h, \-\-help ++.IP "\fB\-h, \-\-help\fP" + Displays program usage. + .\"}}} + +-.\"{{{ -i infile ++.\"{{{ \-i infile + .IP "\fB\-i \fIinfile\fR\fP" +-Input file \fIinfile\fR is either a path to a PPM file, or '-' to indicate stdin (defaults to stdin). ++Input file \fIinfile\fR is either a path to a PPM file, or '\-' to indicate stdin (defaults to stdin). + .\"}}} + +-.\"{{{ -l leftmargin ++.\"{{{ \-l leftmargin + .IP "\fB\-l \fIleftmargin\fR\fP" +-Sets the left margin \fIleftmargin\fR in units of 1/600 inches (e.g., \fB-l 150\fP corresponds to 0.25"). ++Sets the left margin \fIleftmargin\fR in units of 1/600 inches (e.g., \fB\-l 150\fP corresponds to 0.25"). + .\"}}} + +-.\"{{{ --noGamma +-.IP "\fB\--noGamma\fP" ++.\"{{{ \-\-noGamma ++.IP "\fB\-\-noGamma\fP" + Switches off any color-correction. + .\"}}} + +-.\"{{{ -o outfile | - +-.IP "\fB\-o \fIoutfile\fR | - \fP" +-Output file \fIoutfile\fR is either a path to a file or device, or '-' to indicate stdout (defaults to stdout). ++.\"{{{ \-o outfile | \- ++.IP "\fB\-o \fIoutfile\fR | \- \fP" ++Output file \fIoutfile\fR is either a path to a file or device, or '\-' to indicate stdout (defaults to stdout). + .\"}}} + +-.\"{{{ -p ++.\"{{{ \-p + .IP "\fB\-p\fP" + Disables the black ink cartridge; i.e., print using only the color ink cartridge, even for printing "black". This might be useful for printing high-quality + color images. + .\"}}} + +-.\"{{{ -r rightmargin ++.\"{{{ \-r rightmargin + .IP "\fB\-r \fIrightmargin\fR\fP" +-Sets the right margin \fIrightmargin\fR in units of 1/600 inches (e.g., \fB-r 150\fP corresponds to 0.25"). ++Sets the right margin \fIrightmargin\fR in units of 1/600 inches (e.g., \fB\-r 150\fP corresponds to 0.25"). + .\"}}} + +-.\"{{{ -s papersize ++.\"{{{ \-s papersize + .IP "\fB\-s \fIpapersize\fR\fP" + Sets the default paper size (now used only for color-correction output +-produced by the \fB-g\fP option). ++produced by the \fB\-g\fP option). + In normal use, pnm2ppa now instead reads the paper dimensions from + pnm input file headers, and + checks that it is a valid papersize for the given printer model. +@@ -130,40 +130,40 @@ Possible values for \fIpapersize\fR are \fBa4\fP (A4), + The default is US Letter. + .\"}}} + +-.\"{{{ -t topmargin ++.\"{{{ \-t topmargin + .IP "\fB\-t \fItopmargin\fR\fP" +-Sets the top margin \fItopmargin\fR in units of 1/600 inches (ie \fB-t 150\fP corresponds to 0.25"). ++Sets the top margin \fItopmargin\fR in units of 1/600 inches (ie \fB\-t 150\fP corresponds to 0.25"). + .\"}}} + +-.\"{{{ --uni +-.IP "\fB\--uni\fP" ++.\"{{{ \-\-uni ++.IP "\fB\-\-uni\fP" + Force unidirectional (left to right) print sweeps. Useful if + "shearing" is a problem for high quality color images. + .\"}}} + +-.\"{{{ -v printertype ++.\"{{{ \-v printertype + .IP "\fB\-v \fIprintertype\fP" + Selects the printer model. Possible values of \fIprintertype\fR are: + \fB710\fP, \fB712\fP, \fB720\fP, \fB722\fP, \fB820\fP and \fB1000\fP. + The default is the HP DeskJet 7X0 Series (710, 712, 720, 722). + .\"}}} + +-.\"{{{ --verbose +-.IP "\fB\--verbose\fP" ++.\"{{{ \-\-verbose ++.IP "\fB\-\-verbose\fP" + Displays the program's System Log messages on the standard output, as well. + .\"}}} + +-.\"{{{ --version +-.IP "\fB\--version\fP" ++.\"{{{ \-\-version ++.IP "\fB\-\-version\fP" + Displays the program's version information. + .\"}}} + +-.\"{{{ -x xoffset ++.\"{{{ \-x xoffset + .IP "\fB\-x \fIxoffset\fR\fP" + Sets the x-offset \fIxoffset\fR from the left of the page. Units are 1/600 inches. + .\"}}} + +-.\"{{{ -y yoffset ++.\"{{{ \-y yoffset + .IP "\fB\-y \fIyoffset\fR\fP" + Sets the y-offset \fIyoffset\fR from the top of the page. Units are 1/600 inches. + .\"}}} +@@ -172,7 +172,7 @@ Sets the y-offset \fIyoffset\fR from the top of the page. Units are 1/600 inches + .SH NOTES + The default configuration file \fI/etc/pnm2ppa.conf\fR is read in first. Command line arguments then modify the resulting definitions. + .PP +-The \fB-v\fP option resets all definitions (margins, offsets, etc.) back to ++The \fB\-v\fP option resets all definitions (margins, offsets, etc.) back to + the inbuilt defaults for that printer and should be used before subsequent + \fB-b\fP, \fB-l\fP, \fB-r\fP, \fB-t\fP, \fB-x\fP and \fB-y\fP arguments. + .SH "SEE ALSO" +@@ -212,5 +212,5 @@ http://sourceforge.net/projects/pnm2ppa. + .SH BUGS + Faint horizontal lines marking boundaries between print sweeps may be visible. + You may get better results when printing images, with the options: +- \fB -p --uni \fP (this may no longer apply since recent code improvements). ++ \fB \-p \-\-uni \fP (this may no longer apply since recent code improvements). + diff --git a/debian/patches/0004-Drop-usage-of-__DATE__-and-__TIME__-hindering-build.patch b/debian/patches/0004-Drop-usage-of-__DATE__-and-__TIME__-hindering-build.patch new file mode 100644 index 0000000..a479a46 --- /dev/null +++ b/debian/patches/0004-Drop-usage-of-__DATE__-and-__TIME__-hindering-build.patch @@ -0,0 +1,26 @@ +From: Didier Raboud +Date: Sat, 10 Feb 2018 16:45:14 +0100 +Subject: Drop usage of __DATE__ and __TIME__, hindering build + + reproducibility. +Last-Update: 2016-02-26 +--- + pnm2ppa.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pnm2ppa.c b/pnm2ppa.c +index 1790927..9fd88ec 100644 +--- a/pnm2ppa.c ++++ b/pnm2ppa.c +@@ -732,9 +732,9 @@ main (int argc, char *argv[]) + + case 2: + /* --version (output to stderr, not syslog) */ +- fprintf(stderr,"%s %s %s %s %s\n", ++ fprintf(stderr,"%s %s %s\n", + *argv, gMessages[LOG_VERSION], +- VERSION, __DATE__, __TIME__); ++ VERSION); + exit (0); + break; + diff --git a/debian/patches/0005-Declare-syslog_message-correctly-for-GCC-10-FTBFS.patch b/debian/patches/0005-Declare-syslog_message-correctly-for-GCC-10-FTBFS.patch new file mode 100644 index 0000000..36a623e --- /dev/null +++ b/debian/patches/0005-Declare-syslog_message-correctly-for-GCC-10-FTBFS.patch @@ -0,0 +1,35 @@ +From: Zdenek Dohnal +Date: Fri, 24 Jul 2020 10:42:18 +0200 +Subject: Declare syslog_message correctly for GCC-10 FTBFS + +--- + ppa_syslog.h | 2 +- + syslog.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ppa_syslog.h b/ppa_syslog.h +index a0fcb21..29de142 100644 +--- a/ppa_syslog.h ++++ b/ppa_syslog.h +@@ -39,7 +39,7 @@ + #include + #endif + +-char syslog_message[128]; ++extern char syslog_message[128]; + extern size_t message_size ; + + void wrap_syslog( int, char *, char *); +diff --git a/syslog.c b/syslog.c +index 9b11c55..dccab91 100644 +--- a/syslog.c ++++ b/syslog.c +@@ -31,6 +31,8 @@ + #include "ppa_syslog.h" + #include "global.h" + ++char syslog_message[128]; ++ + BOOLEAN verbose = false ; + + /* diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ec7c66d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +0001-Fix-signedness-of-c.patch +0002-Make-sure-examples-have-shebangs.patch +0003-Fix-various-errors-in-the-pnm2ppa-manpage.patch +0004-Drop-usage-of-__DATE__-and-__TIME__-hindering-build.patch +0005-Declare-syslog_message-correctly-for-GCC-10-FTBFS.patch