From 15eea35eec74f226bb721ebf0b3ee7473b1a5ff9 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 15 Apr 2006 01:31:54 -0600 Subject: [PATCH] Imported Debian patch 1.3.5-13 --- debian/changelog | 10 ++++++++++ debian/compat | 1 + debian/control | 4 ++-- debian/copyright | 4 ++-- debian/rules | 3 --- gzip.1 | 2 +- zgrep.in | 2 +- zless.1 | 4 ++++ 8 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 4ae5ebe..37b6bcd 100644 --- 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 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 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control index fc588f6..ff41a34 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: gzip Section: base Priority: required Maintainer: Bdale Garbee -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 diff --git a/debian/copyright b/debian/copyright index 6ba966c..d7192da 100644 --- 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 - 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 diff --git a/debian/rules b/debian/rules index 8a237cc..66e7e53 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,6 @@ # 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)) diff --git a/gzip.1 b/gzip.1 index 4457856..8960b87 100644 --- 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) -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. diff --git a/zgrep.in b/zgrep.in index aa3567f..9ddb557 100755 --- a/zgrep.in +++ b/zgrep.in @@ -93,7 +93,7 @@ fi 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 diff --git a/zless.1 b/zless.1 index 844f5d5..bae5aa1 100644 --- 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. + +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) -- 2.43.0