From 11ee39edb279e9ba0ae43dac2f87e555ac8a66f9 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 11 Jun 2013 11:50:33 -0600 Subject: [PATCH] zgrep man page patch documenting which grep options just won't work --- debian/changelog | 4 +++- debian/patches/series | 1 + debian/patches/zgrep-man-diff | 26 ++++++++++++++++++++++++++ zgrep.1 | 10 +++++++++- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 debian/patches/zgrep-man-diff diff --git a/debian/changelog b/debian/changelog index 06472ac..730c748 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ gzip (1.6-1) UNRELEASED; urgency=low - * new upstream version, closes: #704689 + * new upstream version, closes: #704689, #690583 * merge diff from 1.5-1.1 NMU by Thorsten Glaser + * patch for zgrep man page from Regid Ichira, closes: #687123 + * restore rsyncable docs to man page, closes: #688305 -- Bdale Garbee Tue, 11 Jun 2013 08:49:52 -0600 diff --git a/debian/patches/series b/debian/patches/series index 7f6a556..3a71b82 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ rsyncable.diff sigpipe.diff +zgrep-man-diff diff --git a/debian/patches/zgrep-man-diff b/debian/patches/zgrep-man-diff new file mode 100644 index 0000000..85a6d29 --- /dev/null +++ b/debian/patches/zgrep-man-diff @@ -0,0 +1,26 @@ +--- a/zgrep.1 2012-09-10 03:20:56.541637782 +0300 ++++ b/zgrep.1 2012-09-10 03:18:21.000000000 +0300 +@@ -11,7 +11,13 @@ zgrep \- search possibly compressed file + invokes + .I grep + on compressed or gzipped files. +-All options specified are passed directly to ++These ++.I grep ++options will cause ++.I zgrep ++to terminate with an error code: ++.BI (-[drRzZ] | --di* | --exc* | --inc* | --rec* | --nu*) . ++All other options specified are passed directly to + .IR grep . + If no file is specified, then the standard input is decompressed + if necessary and fed to grep. +@@ -23,6 +29,8 @@ If the GREP environment variable is set, + uses it as the + .I grep + program to be invoked. ++.SH EXIT CODE ++2 - An option that is not supported was specified. + .SH AUTHOR + Charles Levert (charles@comm.polymtl.ca) + .SH "SEE ALSO" diff --git a/zgrep.1 b/zgrep.1 index ef37bd8..acc3195 100644 --- a/zgrep.1 +++ b/zgrep.1 @@ -11,7 +11,13 @@ zgrep \- search possibly compressed files for a regular expression invokes .I grep on compressed or gzipped files. -All options specified are passed directly to +These +.I grep +options will cause +.I zgrep +to terminate with an error code: +.BI (-[drRzZ] | --di* | --exc* | --inc* | --rec* | --nu*) . +All other options specified are passed directly to .IR grep . If no file is specified, then the standard input is decompressed if necessary and fed to grep. @@ -23,6 +29,8 @@ If the GREP environment variable is set, uses it as the .I grep program to be invoked. +.SH EXIT CODE +2 - An option that is not supported was specified. .SH AUTHOR Charles Levert (charles@comm.polymtl.ca) .SH "SEE ALSO" -- 2.30.2