Commit Debian 3.0 (quilt) metadataHEADdebian/1.17.dfsg-4archive/debian/1.17.dfsg-4master

[dgit (3.5) quilt-fixup]

5 files changed, 99 insertions, 0 deletions

diff --git a/debian/patches/psmerge-use-ps2write b/debian/patches/psmerge-use-ps2write
new file mode 100644
index 0000000..f5c5501
--- /dev/null
+++ b/debian/patches/psmerge-use-ps2write
@@ -0,0 +1,34 @@
+From: Antony Pavlov <antonynpavlov@gmail.com>
+Date: Sat, 21 Jan 2017 19:18:14 +0000
+X-Dgit-Generated: 1.17.dfsg-4 52c8f1637d60a0d496571bd32f7ff7d64eeafc56
+Subject: psmerge: Use ps2write.
+
+It looks like psmerge from psutils-1.17.dfsg-3 still uses pswrite:
+
+    $ dpkg -S /usr/bin/psmerge
+    psutils: /usr/bin/psmerge
+    $ dpkg -s psutils | grep '^Version:'
+    Version: 1.17.dfsg-3
+    $ grep pswrite /usr/bin/psmerge
+       exec +(qw(gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite),
+
+Changing "pswrite" to "ps2write" fixes the 'Unknown device: pswrite'
+problem, e\ .g.
+
+Closes:#797528.
+
+Reported-by: Kai-Martin Knaak <knaak@iqo.uni-hannover.de>
+
+---
+
+--- psutils-1.17.dfsg.orig/psmerge.pl
++++ psutils-1.17.dfsg/psmerge.pl
+@@ -28,7 +28,7 @@ if (defined $gs)
+ {
+    # Just invoke gs
+    $outfile = '/dev/stdout' unless defined $outfile;
+-   exec +(qw(gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite),
++   exec +(qw(gs -q -dNOPAUSE -dBATCH -sDEVICE=ps2write),
+ 	  "-sOutputFile=$outfile", '-f', @ARGV);
+    die "$prog: exec /usr/bin/gs failed\n";
+ }
diff --git a/debian/patches/psnup1-fix-manpage-syntax-error.--closes b/debian/patches/psnup1-fix-manpage-syntax-error.--closes
new file mode 100644
index 0000000..d1ea4b8
--- /dev/null
+++ b/debian/patches/psnup1-fix-manpage-syntax-error.--closes
@@ -0,0 +1,19 @@
+From: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
+Date: Sat, 21 Jan 2017 19:15:58 +0000
+X-Dgit-Generated: 1.17.dfsg-4 7258909993a99334740443749705dd921bb8a8fc
+Subject: psnup(1): Fix manpage syntax error.  Closes:#663258.
+
+
+---
+
+--- psutils-1.17.dfsg.orig/psnup.man
++++ psutils-1.17.dfsg/psnup.man
+@@ -125,7 +125,7 @@ tries to optimise the layout so that the
+ .I psnup
+ cannot find a layout within its tolerance limit, it will abort with an error
+ message. The alternative form
+-.I \i \fInup\fR
++.I \-i \fInup\fR
+ can also be used, for compatibility with other n-up programs.
+ .PP
+ .I Psnup
diff --git a/debian/patches/psnup1-remove-a-confusing-and-unnecessar b/debian/patches/psnup1-remove-a-confusing-and-unnecessar
new file mode 100644
index 0000000..2241219
--- /dev/null
+++ b/debian/patches/psnup1-remove-a-confusing-and-unnecessar
@@ -0,0 +1,23 @@
+From: Reuben Thomas <rrt@sc3d.org>
+Date: Sat, 21 Jan 2017 19:37:28 +0000
+X-Dgit-Generated: 1.17.dfsg-4 45990e7c75dde21ad20a9e6e22b2d8e980b92459
+Subject: psnup(1): Remove a confusing and unnecessary qualification about units.
+
+Apropos of #695179.
+
+---
+
+--- psutils-1.17.dfsg.orig/psnup.man
++++ psutils-1.17.dfsg/psnup.man
+@@ -54,10 +54,7 @@ option gives the paper height,
+ normally specified in
+ .B "cm"
+ or
+-.B "in"
+-to convert 
+-PostScript's points (1/72 of an inch)
+-to centimeters or inches.
++.BR "in" .
+ The 
+ .I \-p
+ option can be used as an alternative, to set the paper size to
diff --git a/debian/patches/pstops1-remove-unneeded-backslash.--clos b/debian/patches/pstops1-remove-unneeded-backslash.--clos
new file mode 100644
index 0000000..2f7283d
--- /dev/null
+++ b/debian/patches/pstops1-remove-unneeded-backslash.--clos
@@ -0,0 +1,19 @@
+From: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
+Date: Sat, 21 Jan 2017 19:31:30 +0000
+X-Dgit-Generated: 1.17.dfsg-4 171ae6f299fa52083cfc12441155ef5d6cbcafd0
+Subject: pstops(1): Remove unneeded backslash.  Closes:#726468.
+
+
+---
+
+--- psutils-1.17.dfsg.orig/pstops.man
++++ psutils-1.17.dfsg/pstops.man
+@@ -84,7 +84,7 @@ If the optional minus sign is specified,
+ the document, instead of the start.
+ 
+ If page \fIspec\fRs are separated by
+-.B \+
++.B +
+ the pages will be merged into one page; if they are separated by
+ .B ,
+ they will be on separate pages.
diff --git a/debian/patches/series b/debian/patches/series
index 05276de..c0205de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,7 @@ showchar-manpage.patch
 off_t.patch
 psutils-flip.patch
 psjoin.patch
+psnup1-fix-manpage-syntax-error.--closes
+psmerge-use-ps2write
+pstops1-remove-unneeded-backslash.--clos
+psnup1-remove-a-confusing-and-unnecessar