Hi, Here's the patch for my NMU 1:4.13b.dfsg.1-0.2 of a2ps:
reverted: --- a2ps-4.13b.dfsg.1/lib/printlen.c +++ a2ps-4.13b.dfsg.1.orig/lib/printlen.c @@ -28,11 +28,14 @@ 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++) { @@ -96,16 +99,7 @@ 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 reverted: --- a2ps-4.13b.dfsg.1/lib/title.c +++ a2ps-4.13b.dfsg.1.orig/lib/title.c @@ -83,17 +83,11 @@ 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 diff -u a2ps-4.13b.dfsg.1/debian/emacsen-startup a2ps-4.13b.dfsg.1/debian/emacsen-startup --- a2ps-4.13b.dfsg.1/debian/emacsen-startup +++ a2ps-4.13b.dfsg.1/debian/emacsen-startup @@ -15,7 +15,7 @@ (symbol-name flavor) "/site-lisp/a2ps") load-path)) ;; a2ps -(autoload 'a2ps-mode "a2ps-mode" nil t) +(autoload 'a2ps-mode "a2ps" nil t) (setq auto-mode-alist (cons '(".*\\.a2ps$" . a2ps-mode) auto-mode-alist)) diff -u a2ps-4.13b.dfsg.1/debian/changelog a2ps-4.13b.dfsg.1/debian/changelog --- a2ps-4.13b.dfsg.1/debian/changelog +++ a2ps-4.13b.dfsg.1/debian/changelog @@ -1,3 +1,22 @@ +a2ps (1:4.13b.dfsg.1-0.2) unstable; urgency=medium + + * NMU. + * Medium urgency due to RC bugfix. + * Always pass -d to a2ps-lpr-wrapper, regardless of the installed + printer system when building. Should fix the issue with -P not + working. Many thanks to Peder Chr. Norgaard for the solution. + Closes: #267527. + * Really pass correct arguments to gv (GNU-style "--"). Closes: #291749. + * Don't treat all filenames which include the substring "tar" as binary + files. Closes: #350555. + * Fixed Emacs autoload (a2ps.el, not a2ps-mode.el). Thanks to Francesco + Potorti`. Closes: #331452. + * Reverted va_list changes from previous upload which already existed in + debian/patches/22_va_list_fix.dpatch. + * Don't load non-existent make-regexp.el in a2ps.el. + + -- Per Olofsson <[EMAIL PROTECTED]> Tue, 7 Feb 2006 08:50:53 +0100 + a2ps (1:4.13b.dfsg.1-0.1) unstable; urgency=medium * NMU. diff -u a2ps-4.13b.dfsg.1/debian/patches/00list a2ps-4.13b.dfsg.1/debian/patches/00list --- a2ps-4.13b.dfsg.1/debian/patches/00list +++ a2ps-4.13b.dfsg.1/debian/patches/00list @@ -23,0 +24,2 @@ +24_tar_files_mismatch +25_dont_load_make-regexp_in_a2ps_el diff -u a2ps-4.13b.dfsg.1/debian/patches/23_newer_gv_option.dpatch a2ps-4.13b.dfsg.1/debian/patches/23_newer_gv_option.dpatch --- a2ps-4.13b.dfsg.1/debian/patches/23_newer_gv_option.dpatch +++ a2ps-4.13b.dfsg.1/debian/patches/23_newer_gv_option.dpatch @@ -1,35 +1,21 @@ -#! /bin/sh -e -## 23_newer_gv_option.dpatch by Masayuki Hatta <[EMAIL PROTECTED]> +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_newer_gv_option.dpatch by Per Olofsson <[EMAIL PROTECTED]> ## -## All lines beginning with \`## DP:' are a description of the patch. +## All lines beginning with `## DP:' are a description of the patch. ## DP: To give correct option to newer gv -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0 -;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -diff -urN a2ps-4.13b.orig/etc/a2ps_cfg.in a2ps-4.13b/etc/a2ps_cfg.in ---- a2ps-4.13b.orig/etc/a2ps_cfg.in 2005-08-03 01:32:31.000000000 +0900 -+++ a2ps-4.13b/etc/a2ps_cfg.in 2005-08-03 01:33:20.000000000 +0900 [EMAIL PROTECTED]@ +diff -urNad a2ps-4.13b.dfsg.1~/etc/a2ps_cfg.in a2ps-4.13b.dfsg.1/etc/a2ps_cfg.in +--- a2ps-4.13b.dfsg.1~/etc/a2ps_cfg.in 2006-02-07 07:45:47.000000000 +0100 ++++ a2ps-4.13b.dfsg.1/etc/a2ps_cfg.in 2006-02-07 07:46:25.000000000 +0100 @@ -190,8 +190,8 @@ # Either GV (prefered) or Ghostview will be used as the "display" printer # We give -dNOPLATFONTS so that real fonts are used # (Strange results appear with Ogonkify's fonts for instance). [EMAIL PROTECTED]@Variable: ghostview @ghostview@ -arguments -dNOPLATFONTS [EMAIL PROTECTED]@Variable: ghostview @gv@ -antialias -arguments -dNOPLATFONTS [EMAIL PROTECTED]@Variable: ghostview @ghostview@ -arguments=-dNOPLATFONTS [EMAIL PROTECTED]@Variable: ghostview @gv@ -antialias -arguments=-dNOPLATFONTS [EMAIL PROTECTED]@Variable: ghostview @ghostview@ --arguments=-dNOPLATFONTS [EMAIL PROTECTED]@Variable: ghostview @gv@ --antialias --arguments=-dNOPLATFONTS # Used for the `pdf' printer. # Use as `#{ps2pdf} INPUT OUTPUT'. diff -u a2ps-4.13b.dfsg.1/debian/patches/14_lp_lpr_workaround.dpatch a2ps-4.13b.dfsg.1/debian/patches/14_lp_lpr_workaround.dpatch --- a2ps-4.13b.dfsg.1/debian/patches/14_lp_lpr_workaround.dpatch +++ a2ps-4.13b.dfsg.1/debian/patches/14_lp_lpr_workaround.dpatch @@ -1,27 +1,13 @@ -#! /bin/sh -e -## 14_lp_lp_workaround.dpatch by Masayuki Hatta <[EMAIL PROTECTED]> +#! /bin/sh /usr/share/dpatch/dpatch-run +## 14_lp_lpr_workaround.dpatch by Per Olofsson <[EMAIL PROTECTED]> ## -## All lines beginning with \`## DP:' are a description of the patch. +## All lines beginning with `## DP:' are a description of the patch. ## DP: Use a2ps-lpr-wrapper script instead of using lp/lpr directly -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0 -;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -diff -urN a2ps-4.13b.orig/etc/a2ps_cfg.in a2ps-4.13b/etc/a2ps_cfg.in ---- a2ps-4.13b.orig/etc/a2ps_cfg.in 2004-08-13 07:18:35.000000000 +0900 -+++ a2ps-4.13b/etc/a2ps_cfg.in 2004-08-13 07:19:48.000000000 +0900 [EMAIL PROTECTED]@ +diff -urNad a2ps-4.13b.dfsg.1~/etc/a2ps_cfg.in a2ps-4.13b.dfsg.1/etc/a2ps_cfg.in +--- a2ps-4.13b.dfsg.1~/etc/a2ps_cfg.in 2006-02-07 07:37:43.000000000 +0100 ++++ a2ps-4.13b.dfsg.1/etc/a2ps_cfg.in 2006-02-07 07:37:53.000000000 +0100 @@ -417,13 +417,13 @@ # with a hook to post-process PostScript (to call psbook for instance). # Something like `#{lp.hook} lp #{lp.options}' @@ -37,6 +23,4 @@ -+Variable: lp #{lp.hook} a2ps-lpr-wrapper #{lp.options} @LPR_QUEUE_OPTION@ ++Variable: lp #{lp.hook} a2ps-lpr-wrapper #{lp.options} -d # To avoid that the next installation of a2ps destroys your - - only in patch2: unchanged: --- a2ps-4.13b.dfsg.1.orig/debian/patches/25_dont_load_make-regexp_in_a2ps_el.dpatch +++ a2ps-4.13b.dfsg.1/debian/patches/25_dont_load_make-regexp_in_a2ps_el.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_dont_load_make-regexp_in_a2ps_el.dpatch by Per Olofsson <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't load non-existent make-regexp.el. + [EMAIL PROTECTED]@ +diff -urNad a2ps-4.13b.dfsg.1~/contrib/emacs/a2ps.el a2ps-4.13b.dfsg.1/contrib/emacs/a2ps.el +--- a2ps-4.13b.dfsg.1~/contrib/emacs/a2ps.el 2006-02-07 08:48:19.000000000 +0100 ++++ a2ps-4.13b.dfsg.1/contrib/emacs/a2ps.el 2006-02-07 08:48:41.000000000 +0100 +@@ -187,7 +187,7 @@ + (filladapt-mode) + + ; Used to compile regexps +- (load "make-regexp") ++ ;;(load "make-regexp") + + ; Used for the menus + (require 'easymenu) only in patch2: unchanged: --- a2ps-4.13b.dfsg.1.orig/debian/patches/24_tar_files_mismatch.dpatch +++ a2ps-4.13b.dfsg.1/debian/patches/24_tar_files_mismatch.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 24_tar_files_mismatch.dpatch by Per Olofsson <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't treat all filenames which include the substring "tar" as binary files + [EMAIL PROTECTED]@ +diff -urNad a2ps-4.13b.dfsg.1~/sheets/sheets.map a2ps-4.13b.dfsg.1/sheets/sheets.map +--- a2ps-4.13b.dfsg.1~/sheets/sheets.map 2000-02-24 19:38:06.000000000 +0100 ++++ a2ps-4.13b.dfsg.1/sheets/sheets.map 2006-02-07 08:00:11.000000000 +0100 +@@ -87,8 +87,7 @@ + plain: /*/ + + # Some binary files we probably don't want to print +-binary: /*tar*/ +- /*.tar/ ++binary: /*.tar/ + /*.tgz/ + /*.[ao]/ + <ELF*> -- Pelle -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]