Skip to content

Commit b297582

Browse files
OdyXOdyX
committed
Run wrap-and-sort -baskt
1 parent 65c255a commit b297582

6 files changed

Lines changed: 90 additions & 75 deletions

File tree

‎debian/control‎

Lines changed: 55 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
11
Source: foo2zjs
22
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
3-
Uploaders: Didier Raboud <odyx@debian.org>
3+
Uploaders:
4+
Didier Raboud <odyx@debian.org>,
45
Section: text
56
Priority: optional
6-
Build-Depends: debhelper-compat (= 12),
7-
ghostscript,
8-
cups-filters | foomatic-filters,
9-
foomatic-db-engine,
10-
libcups2-dev,
11-
liblcms2-utils,
12-
dc,
13-
time,
14-
pyppd (>= 1.0.2-1~),
15-
libjbig-dev
7+
Build-Depends:
8+
cups-filters | foomatic-filters,
9+
dc,
10+
debhelper-compat (= 12),
11+
foomatic-db-engine,
12+
ghostscript,
13+
libcups2-dev,
14+
libjbig-dev,
15+
liblcms2-utils,
16+
pyppd (>= 1.0.2-1~),
17+
time,
1618
Standards-Version: 4.5.0
1719
Vcs-Browser: https://salsa.debian.org/printing-team/foo2zjs
1820
Vcs-Git: https://salsa.debian.org/printing-team/foo2zjs.git
1921
Homepage: http://foo2zjs.rkkda.com/
2022

2123
Package: printer-driver-foo2zjs
2224
Architecture: any
23-
Depends: ${shlibs:Depends},
24-
${misc:Depends},
25-
${ubuntu:mscompress},
26-
cups-filters | foomatic-filters,
27-
dc,
28-
printer-driver-foo2zjs-common (>= ${source:Version}),
29-
liblcms2-utils
30-
Recommends: wget,
31-
unzip,
32-
${debian:mscompress},
33-
cups,
34-
cups-client
35-
Suggests: psutils,
36-
hannah-foo2zjs
37-
Breaks: udev (<< 136-1),
38-
cups (<< 1.5.0-3~),
39-
foo2zjs (<< 20111023dfsg0-1~)
40-
Replaces: foo2zjs (<< 20111023dfsg0-1~)
25+
Depends:
26+
cups-filters | foomatic-filters,
27+
dc,
28+
liblcms2-utils,
29+
printer-driver-foo2zjs-common (>= ${source:Version}),
30+
${misc:Depends},
31+
${shlibs:Depends},
32+
${ubuntu:mscompress},
33+
Recommends:
34+
cups,
35+
cups-client,
36+
unzip,
37+
wget,
38+
${debian:mscompress},
39+
Suggests:
40+
hannah-foo2zjs,
41+
psutils,
42+
Breaks:
43+
cups (<< 1.5.0-3~),
44+
foo2zjs (<< 20111023dfsg0-1~),
45+
udev (<< 136-1),
46+
Replaces:
47+
foo2zjs (<< 20111023dfsg0-1~),
4148
Description: printer driver for ZjStream-based printers
4249
foo2zjs is an open source printer driver for printers that use the
4350
Zenographics ZjStream wire protocol for their print data, such as the
@@ -52,19 +59,25 @@ Description: printer driver for ZjStream-based printers
5259

