Merging upstream version 1.12.

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

1 files changed, 10 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 90840c5..de510fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2022-12-05  Antonio Diaz Diaz  <antonio@gnu.org>
+2023-01-07  Antonio Diaz Diaz  <antonio@gnu.org>
 
-	* Version 1.12-rc1 released.
+	* Version 1.12 released.
 	* zutilsrc: Rename to zutils.conf. Search for it in $XDG_CONFIG_HOME.
 	  (Suggested by Adam Tuja).
 	* Allow '-O, --force-format' force also uncompressed format.
@@ -10,29 +10,20 @@
 	  Assign short name '-q' to options '--quiet' and '--silent'.
 	  Separate option '-l, --list' from '-v, --verbose'.
 	  (cmp): Print byte and line in EOF message like GNU cmp.
+	* zgrep.cc: New options '-G, --basic-regexp', '--label=<label>',
+	  '--line-buffered', '-P, --perl-regexp', '--silent',
+	  '-T, --initial-tab', '-U, --binary'. (Reported by Chris Jamboretz).
+	  New option '-Z, --null'. (Reported by Leah Neukirchen).
 	* ztest.cc: Exit with status 2 if a file has wrong extension.
-	* zupdate.cc: New option '-d, --destdir'.
+	* zupdate.cc: New options '-d, --destdir', '-e, --expand-extensions',
+	  '-i, --ignore-errors'. ('-i' suggested by Antoni Sawicki).
 	  (zupdate_file): Pass '-q -s' to zcmp if verbosity < 0.
+	* Support compress'd (.Z) files through gzip in all utilities.
 	* rc.cc (show_version): Print the versions of the compressors used.
 	  (show_option_error): New function showing argument and option name.
 	* zutils.texi: Document that format is detected by its magic bytes.
 	* check.sh: Test tarlz (if available) as compressor for zupdate.
 
-2022-04-12  Antonio Diaz Diaz  <antonio@gnu.org>
-
-	* Version 1.12-pre2 released.
-	* zgrep.cc: Accept option '-Z, --null'. (Reported by Leah Neukirchen).
-	* zupdate.cc: New options '-e, --expand-extensions',
-	  '-i, --ignore-errors'. ('-i' suggested by Antoni Sawicki).
-	* Support compress'd (.Z) files through gzip in all utilities.
-
-2022-03-06  Antonio Diaz Diaz  <antonio@gnu.org>
-
-	* Version 1.12-pre1 released.
-	* zgrep.cc: Accept options '-G, --basic-regexp', '--label=<label>',
-	  '--line-buffered', '-P, --perl-regexp', '--silent',
-	  '-T, --initial-tab', '-U, --binary'. (Reported by Chris Jamboretz).
-
 2022-01-25  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.11 released.
@@ -229,7 +220,7 @@
 	* Version 0.1 released.
 
 
-Copyright (C) 2009-2022 Antonio Diaz Diaz.
+Copyright (C) 2009-2023 Antonio Diaz Diaz.
 
 This file is a collection of facts, and thus it is not copyrightable,
 but just in case, you have unlimited permission to copy, distribute, and