Codebase list pnm2ppa / d5487bc
Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] Didier Raboud 3 years ago
6 changed file(s) with 366 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
+23
-0
debian/patches/0001-Fix-signedness-of-c.patch less more
0 From: Chad Walstrom <chewie@debian.org>
1 Date: Sat, 10 Feb 2018 16:45:11 +0100
2 Subject: Fix signedness of "c"
3
4 Bugs-Debian: 177295
5 Last-Update: 2003-10-26
6 ---
7 calibrate_ppa.c | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10 diff --git a/calibrate_ppa.c b/calibrate_ppa.c
11 index d2eddb7..59f6231 100644
12 --- a/calibrate_ppa.c
13 +++ b/calibrate_ppa.c
14 @@ -81,7 +81,7 @@ main (int argc, char *argv[])
15 FILE *outFile = NULL ;
16 int testPattern = 0;
17 char *out_filepath = NULL;
18 - char c;
19 + int c;
20 static struct option long_opts[] = {
21 {"gamma",0,0,'g'},
22 {"align",0,0,0},
+38
-0
debian/patches/0002-Make-sure-examples-have-shebangs.patch less more
0 From: Chad Walstrom <chewie@debian.org>
1 Date: Sat, 10 Feb 2018 16:45:12 +0100
2 Subject: Make sure examples have shebangs
3
4 Last-Update: 2004-11-12
5 ---
6 sample_scripts/lprbw | 1 +
7 sample_scripts/lprcolor | 1 +
8 sample_scripts/lpreco | 1 +
9 3 files changed, 3 insertions(+)
10
11 diff --git a/sample_scripts/lprbw b/sample_scripts/lprbw
12 index 17d281a..2311dd2 100755
13 --- a/sample_scripts/lprbw
14 +++ b/sample_scripts/lprbw
15 @@ -1,3 +1,4 @@
16 +#!/bin/sh
17 cat $1 | \
18 gs -sDEVICE=pbmraw -q -sPAPERSIZE=a4 -dNOPAUSE -r600 -sOutputFile=- - | \
19 pnm2ppa --bw --eco $2 $3 $4 $5 -i - -o /dev/lp0
20 diff --git a/sample_scripts/lprcolor b/sample_scripts/lprcolor
21 index b745b5b..9ee223f 100755
22 --- a/sample_scripts/lprcolor
23 +++ b/sample_scripts/lprcolor
24 @@ -1,3 +1,4 @@
25 +#!/bin/sh
26 cat $1 | \
27 gs -sDEVICE=ppmraw -q -sPAPERSIZE=a4 -dNOPAUSE -r600 -sOutputFile=- - | \
28 pnm2ppa $2 $3 $4 $5 -i - -o /dev/lp0
29 diff --git a/sample_scripts/lpreco b/sample_scripts/lpreco
30 index 450cbe3..7e0674e 100755
31 --- a/sample_scripts/lpreco
32 +++ b/sample_scripts/lpreco
33 @@ -1,3 +1,4 @@
34 +#!/bin/sh
35 cat $1 | \
36 gs -sDEVICE=ppmraw -q -sPAPERSIZE=a4 -dNOPAUSE -r600 -sOutputFile=- - | \
37 pnm2ppa --eco $2 $3 $4 $5 -i - -o /dev/lp0
+239
-0
debian/patches/0003-Fix-various-errors-in-the-pnm2ppa-manpage.patch less more
0 From: Didier Raboud <odyx@debian.org>
1 Date: Sat, 10 Feb 2018 16:45:13 +0100
2 Subject: Fix various errors in the pnm2ppa manpage.
3
4 Amongst those: hyphen-used-as-minus from lintian and the lack of section identifier.
5 Last-Update: 2011-05-26
6 ---
7 docs/en/pnm2ppa.1 | 98 +++++++++++++++++++++++++++----------------------------
8 1 file changed, 49 insertions(+), 49 deletions(-)
9
10 diff --git a/docs/en/pnm2ppa.1 b/docs/en/pnm2ppa.1
11 index 35fd7f1..1f7ded1 100644
12 --- a/docs/en/pnm2ppa.1
13 +++ b/docs/en/pnm2ppa.1
14 @@ -1,8 +1,8 @@
15 -.TH pnm2ppa "23 Jun 2002"
16 +.TH pnm2ppa 1 "23 Jun 2002"
17 .SH NAME
18 pnm2ppa - convert portable anymap (PNM) images to HP's PPA printer format.
19 .SH SYNOPSIS
20 -pnm2ppa [options] [ -i \fIinfile\fR ] [ -o \fIoutfile\fR ]
21 +pnm2ppa [options] [ \-i \fIinfile\fR ] [ \-o \fIoutfile\fR ]
22
23 .SH DESCRIPTION
24 Reads portable anymap (PNM) format as input. Binary PNM formats pnmraw =
25 @@ -16,111 +16,111 @@ Printing Performance Architecture (PPA) printers (HP DeskJet 710C, 712C, 720C,
26 GhostScript output devices "pbmraw", "pgmraw" or "ppmraw", or by "pnmraw",
27 which will choose one of these formats as appropriate for the document.)
28 \fBpnm2ppa\fP assumes the input resolution is 600dpi (or 300dpi if
29 -the command-line option \fB--dpi300\fP is used): input at higher/lower
30 +the command-line option \fB\-\-dpi300\fP is used): input at higher/lower
31 resolutions will result in a correspondingly larger/smaller printed image,
32 provided it is within the printer's allowed size range.
33 .PP
34
35 .SH OPTIONS
36 -.\"{{{ -b bottommargin
37 +.\"{{{ \-b bottommargin
38 .IP "\fB\-b \fIbottommargin\fR\fP"
39 -Sets the bottom margin \fIbottommargin\fR in units of 1/600 inches (e.g., \fB -b 150\fP corresponds to 0.25").
40 +Sets the bottom margin \fIbottommargin\fR in units of 1/600 inches (e.g., \fB \-b 150\fP corresponds to 0.25").
41 .\"}}}
42
43 -.\"{{{ -B blackness
44 +.\"{{{ \-B blackness
45 .IP "\fB\-B \fIblackness\fR\fP"
46 Sets the black ink density \fIblackness\fR in drops per pixel (0,1,2,3,4).
47 .\"}}}
48
49 -.\"{{{ --bi
50 -.IP "\fB\--bi\fP"
51 +.\"{{{ \-\-bi
52 +.IP "\fB\-\-bi\fP"
53 Force bidirectional print sweeps.
54 .\"}}}
55
56 .\"{{{ --bw
57 -.IP "\fB\--bw\fP"
58 +.IP "\fB\-\-bw\fP"
59 Disables the color cartridge; will print in grey scale using only the black cartridge.
60 .\"}}}
61
62 -.\"{{{ -d
63 +.\"{{{ \-d
64 .IP "\fB\-d\fP"
65 Displays the current configuration.
66 .\"}}}
67
68 -.\"{{{ --dpi300
69 -.IP "\fB\--dpi300\fP"
70 +.\"{{{ \-\-dpi300
71 +.IP "\fB\-\-dpi300\fP"
72 Treat input resolution as 300dpi instead of 600dpi.
73 .\"}}}
74
75 -.\"{{{ --eco
76 -.IP "\fB\--eco\fP"
77 +.\"{{{ \-\-eco
78 +.IP "\fB\-\-eco\fP"
79 Econofast mode: lower print quality that is faster and saves ink.
80 .\"}}}
81
82 -.\"{{{ -f configFile
83 +.\"{{{ \-f configFile
84 .IP "\fB\-f \fIconfigFile\fR\fP"
85 Re-reads configuration from \fIconfigFile\fR (after
86 initially reading it from /etc/pnm2ppa.conf).
87 .\"}}}
88
89 -.\"{{{ -F GammaFile
90 +.\"{{{ \-F GammaFile
91 .IP "\fB\-F \fIGammaFile\fR\fP"
92 Overrides reading the color-correction table (Gamma curve) from the default
93 file /etc/pnm2ppa.gamma, and uses \fIGammaFile\fR instead.
94 .\"}}}
95
96 -.\"{{{ --fd
97 -.IP "\fB\--fd\fP"
98 -Enable fast ordered dithering instead of using the slower, but beautiful, Floyd-Steinberg dithering. (Has no effect in --bw mode.)
99 +.\"{{{ \-\-fd
100 +.IP "\fB\-\-fd\fP"
101 +Enable fast ordered dithering instead of using the slower, but beautiful, Floyd-Steinberg dithering. (Has no effect in \-\-bw mode.)
102 .\"}}}
103
104 -.\"{{{ -g
105 +.\"{{{ \-g
106 .IP "\fB\-g\fP"
107 Prints a page of color intensity samples (for comparison with gamma.ppm
108 data produced by calibrate_ppa).
109 This is part of a \fBcolor-correction\fP procedure; see COLOR.txt for more details.
110 .\"}}}
111
112 -.\"{{{ -h, --help
113 -.IP "\fB\-h, --help\fP"
114 +.\"{{{ \-h, \-\-help
115 +.IP "\fB\-h, \-\-help\fP"
116 Displays program usage.
117 .\"}}}
118
119 -.\"{{{ -i infile
120 +.\"{{{ \-i infile
121 .IP "\fB\-i \fIinfile\fR\fP"
122 -Input file \fIinfile\fR is either a path to a PPM file, or '-' to indicate stdin (defaults to stdin).
123 +Input file \fIinfile\fR is either a path to a PPM file, or '\-' to indicate stdin (defaults to stdin).
124 .\"}}}
125
126 -.\"{{{ -l leftmargin
127 +.\"{{{ \-l leftmargin
128 .IP "\fB\-l \fIleftmargin\fR\fP"
129 -Sets the left margin \fIleftmargin\fR in units of 1/600 inches (e.g., \fB-l 150\fP corresponds to 0.25").
130 +Sets the left margin \fIleftmargin\fR in units of 1/600 inches (e.g., \fB\-l 150\fP corresponds to 0.25").
131 .\"}}}
132
133 -.\"{{{ --noGamma
134 -.IP "\fB\--noGamma\fP"
135 +.\"{{{ \-\-noGamma
136 +.IP "\fB\-\-noGamma\fP"
137 Switches off any color-correction.
138 .\"}}}
139
140 -.\"{{{ -o outfile | -
141 -.IP "\fB\-o \fIoutfile\fR | - \fP"
142 -Output file \fIoutfile\fR is either a path to a file or device, or '-' to indicate stdout (defaults to stdout).
143 +.\"{{{ \-o outfile | \-
144 +.IP "\fB\-o \fIoutfile\fR | \- \fP"
145 +Output file \fIoutfile\fR is either a path to a file or device, or '\-' to indicate stdout (defaults to stdout).
146 .\"}}}
147
148 -.\"{{{ -p
149 +.\"{{{ \-p
150 .IP "\fB\-p\fP"
151 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
152 color images.
153 .\"}}}
154
155 -.\"{{{ -r rightmargin
156 +.\"{{{ \-r rightmargin
157 .IP "\fB\-r \fIrightmargin\fR\fP"
158 -Sets the right margin \fIrightmargin\fR in units of 1/600 inches (e.g., \fB-r 150\fP corresponds to 0.25").
159 +Sets the right margin \fIrightmargin\fR in units of 1/600 inches (e.g., \fB\-r 150\fP corresponds to 0.25").
160 .\"}}}
161
162 -.\"{{{ -s papersize
163 +.\"{{{ \-s papersize
164 .IP "\fB\-s \fIpapersize\fR\fP"
165 Sets the default paper size (now used only for color-correction output
166 -produced by the \fB-g\fP option).
167 +produced by the \fB\-g\fP option).
168 In normal use, pnm2ppa now instead reads the paper dimensions from
169 pnm input file headers, and
170 checks that it is a valid papersize for the given printer model.
171 @@ -130,40 +130,40 @@ Possible values for \fIpapersize\fR are \fBa4\fP (A4),
172 The default is US Letter.
173 .\"}}}
174
175 -.\"{{{ -t topmargin
176 +.\"{{{ \-t topmargin
177 .IP "\fB\-t \fItopmargin\fR\fP"
178 -Sets the top margin \fItopmargin\fR in units of 1/600 inches (ie \fB-t 150\fP corresponds to 0.25").
179 +Sets the top margin \fItopmargin\fR in units of 1/600 inches (ie \fB\-t 150\fP corresponds to 0.25").
180 .\"}}}
181
182 -.\"{{{ --uni
183 -.IP "\fB\--uni\fP"
184 +.\"{{{ \-\-uni
185 +.IP "\fB\-\-uni\fP"
186 Force unidirectional (left to right) print sweeps. Useful if
187 "shearing" is a problem for high quality color images.
188 .\"}}}
189
190 -.\"{{{ -v printertype
191 +.\"{{{ \-v printertype
192 .IP "\fB\-v \fIprintertype\fP"
193 Selects the printer model. Possible values of \fIprintertype\fR are:
194 \fB710\fP, \fB712\fP, \fB720\fP, \fB722\fP, \fB820\fP and \fB1000\fP.
195 The default is the HP DeskJet 7X0 Series (710, 712, 720, 722).
196 .\"}}}
197
198 -.\"{{{ --verbose
199 -.IP "\fB\--verbose\fP"
200 +.\"{{{ \-\-verbose
201 +.IP "\fB\-\-verbose\fP"
202 Displays the program's System Log messages on the standard output, as well.
203 .\"}}}
204
205 -.\"{{{ --version
206 -.IP "\fB\--version\fP"
207 +.\"{{{ \-\-version
208 +.IP "\fB\-\-version\fP"
209 Displays the program's version information.
210 .\"}}}
211
212 -.\"{{{ -x xoffset
213 +.\"{{{ \-x xoffset
214 .IP "\fB\-x \fIxoffset\fR\fP"
215 Sets the x-offset \fIxoffset\fR from the left of the page. Units are 1/600 inches.
216 .\"}}}
217
218 -.\"{{{ -y yoffset
219 +.\"{{{ \-y yoffset
220 .IP "\fB\-y \fIyoffset\fR\fP"
221 Sets the y-offset \fIyoffset\fR from the top of the page. Units are 1/600 inches.
222 .\"}}}
223 @@ -172,7 +172,7 @@ Sets the y-offset \fIyoffset\fR from the top of the page. Units are 1/600 inches
224 .SH NOTES
225 The default configuration file \fI/etc/pnm2ppa.conf\fR is read in first. Command line arguments then modify the resulting definitions.
226 .PP
227 -The \fB-v\fP option resets all definitions (margins, offsets, etc.) back to
228 +The \fB\-v\fP option resets all definitions (margins, offsets, etc.) back to
229 the inbuilt defaults for that printer and should be used before subsequent
230 \fB-b\fP, \fB-l\fP, \fB-r\fP, \fB-t\fP, \fB-x\fP and \fB-y\fP arguments.
231 .SH "SEE ALSO"
232 @@ -212,5 +212,5 @@ http://sourceforge.net/projects/pnm2ppa.
233 .SH BUGS
234 Faint horizontal lines marking boundaries between print sweeps may be visible.
235 You may get better results when printing images, with the options:
236 - \fB -p --uni \fP (this may no longer apply since recent code improvements).
237 + \fB \-p \-\-uni \fP (this may no longer apply since recent code improvements).
238
+26
-0
debian/patches/0004-Drop-usage-of-__DATE__-and-__TIME__-hindering-build.patch less more
0 From: Didier Raboud <odyx@debian.org>
1 Date: Sat, 10 Feb 2018 16:45:14 +0100
2 Subject: Drop usage of __DATE__ and __TIME__, hindering build
3
4 reproducibility.
5 Last-Update: 2016-02-26
6 ---
7 pnm2ppa.c | 4 ++--
8 1 file changed, 2 insertions(+), 2 deletions(-)
9
10 diff --git a/pnm2ppa.c b/pnm2ppa.c
11 index 1790927..9fd88ec 100644
12 --- a/pnm2ppa.c
13 +++ b/pnm2ppa.c
14 @@ -732,9 +732,9 @@ main (int argc, char *argv[])
15
16 case 2:
17 /* --version (output to stderr, not syslog) */
18 - fprintf(stderr,"%s %s %s %s %s\n",
19 + fprintf(stderr,"%s %s %s\n",
20 *argv, gMessages[LOG_VERSION],
21 - VERSION, __DATE__, __TIME__);
22 + VERSION);
23 exit (0);
24 break;
25
+35
-0
debian/patches/0005-Declare-syslog_message-correctly-for-GCC-10-FTBFS.patch less more
0 From: Zdenek Dohnal <zdohnal@redhat.com>
1 Date: Fri, 24 Jul 2020 10:42:18 +0200
2 Subject: Declare syslog_message correctly for GCC-10 FTBFS
3
4 ---
5 ppa_syslog.h | 2 +-
6 syslog.c | 2 ++
7 2 files changed, 3 insertions(+), 1 deletion(-)
8
9 diff --git a/ppa_syslog.h b/ppa_syslog.h
10 index a0fcb21..29de142 100644
11 --- a/ppa_syslog.h
12 +++ b/ppa_syslog.h
13 @@ -39,7 +39,7 @@
14 #include <syslog.h>
15 #endif
16
17 -char syslog_message[128];
18 +extern char syslog_message[128];
19 extern size_t message_size ;
20
21 void wrap_syslog( int, char *, char *);
22 diff --git a/syslog.c b/syslog.c
23 index 9b11c55..dccab91 100644
24 --- a/syslog.c
25 +++ b/syslog.c
26 @@ -31,6 +31,8 @@
27 #include "ppa_syslog.h"
28 #include "global.h"
29
30 +char syslog_message[128];
31 +
32 BOOLEAN verbose = false ;
33
34 /*
+5
-0
debian/patches/series less more
0 0001-Fix-signedness-of-c.patch
1 0002-Make-sure-examples-have-shebangs.patch
2 0003-Fix-various-errors-in-the-pnm2ppa-manpage.patch
3 0004-Drop-usage-of-__DATE__-and-__TIME__-hindering-build.patch
4 0005-Declare-syslog_message-correctly-for-GCC-10-FTBFS.patch