5360
Package: printer-driver-foo2zjs-common
5461
Architecture: all
55-
Depends: ${misc:Depends}
56-
Recommends: ${debian:tix},
57-
${debian:tk},
58-
printer-driver-foo2zjs (>= ${source:Version})
59-
Suggests: ${ubuntu:tix},
60-
${ubuntu:tk}
61-
Enhances: printer-driver-foo2zjs (>= ${source:Version})
62-
Breaks: udev (<< 136-1),
63-
cups (<< 1.5.0-3~),
64-
foo2zjs (<< 20111023dfsg0-1~),
65-
printer-driver-foo2zjs (<< 20131225dfsg0-5~)
66-
Replaces: foo2zjs (<< 20111023dfsg0-1~),
67-
printer-driver-foo2zjs (<< 20131225dfsg0-5~)
62+
Depends:
63+
${misc:Depends},
64+
Recommends:
65+
printer-driver-foo2zjs (>= ${source:Version}),
66+
${debian:tix},
67+
${debian:tk},
68+
Suggests:
69+
${ubuntu:tix},
70+
${ubuntu:tk},
71+
Enhances:
72+
printer-driver-foo2zjs (>= ${source:Version}),
73+
Breaks:
74+
cups (<< 1.5.0-3~),
75+
foo2zjs (<< 20111023dfsg0-1~),
76+
printer-driver-foo2zjs (<< 20131225dfsg0-5~),
77+
udev (<< 136-1),
78+
Replaces:
79+
foo2zjs (<< 20111023dfsg0-1~),
80+
printer-driver-foo2zjs (<< 20131225dfsg0-5~),
6881
Description: printer driver for ZjStream-based printers - common files
6982
foo2zjs is an open source printer driver for printers that use the
7083
Zenographics ZjStream wire protocol for their print data, such as the

