Imported Debian patch 1.3.5-13

diff --git a/debian/changelog b/debian/changelog
index 4ae5ebea8db868ee02c70f6a61c3e9f248352072..37b6bcd0ec08d56b40335784553312e82e44851c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gzip (1.3.5-13) unstable; urgency=low
+
+  * patch from Reuben Thomas fixes problem passing zgrep filenames starting
+    with dashes, closes: #342501
+  * fix a spelling error in gzip man page, closes: #356011
+  * document the fact that zless doesn't work with stdin, 
+    closes: #320226, #345036
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 15 Apr 2006 01:31:54 -0600
+

 gzip (1.3.5-12) unstable; urgency=low
 
   * merge patch from Matt Zimmerman for futex hang due to improper signal
 gzip (1.3.5-12) unstable; urgency=low
 
   * merge patch from Matt Zimmerman for futex hang due to improper signal

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5

diff --git a/debian/control b/debian/control
index fc588f626f50659f153836a324c43e2e4ce95c9b..ff41a3482c305fc50a485b662a697b9de10ba0f2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: gzip
 Section: base
 Priority: required
 Maintainer: Bdale Garbee <bdale@gag.com>
 Section: base
 Priority: required
 Maintainer: Bdale Garbee <bdale@gag.com>

-Build-Depends: debhelper (>= 3), texinfo
-Standards-Version: 3.6.2.1
+Build-Depends: debhelper (>= 5), texinfo
+Standards-Version: 3.6.2.2

 
 Package: gzip
 Architecture: any
 
 Package: gzip
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index 6ba966c8e18e1045d453059949357d6bf9b1b391..d7192da440a82fd2e22dcd2a2565bc383d29d6e0 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,8 +20,8 @@ Copyright (C) 1992, 1993 Jean-loup Gailly
 
        You should have received a copy of the GNU General Public License
        along with tar; see the file COPYING.  If not, write to
 
        You should have received a copy of the GNU General Public License
        along with tar; see the file COPYING.  If not, write to

-       the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-       Boston, MA 02111-1307, USA.
+       the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, 
+       Boston, MA 02110-1301, USA.

 
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 
 
 On Debian GNU/Linux systems, the complete text of the GNU General

diff --git a/debian/rules b/debian/rules
index 8a237ccdcbd2d82c4304abb5f3371b4343bee172..66e7e532178f219e0c8d98d31d8b8bd2d897a866 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
 # Comment this to turn off debhelper verbose mode.
 export DH_VERBOSE=1
 
 # Comment this to turn off debhelper verbose mode.
 export DH_VERBOSE=1
 

-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-

 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))

diff --git a/gzip.1 b/gzip.1
index 4457856137ed1d63779aa780bac09f53839ce9d3..8960b877012b9716f2a47f8cf6aec7ea647345a6 100644 (file)
--- a/gzip.1
+++ b/gzip.1
@@ -294,7 +294,7 @@ will descend into the directory and compress all the files it finds there
 While compressing, synchronize the output occasionally based on the input.
 This increases size by less than 1 percent most cases, but means that the
 .BR rsync (1)
 While compressing, synchronize the output occasionally based on the input.
 This increases size by less than 1 percent most cases, but means that the
 .BR rsync (1)

-program can much more efficiently syncronize files compressed with this flag.
+program can much more efficiently synchronize files compressed with this flag.

 .I gunzip
 cannot tell the difference between a compressed file created with this option,
 and one created without it.
 .I gunzip
 cannot tell the difference between a compressed file created with this option,
 and one created without it.

diff --git a/zgrep.in b/zgrep.in
index aa3567f2c3898c8d30ef77f569d9d9e0c3c5364c..9ddb55738e1150e0138015e988b57c6f02d63ec3 100755 (executable)
--- a/zgrep.in
+++ b/zgrep.in
@@ -93,7 +93,7 @@ fi
 
 res=0
 for i do
 
 res=0
 for i do

-  gzip -cdfq "$i" |
+  gzip -cdfq -- "$i" |

     if test $files_with_matches -eq 1; then
       $grep $opt "$pat" > /dev/null && printf "%s\n" "$i"
     elif test $files_without_matches -eq 1; then
     if test $files_with_matches -eq 1; then
       $grep $opt "$pat" > /dev/null && printf "%s\n" "$i"
     elif test $files_without_matches -eq 1; then

diff --git a/zless.1 b/zless.1
index 844f5d5c51d40bb15222486bffbae570e44df7c0..bae5aa15903648837553b9cbda9387c98a334ac5 100644 (file)
--- a/zless.1
+++ b/zless.1
@@ -15,5 +15,9 @@ However, enough people seem to think that having the
 command 
 .I zless
 available is important to be worth providing it.
 command 
 .I zless
 available is important to be worth providing it.

+
+Note that zless does not work with files piped to it on stdin, it only works
+with files specified as arguments.  If you really want to use less in a pipe,
+then do the uncompress explicitly and pipe to less instead of zless.

 .SH "SEE ALSO"
 zmore(1), less(1)
 .SH "SEE ALSO"
 zmore(1), less(1)