fix for #658734, adding -h support back to zgrep

diff --git a/debian/changelog b/debian/changelog
index 0b6d2c96dda2716ee7d05ced7fc89d904aab8161..9ed8c632b5ea4e78cd989357b439df926351feab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gzip (1.4-6) unstable; urgency=low
+
+  * patch to restore zgrep -h from Pär-Ola Nilsson, closes: #658734
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 12 Apr 2012 11:38:56 -0600
+
 gzip (1.4-5) unstable; urgency=low
 
   * patch from upstream to address determinism issue, closes: #647522

diff --git a/debian/patches/series b/debian/patches/series
index 0685c9b98646c9377894c4fadab057d77dba3baa..451b0ad7e6d7f97862975a9c57138a5bdff3444b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ rsyncable.diff
 zless-LESSOPEN.diff
 sys_stat.in.h.diff
 determinism.diff
+zgrep-dash-h.diff

diff --git a/zgrep.in b/zgrep.in
index a828bbc528ac3bb3fdf6f35e3c22c59fc26345bc..7095aff6ca7f3d1257979f43eebc4d15ca7a3037 100644 (file)
--- a/zgrep.in
+++ b/zgrep.in
@@ -138,7 +138,7 @@ while test $# -ne 0; do
     files_with_matches=1;;
   (-L | --files-witho*)
     files_without_matches=1;;
-  (--no-f*)
+  (-h | --no-f*)
     no_filename=1;;
   (-V | --v | --ve | --ver | --vers | --versi | --versio | --version)
     echo "$version" || exit 2