Merging upstream version 1.12.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 38 insertions, 43 deletions

diff --git a/doc/zcat.1 b/doc/zcat.1
index 84cb6f4..8fc6d51 100644
--- a/doc/zcat.1
+++ b/doc/zcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZCAT "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZCAT "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zcat \- decompress and concatenate files to standard output
 .SH SYNOPSIS
@@ -102,7 +102,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zcmp.1 b/doc/zcmp.1
index 73c1b44..9071c36 100644
--- a/doc/zcmp.1
+++ b/doc/zcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZCMP "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZCMP "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zcmp \- decompress and compare two files byte by byte
 .SH SYNOPSIS
@@ -94,7 +94,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zdiff.1 b/doc/zdiff.1
index a5ff42b..05a95cd 100644
--- a/doc/zdiff.1
+++ b/doc/zdiff.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZDIFF "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZDIFF "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zdiff \- decompress and compare two files line by line
 .SH SYNOPSIS
@@ -125,7 +125,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zgrep.1 b/doc/zgrep.1
index 79acdf2..19d6909 100644
--- a/doc/zgrep.1
+++ b/doc/zgrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZGREP "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZGREP "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zgrep \- search compressed files for a regular expression
 .SH SYNOPSIS
@@ -175,7 +175,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/ztest.1 b/doc/ztest.1
index 5eb3bb4..73f3f8c 100644
--- a/doc/ztest.1
+++ b/doc/ztest.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZTEST "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZTEST "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 ztest \- verify the integrity of compressed files
 .SH SYNOPSIS
@@ -83,7 +83,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zupdate.1 b/doc/zupdate.1
index 4a8c0b1..5731862 100644
--- a/doc/zupdate.1
+++ b/doc/zupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH ZUPDATE "1" "December 2022" "zutils 1.12-rc1" "User Commands"
+.TH ZUPDATE "1" "January 2023" "zutils 1.12" "User Commands"
 .SH NAME
 zupdate \- recompress bzip2, gzip, xz, zstd files to lzip format
 .SH SYNOPSIS
@@ -47,7 +47,7 @@ output version information and exit
 write recompressed files into <dir>
 .TP
 \fB\-e\fR, \fB\-\-expand\-extensions\fR
-expand combined extensions; tgz \-> tar.lz
+expand combined extensions; tgz \fB\-\-\fR> tar.lz
 .TP
 \fB\-f\fR, \fB\-\-force\fR
 don't skip a file even if the .lz exists
@@ -103,7 +103,7 @@ Report bugs to zutils\-bug@nongnu.org
 .br
 Zutils home page: http://www.nongnu.org/zutils/zutils.html
 .SH COPYRIGHT