‎debian/copyright‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,22 @@ Files: icc2ps/*.c icc2ps/*.h
9292
Copyright: 1998-2007 Marti Maria
9393
1994-1996 SunSoft, Inc.
9494
License: MIT
95-
Permission is hereby granted, free of charge, to any person obtaining
96-
a copy of this software and associated documentation files (the "Software"),
97-
to deal in the Software without restriction, including without limitation
98-
the rights to use, copy, modify, merge, publish, distribute, sublicense,
99-
and/or sell copies of the Software, and to permit persons to whom the Software
95+
Permission is hereby granted, free of charge, to any person obtaining
96+
a copy of this software and associated documentation files (the "Software"),
97+
to deal in the Software without restriction, including without limitation
98+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
99+
and/or sell copies of the Software, and to permit persons to whom the Software
100100
is furnished to do so, subject to the following conditions:
101-
.
102-
The above copyright notice and this permission notice shall be included in
101+
.
102+
The above copyright notice and this permission notice shall be included in
103103
all copies or substantial portions of the Software.
104-
.
105-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
106-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
107-
THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
108-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
109-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
110-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
104+
.
105+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
106+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
107+
THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
108+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
109+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
110+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
111111
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
112112

113113
Files: debian/*
@@ -116,7 +116,7 @@ Copyright: 2003-2005 Chris Lawrence <lawrencc@debian.org>
116116
2007 Luca Bedogni <me@lucabedogni.it>
117117
2007-2009 Michael Koch <konqueror@gmx.de>
118118
2008-2011 Luca Capello <luca@pca.it>
119-
2011-2013 Didier Raboud <odyx@debian.org>
119+
2011-2013 Didier Raboud <odyx@debian.org>
120120
License: GPL-2+
121121

122122
License: GPL-2+

‎debian/printer-driver-foo2zjs-common.install‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1+
PPD/* usr/share/ppd/foo2zjs/
12
debian/printer-driver-foo2zjs-common.ppd-updater /usr/share/cups/ppd-updaters/
23
getweb usr/sbin
34
hplj1000 lib/udev
45
hplj1020.desktop usr/share/applications/
56
hplj1020_icon.png usr/share/pixmaps
6-
PPD/* usr/share/ppd/foo2zjs/
7-
usr/bin/foo2zjs-pstops
87
usr/bin/foo2ddst-wrapper
9-
usr/bin/foo2hiperc-wrapper
108
usr/bin/foo2hbpl2-wrapper
9+
usr/bin/foo2hiperc-wrapper
1110
usr/bin/foo2hp2600-wrapper
1211
usr/bin/foo2lava-wrapper
1312
usr/bin/foo2oak-wrapper
1413
usr/bin/foo2qpdl-wrapper
1514
usr/bin/foo2slx-wrapper
1615
usr/bin/foo2xqx-wrapper
16+
usr/bin/foo2zjs-pstops
1717
usr/bin/foo2zjs-wrapper
1818
usr/bin/printer-profile
19-
usr/share/doc/printer-driver-foo2zjs/manual.pdf
2019
usr/share/doc/printer-driver-foo2zjs/README
20+
usr/share/doc/printer-driver-foo2zjs/manual.pdf
2121
usr/share/foo2qpdl/crd/black-text.ps
2222
usr/share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd
2323
usr/share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd
@@ -34,27 +34,27 @@ usr/share/foo2zjs/hplj1020_icon.gif
3434
usr/share/foo2zjs/hplj10xx_gui.tcl
3535
usr/share/man/man1/arm2hpdl.1
3636
usr/share/man/man1/ddstdecode.1
37-
usr/share/man/man1/foo2ddst.1
3837
usr/share/man/man1/foo2ddst-wrapper.1
39-
usr/share/man/man1/foo2hbpl2.1
38+
usr/share/man/man1/foo2ddst.1
4039
usr/share/man/man1/foo2hbpl2-wrapper.1
41-
usr/share/man/man1/foo2hiperc.1
40+
usr/share/man/man1/foo2hbpl2.1
4241
usr/share/man/man1/foo2hiperc-wrapper.1
42+
usr/share/man/man1/foo2hiperc.1
4343
usr/share/man/man1/foo2hp.1
4444
usr/share/man/man1/foo2hp2600-wrapper.1
45-
usr/share/man/man1/foo2lava.1
4645
usr/share/man/man1/foo2lava-wrapper.1
47-
usr/share/man/man1/foo2oak.1
46+
usr/share/man/man1/foo2lava.1
4847
usr/share/man/man1/foo2oak-wrapper.1
49-
usr/share/man/man1/foo2qpdl.1
48+
usr/share/man/man1/foo2oak.1
5049
usr/share/man/man1/foo2qpdl-wrapper.1
51-
usr/share/man/man1/foo2slx.1
50+
usr/share/man/man1/foo2qpdl.1
5251
usr/share/man/man1/foo2slx-wrapper.1
53-
usr/share/man/man1/foo2xqx.1
52+
usr/share/man/man1/foo2slx.1
5453
usr/share/man/man1/foo2xqx-wrapper.1
55-
usr/share/man/man1/foo2zjs.1
54+
usr/share/man/man1/foo2xqx.1
5655
usr/share/man/man1/foo2zjs-pstops.1
5756
usr/share/man/man1/foo2zjs-wrapper.1
57+
usr/share/man/man1/foo2zjs.1
5858
usr/share/man/man1/gipddecode.1
5959
usr/share/man/man1/hbpldecode.1
6060
usr/share/man/man1/hipercdecode.1

‎debian/printer-driver-foo2zjs.install‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
usr/bin/arm2hpdl
2+
usr/bin/command2foo2lava-pjl usr/lib/cups/filter/
3+
usr/bin/ddstdecode
24
usr/bin/foo2ddst
3-
usr/bin/foo2hiperc
45
usr/bin/foo2hbpl2
6+
usr/bin/foo2hiperc
57
usr/bin/foo2hp
68
usr/bin/foo2lava
79
usr/bin/foo2oak
810
usr/bin/foo2qpdl
911
usr/bin/foo2slx
1012
usr/bin/foo2xqx
1113
usr/bin/foo2zjs
12-
usr/bin/ddstdecode
1314
usr/bin/gipddecode
1415
usr/bin/hbpldecode
1516
usr/bin/hipercdecode
@@ -20,4 +21,3 @@ usr/bin/qpdldecode
2021
usr/bin/slxdecode
2122
usr/bin/xqxdecode
2223
usr/bin/zjsdecode
23-
usr/bin/command2foo2lava-pjl usr/lib/cups/filter/

‎debian/printer-driver-foo2zjs.links‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ lib/udev/hplj1000 lib/udev/hpljP1007
77
lib/udev/hplj1000 lib/udev/hpljP1008
88
lib/udev/hplj1000 lib/udev/hpljP1505
99
lib/udev/hplj1000 lib/udev/hpljP1505n
10-
1110
usr/bin/psicc usr/bin/foo2zjs-icc2ps

‎debian/tests/control‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
Tests: printer-driver-foo2zjs
22
Restrictions: needs-root
3-
Depends: printer-driver-foo2zjs, cups, cups-client (>= 1.7.3-5~)
3+
Depends:
4+
cups,
5+
cups-client (>= 1.7.3-5~),
6+
printer-driver-foo2zjs,

0 commit comments

Comments
 (0)