Imported Debian patch 1.3.12-2

diff --git a/debian/changelog b/debian/changelog
index 19fbec9610ee91745e2bae2462ca66878a66050d..174b9afde28276563403392819c3818cda357a3f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gzip (1.3.12-2) unstable; urgency=low
+
+  * fix typo in gzip fprintf, closes: #426965
+  * revert my zgrep.in patch since upstream handles alternates differently now
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 14 Jun 2007 00:17:37 -0400
+

 gzip (1.3.12-1) unstable; urgency=low
 
   * new upstream version, closes: #177942, #225864, #362786, #366660, #367400, 
 gzip (1.3.12-1) unstable; urgency=low
 
   * new upstream version, closes: #177942, #225864, #362786, #366660, #367400, 

diff --git a/gzip.c b/gzip.c
index 3131e860873cdc5f70fc6cb3260db732df445550..bddab9824cf7a0a6080c70d159a9db7fbc268582 100644 (file)
--- a/gzip.c
+++ b/gzip.c
@@ -1278,7 +1278,7 @@ local int get_method(in)
        }
        if ((flags & CONTINUATION) != 0) {
            fprintf(stderr,
        }
        if ((flags & CONTINUATION) != 0) {
            fprintf(stderr,

-                   "%s: %s is a a multi-part gzip file -- not supported\n",
+                   "%s: %s is a multi-part gzip file -- not supported\n",

                    program_name, ifname);
            exit_code = ERROR;
            if (force <= 1) return -1;
                    program_name, ifname);
            exit_code = ERROR;
            if (force <= 1) return -1;

diff --git a/zgrep.in b/zgrep.in
index 4b1b50940cbaa00b0a65ad885974846573445599..e889ceb3311431aa657d896698b7c25fecef93ee 100644 (file)
--- a/zgrep.in
+++ b/zgrep.in
@@ -23,20 +23,13 @@
 PATH=BINDIR:$PATH
 grep='${GREP-grep}'
 
 PATH=BINDIR:$PATH
 grep='${GREP-grep}'
 

-prog=`echo "$0" | sed 's|.*/||'`
-case "$prog" in
-       *egrep) grep=${EGREP-egrep}     ;;
-       *fgrep) grep=${FGREP-fgrep}     ;;
-       *)      grep=${GREP-grep}       ;;
-esac
-
-version="z$grep (gzip) @VERSION@
+version='z$grep (gzip) @VERSION@

 Copyright (C) 2007 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Copyright (C) 2007 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 

-Written by Jean-loup Gailly."
+Written by Jean-loup Gailly.'

 
 usage="Usage: $0 [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their
 
 usage="Usage: $0 [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their