Merging upstream version 1.6.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

6 files changed, 140 insertions, 15 deletions

diff --git a/doc/lzdiff.1 b/doc/lzdiff.1
new file mode 100644
index 0000000..b531605
--- /dev/null
+++ b/doc/lzdiff.1
@@ -0,0 +1,48 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH LZDIFF "1" "May 2009" "Lzdiff 0.5" "User Commands"
+.SH NAME
+Lzdiff \- manual page for Lzdiff 0.5
+.SH SYNOPSIS
+.B lzdiff
+[\fIOPTIONS\fR] [\fIDIFF_OPTIONS\fR] \fIFILE1 \fR[\fIFILE2\fR]
+.SH DESCRIPTION
+Lzdiff \- Diff/cmp wrapper for compressed files.
+.PP
+Lzdiff is a wrapper script around the diff and cmp commands that allows
+transparent comparison of any combination of compressed and
+non\-compressed files. If any given file is compressed, its uncompressed
+content is used. The supported compressors are gzip, bzip2 and lzip.
+.PP
+Compares FILE1 to FILE2. If FILE2 is omitted, compares FILE1 to the
+uncompressed contents of FILE1.[gz|bz2|lz] (depending on the default
+compressor selected). DIFF_OPTIONS are passed directly to diff or cmp.
+The exit status from diff or cmp is preserved.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-gzip\fR
+use gzip as default decompressor
+.TP
+\fB\-\-bzip2\fR
+use bzip2 as default decompressor
+.TP
+\fB\-\-lzip\fR
+use lzip as default decompressor (default)
+.TP
+\fB\-\-diff\fR
+use diff to compare files (default)
+.TP
+\fB\-\-cmp\fR
+use cmp to compare files
+.SH "REPORTING BUGS"
+Report bugs to lzip\-bug@nongnu.org
+Lzip home page: http://www.nongnu.org/lzip/lzip.html
+.SH COPYRIGHT
+Copyright \(co 2009 Antonio Diaz Diaz.
+This script is free software: you have unlimited permission
+to copy, distribute and modify it.
diff --git a/doc/lzgrep.1 b/doc/lzgrep.1
new file mode 100644
index 0000000..b4d7183
--- /dev/null
+++ b/doc/lzgrep.1
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH LZGREP "1" "May 2009" "Lzgrep 0.5" "User Commands"
+.SH NAME
+Lzgrep \- manual page for Lzgrep 0.5
+.SH SYNOPSIS
+.B lzgrep
+[\fIOPTIONS\fR] [\fIGREP_OPTIONS\fR] \fIPATTERN \fR[\fIFILES\fR]
+.SH DESCRIPTION
+Lzgrep \- Grep wrapper for compressed files.
+.PP
+Lzgrep is a wrapper script around the grep command that allows
+transparent search on any combination of compressed and non\-compressed
+files. If any given file is compressed, its uncompressed content is
+used. If a given file does not exist, lzgrep tries the compressed file
+name corresponding to the default compressor selected. The supported
+compressors are gzip, bzip2 and lzip.
+.PP
+GREP_OPTIONS are passed directly to grep.
+The exit status from grep is preserved.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-gzip\fR
+use gzip as default decompressor
+.TP
+\fB\-\-bzip2\fR
+use bzip2 as default decompressor
+.TP
+\fB\-\-lzip\fR
+use lzip as default decompressor (default)
+.SH "REPORTING BUGS"
+Report bugs to lzip\-bug@nongnu.org
+Lzip home page: http://www.nongnu.org/lzip/lzip.html
+.SH COPYRIGHT
+Copyright \(co 2009 Antonio Diaz Diaz.
+This script is free software: you have unlimited permission
+to copy, distribute and modify it.
diff --git a/doc/lzip.1 b/doc/lzip.1
index 0ec87e3..46661ef 100644
--- a/doc/lzip.1
+++ b/doc/lzip.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH LZIP "1" "June 2009" "Lzip 1.6-pre3" "User Commands"
+.TH LZIP "1" "June 2009" "Lzip 1.6" "User Commands"
 .SH NAME
-Lzip \- manual page for Lzip 1.6-pre3
+Lzip \- manual page for Lzip 1.6
 .SH SYNOPSIS
 .B lzip
 [\fIoptions\fR] [\fIfiles\fR]
diff --git a/doc/lzip.info b/doc/lzip.info
index dc66a8b..342940b 100644
--- a/doc/lzip.info
+++ b/doc/lzip.info
@@ -11,7 +11,7 @@ File: lzip.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Lzip
 ****
 
-This manual is for Lzip (version 1.6-pre3, 3 June 2009).
+This manual is for Lzip (version 1.6, 22 June 2009).
 
 * Menu:
 
@@ -559,15 +559,15 @@ Concept Index
 
 Tag Table:
 Node: Top224
-Node: Introduction965
-Node: Algorithm4288
-Node: Invoking Lzip6514
-Node: File Format10861
-Node: Examples12815
-Node: Lzdiff14648
-Node: Lzgrep15967
-Node: Lziprecover17002
-Node: Problems17699
-Node: Concept Index18224
+Node: Introduction961
+Node: Algorithm4284
+Node: Invoking Lzip6510
+Node: File Format10857
+Node: Examples12811
+Node: Lzdiff14644
+Node: Lzgrep15963
+Node: Lziprecover16998
+Node: Problems17695
+Node: Concept Index18220
 
 End Tag Table
diff --git a/doc/lzip.texinfo b/doc/lzip.texinfo
index ec20af9..de1f2ad 100644
--- a/doc/lzip.texinfo
+++ b/doc/lzip.texinfo
@@ -5,8 +5,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 3 June 2009
-@set VERSION 1.6-pre3
+@set UPDATED 22 June 2009
+@set VERSION 1.6
 
 @dircategory Data Compression
 @direntry
diff --git a/doc/lziprecover.1 b/doc/lziprecover.1
new file mode 100644
index 0000000..6173847
--- /dev/null
+++ b/doc/lziprecover.1
@@ -0,0 +1,35 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH LZIPRECOVER "1" "June 2009" "Lziprecover 1.6" "User Commands"
+.SH NAME
+Lziprecover \- manual page for Lziprecover 1.6
+.SH SYNOPSIS
+.B lziprecover
+[\fIoptions\fR] \fIfile\fR
+.SH DESCRIPTION
+Lziprecover \- Member recoverer program for lzip compressed files.
+.PP
+Searches for members in .lz files, and writes each member in its own .lz
+file. You can then use `lzip \fB\-t\fR' to test the integrity of the resulting
+files, and decompress those which are undamaged.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+suppress all messages
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+be verbose (a 2nd \fB\-v\fR gives more)
+.SH "REPORTING BUGS"
+Report bugs to lzip\-bug@nongnu.org
+Lzip home page: http://www.nongnu.org/lzip/lzip.html
+.SH COPYRIGHT
+Copyright \(co 2009 Antonio Diaz Diaz.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.