-Copyright \(co 2022 Antonio Diaz Diaz.
+Copyright \(co 2023 Antonio Diaz Diaz.
 License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/doc/zutils.info b/doc/zutils.info
index ea12cc3..a344507 100644
--- a/doc/zutils.info
+++ b/doc/zutils.info
@@ -11,7 +11,7 @@ File: zutils.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Zutils Manual
 *************
 
-This manual is for Zutils (version 1.12-rc1, 5 December 2022).
+This manual is for Zutils (version 1.12, 7 January 2023).
 
 * Menu:
 
@@ -28,7 +28,7 @@ This manual is for Zutils (version 1.12-rc1, 5 December 2022).
 * Concept index::       Index of concepts
 
 
-   Copyright (C) 2009-2022 Antonio Diaz Diaz.
+   Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
    This manual is free documentation: you have unlimited permission to copy,
 distribute, and modify it.
@@ -825,10 +825,6 @@ the original file is not deleted. The operation of 'zupdate' is meant to be
 safe and not cause any data loss. Therefore, existing lzip compressed files
 are never overwritten nor deleted.
 
-   Recompressing files from a read-only file system to another place can be
-done by first linking the files from the destination directory and then
-compressing the links: 'ln -s /src/foo.gz . && zupdate foo.gz'
-
    Combining the options '--force' and '--keep', as in
 'zupdate -f -k *.gz', verifies that there are no differences between each
 pair of files in a multiformat set of files.
@@ -838,7 +834,7 @@ extensions:
 '.bz2', '.gz', '.xz', '.zst', or '.Z', which are recompressed to '.lz';
 '.tbz', '.tbz2', '.tgz', '.txz', or '.tzst', which are recompressed to
 '.tlz'.
-Keeping the combined extensions ('.tgz' -> '.tlz') may be useful when
+Keeping the combined extensions ('.tgz' --> '.tlz') may be useful when
 recompressing Slackware packages, for example.
 
    Bzip2, gzip, and lzip are the primary formats. Xz and zstd are optional.
@@ -899,7 +895,8 @@ compressor can't be run, or comparison fails).
 '-k'
 '--keep'
      Keep (don't delete) the input file after comparing it with the lzip
-     file.
+     file. Use it when recompressing files from a read-only file system.
+     (See option '--destdir' above).
 
 '-l'
 '--lzip-verbose'
@@ -987,20 +984,20 @@ Concept index
 
 Tag Table:
 Node: Top217
-Node: Introduction1156
-Node: Common options4003
-Ref: version4489
-Ref: compressor-requirements6440
-Node: Configuration6835
-Node: Zcat7868
-Node: Zcmp10568
-Node: Zdiff14825
-Node: Zgrep18008
-Node: Ztest24116
-Node: Zupdate26915
-Ref: lz-compressor32442
-Node: Problems33143
-Node: Concept index33677
+Node: Introduction1151
+Node: Common options3998
+Ref: version4484
+Ref: compressor-requirements6435
+Node: Configuration6830
+Node: Zcat7863
+Node: Zcmp10563
+Node: Zdiff14820
+Node: Zgrep18003
+Node: Ztest24111
+Node: Zupdate26910
+Ref: lz-compressor32325
+Node: Problems33026
+Node: Concept index33560
 
 End Tag Table
 
diff --git a/doc/zutils.texi b/doc/zutils.texi
index 459d38d..a263099 100644
--- a/doc/zutils.texi
+++ b/doc/zutils.texi
@@ -6,8 +6,8 @@
 @finalout
 @c %**end of header
 
-@set UPDATED 5 December 2022
-@set VERSION 1.12-rc1
+@set UPDATED 7 January 2023
+@set VERSION 1.12
 
 @dircategory Compression
 @direntry
@@ -50,7 +50,7 @@ This manual is for Zutils (version @value{VERSION}, @value{UPDATED}).
 @end menu
 
 @sp 1
-Copyright @copyright{} 2009-2022 Antonio Diaz Diaz.
+Copyright @copyright{} 2009-2023 Antonio Diaz Diaz.
 
 This manual is free documentation: you have unlimited permission to copy,
 distribute, and modify it.
@@ -906,10 +906,6 @@ file is not deleted. The operation of @command{zupdate} is meant to be safe
 and not cause any data loss. Therefore, existing lzip compressed files are
 never overwritten nor deleted.
 
-Recompressing files from a read-only file system to another place can be
-done by first linking the files from the destination directory and then
-compressing the links: @w{@samp{ln -s /src/foo.gz . && zupdate foo.gz}}
-
 Combining the options @option{--force} and @option{--keep}, as in
 @w{@samp{zupdate -f -k *.gz}}, verifies that there are no differences
 between each pair of files in a multiformat set of files.
@@ -919,7 +915,7 @@ The names of the original files must have one of the following extensions:@*
 recompressed to @samp{.lz};@*
 @samp{.tbz}, @samp{.tbz2}, @samp{.tgz}, @samp{.txz}, or @samp{.tzst}, which
 are recompressed to @samp{.tlz}.@*
-Keeping the combined extensions @w{(@samp{.tgz} --> @samp{.tlz})} may be
+Keeping the combined extensions @w{(@samp{.tgz} ---> @samp{.tlz})} may be
 useful when recompressing Slackware packages, for example.
 
 Bzip2, gzip, and lzip are the primary formats. Xz and zstd are optional. If
@@ -984,6 +980,8 @@ Ignore non-fatal errors. (See exit status above).
 @item -k
 @itemx --keep
 Keep (don't delete) the input file after comparing it with the lzip file.
+Use it when recompressing files from a read-only file system. (See option
+@option{--destdir} above).
 
 @item -l
 @itemx --lzip-verbose