In my NMU (1:4.13b.dfsg.1-0.1) I removed the following non-free files
from the upstream tarball:
tests/gps-ref/Converter.ps
tests/gps-ref/fasttrig.ps
tests/ps-ref/Converter.ps
tests/ps-ref/fasttrig.ps
tests/tstfiles/Converter.java
tests/tstfiles/fasttrig.pas
Here's a diff of the changes I made:
diff -u a2ps-4.13b/debian/a2ps-lpr-wrapper
a2ps-4.13b.dfsg.1/debian/a2ps-lpr-wrapper
--- a2ps-4.13b/debian/a2ps-lpr-wrapper
+++ a2ps-4.13b.dfsg.1/debian/a2ps-lpr-wrapper
@@ -4,7 +4,7 @@
#
TEMP=`getopt -o d: -n 'a2ps-lpr-wrapper' -- "$@"`
-PRINTER=""
+a2ps_printer=""
if [ $? != 0 ]; then echo "Terminating..." >&2; exit 1; fi
@@ -13,7 +13,7 @@
while true ; do
case "$1" in
- -d) PRINTER=$2; shift 2 ;;
+ -d) a2ps_printer=$2; shift 2 ;;
--) shift; break ;;
*) echo "usage: a2ps-lpr-wrapper -d [printer] [files]"; exit 1 ;;
esac
@@ -22,9 +22,9 @@
# If /usr/bin/lp (from cupsys-client) exists, just use it.
if [ -x /usr/bin/lp ]; then
- if [ "x$PRINTER" != "x" ]; then d="-d $PRINTER"; else d=""; fi
+ if [ "x$a2ps_printer" != "x" ]; then d="-d $a2ps_printer"; else d=""; fi
/usr/bin/lp $d "$@"
else
# In case /usr/bin/lp is not available, then fall back /usr/bin/lpr.
-if [ "x$PRINTER" != "x" ]; then P="-P $PRINTER"; else P=""; fi
+if [ "x$a2ps_printer" != "x" ]; then P="-P $a2ps_printer"; else P=""; fi
/usr/bin/lpr $P "$@"
fi
diff -u a2ps-4.13b/debian/changelog a2ps-4.13b.dfsg.1/debian/changelog
--- a2ps-4.13b/debian/changelog
+++ a2ps-4.13b.dfsg.1/debian/changelog
@@ -1,3 +1,19 @@
+a2ps (1:4.13b.dfsg.1-0.1) unstable; urgency=medium
+
+ * NMU.
+ * Medium urgency due to RC bugfix.
+ * Removed non-free test files from upstream tarball. Closes: #340044.
+ * Applied patch from Russ Allberry to fix printing to the default printer.
+ Closes: #322669.
+ * Applied patch from Julien BLACHE to fix two va_list misuses which
+ cause segfaults when executing "a2ps --list=defaults" on certain
+ archs. Closes: #294905.
+ * Don't replace auxdir/config.{guess,sub} when running "debian/rules
+ clean". The source should be restored to its original state when
+ cleaning.
+
+ -- Per Olofsson <[EMAIL PROTECTED]> Sun, 15 Jan 2006 20:11:07 +0100
+
a2ps (1:4.13b-5) unstable; urgency=low
* Acknowledged NMUs - closes: #283134, #274798, #286385, #286387
diff -u a2ps-4.13b/debian/rules a2ps-4.13b.dfsg.1/debian/rules
--- a2ps-4.13b/debian/rules
+++ a2ps-4.13b.dfsg.1/debian/rules
@@ -62,12 +62,12 @@
rm -f contrib/sample/sample contrib/*.o contrib/emacs/a2ps-print.elc \
contrib/emacs/a2ps.elc contrib/fixnt
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub $(CURDIR)/auxdir/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess $(CURDIR)/auxdir/config.guess
-endif
+#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+# cp -f /usr/share/misc/config.sub $(CURDIR)/auxdir/config.sub
+#endif
+#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+# cp -f /usr/share/misc/config.guess $(CURDIR)/auxdir/config.guess
+#endif
dh_clean
only in patch2:
unchanged:
--- a2ps-4.13b.dfsg.1.orig/lib/printlen.c
+++ a2ps-4.13b.dfsg.1/lib/printlen.c
@@ -28,14 +28,11 @@
unsigned long strtoul ();
static int
-int_printflen (const char *format, va_list *args)
+int_printflen (const char *format, va_list ap)
{
const char *cp;
int total_width = 0;
int width = 0;
- va_list ap;
-
- memcpy (&ap, args, sizeof (va_list));
for (cp = format ; *cp ; cp++)
{
@@ -99,7 +96,16 @@
int
vprintflen (const char *format, va_list args)
{
- return int_printflen (format, &args);
+ va_list ap;
+ int ret;
+
+ va_copy (ap, args);
+
+ ret = int_printflen (format, ap);
+
+ va_end(ap);
+
+ return ret;
}
int
only in patch2:
unchanged:
--- a2ps-4.13b.dfsg.1.orig/lib/title.c
+++ a2ps-4.13b.dfsg.1/lib/title.c
@@ -83,11 +83,17 @@
VA_START (args, format);
len = vprintflen (format, args);
+
+ va_end (args);
+
if (format [strlen (format) - 1] == '\n')
len --;
if (center_p)
for (padding = 0 ; padding < 79 - len ; padding += 2)
putc (' ', stream);
+
+ VA_START (args, format);
+
# if HAVE_VPRINTF || _LIBC
vfprintf (stream, format, args);
# else
--
Pelle
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
