patch for zdiff man page

diff --git a/debian/changelog b/debian/changelog
index 7d35092d9b023568b5eb042e300d2d910fa1de78..efc68ca34e6f4ffad2eb639f06f3d63bee7bc1cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gzip (1.4-6) unstable; urgency=low
     closes: #308522
   * patch to add --rsyncable doc to info page from Jörgen Grahn,
     closes: #637626
+  * patch to improve zdiff doc from Stéphane Aulery, closes: #269612
 
  -- Bdale Garbee <bdale@gag.com>  Thu, 12 Apr 2012 11:38:56 -0600
 

diff --git a/debian/patches/series b/debian/patches/series
index 51c69c0ec5a5f9b774e6fc48843a784b5a17b6b4..ac59100841649c9313ac5928e1f24be27aa3e416 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ sys_stat.in.h.diff
 determinism.diff
 zgrep-dash-h.diff
 gzip-man-pack.diff
+zdiff-man.diff

diff --git a/debian/patches/zdiff-man.diff b/debian/patches/zdiff-man.diff
new file mode 100644 (file)
index 0000000..b402473
--- /dev/null
+++ b/debian/patches/zdiff-man.diff
@@ -0,0 +1,43 @@
+diff --git a/zdiff.1 b/zdiff.1
+index 588974c..3a586a2 100644
+--- a/zdiff.1
++++ b/zdiff.1
+@@ -10,6 +10,7 @@ zcmp, zdiff \- compare compressed files
+ [ diff_options ] file1
+ [ file2 ]
+ .SH DESCRIPTION
++.P
+ .I  Zcmp
+ and
+ .I zdiff
+@@ -23,11 +24,11 @@ All options specified are passed directly to
+ .I cmp
+ or
+ .IR diff "."
+-If only 1 file is specified, then the files compared are
+-.I file1
+-and an uncompressed
+-.IR file1 ".gz."
+-If two files are specified, then they are uncompressed if necessary and fed to
++If only one file is specified, then it is compared to a file with the same name
++without the
++.I ".gz"
++extension. If two files are specified, then they are uncompressed if necessary
++and fed to
+ .I cmp
+ or
+ .IR diff "."
+@@ -36,6 +37,13 @@ The exit status from
+ or
+ .I diff
+ is preserved.
++.P
++When both files must be uncompressed before comparison, the second is
++uncompressed to
++.IR "/tmp" "."
++In all other cases,
++.IR "zdiff" " and " "zcmp"
++use only a pipe.
+ .SH "SEE ALSO"
+ cmp(1), diff(1), zmore(1), zgrep(1), znew(1), zforce(1), gzip(1), gzexe(1)
+ .SH BUGS

diff --git a/zdiff.1 b/zdiff.1
index 588974c1150e316aa391ea76108d899d0a10b0eb..3a586a2f3b01e2c3efe1a37d242ded419599e53a 100644 (file)
--- a/zdiff.1
+++ b/zdiff.1
@@ -10,6 +10,7 @@ zcmp, zdiff \- compare compressed files
 [ diff_options ] file1
 [ file2 ]
 .SH DESCRIPTION
+.P
 .I  Zcmp
 and
 .I zdiff
@@ -23,11 +24,11 @@ All options specified are passed directly to
 .I cmp
 or
 .IR diff "."
-If only 1 file is specified, then the files compared are
-.I file1
-and an uncompressed
-.IR file1 ".gz."
-If two files are specified, then they are uncompressed if necessary and fed to
+If only one file is specified, then it is compared to a file with the same name
+without the
+.I ".gz"
+extension. If two files are specified, then they are uncompressed if necessary
+and fed to
 .I cmp
 or
 .IR diff "."
@@ -36,6 +37,13 @@ The exit status from
 or
 .I diff
 is preserved.
+.P
+When both files must be uncompressed before comparison, the second is
+uncompressed to
+.IR "/tmp" "."
+In all other cases,
+.IR "zdiff" " and " "zcmp"
+use only a pipe.
 .SH "SEE ALSO"
 cmp(1), diff(1), zmore(1), zgrep(1), znew(1), zforce(1), gzip(1), gzexe(1)
 .SH BUGS