From: Bdale Garbee Date: Thu, 12 Apr 2012 17:41:28 +0000 (-0600) Subject: fix for #658734, adding -h support back to zgrep X-Git-Tag: debian/1.4-6~11 X-Git-Url: https://git.gag.com/?p=debian%2Fgzip;a=commitdiff_plain;h=4837ea600b0c15289ae734a0591e2dec5f2c1ede fix for #658734, adding -h support back to zgrep --- diff --git a/debian/changelog b/debian/changelog index 0b6d2c9..9ed8c63 100644 --- 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 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 0685c9b..451b0ad 100644 --- 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 a828bbc..7095aff 100644 --- 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