Merging upstream version 1.13~rc1.

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

1 files changed, 12 insertions, 58 deletions

diff --git a/NEWS b/NEWS
index eeb4662..0f83afd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,64 +1,18 @@
-Changes in version 1.12:
+Changes in version 1.13:
 
-The zutils configuration file 'zutilsrc' has been renamed to 'zutils.conf'.
-Zutils now looks for the configuration file in $XDG_CONFIG_HOME/zutils.conf
-instead of $HOME/.zutilsrc. (XDG_CONFIG_HOME defaults to $HOME/.config).
-(Suggested by Adam Tuja).
+The detection of bzip2 files with no compressed blocks has been fixed.
+(Error introduced in version 1.9).
 
-In zcat, zcmp, zdiff, and zgrep, the option '-O, --force-format' now can
-force also "uncompressed" format.
+When zcat, zcmp, zdiff, or zgrep need to try compressed file names, gzip
+(.gz) is now tried before bzip2 (.bz2).
 
-zcmp now accepts the option '-H, --hexadecimal' to print byte values in
-hexadecimal instead of octal.
+When only one compressed file is passed to zcmp or zdiff, they now try to
+compare it with a compressed file of any of the remaining formats if the
+corresponding uncompressed file does not exist.
 
-In zcmp:
-  The long name of option '-s' has been changed to '--script' following a
-  similar change made to GNU ed.
+zcmp now reports EOF on empty file like GNU cmp:
+"zcmp: EOF on FILE which is empty".
 
-  The short name '-q' has been assigned to options '--quiet' and '--silent'.
+File diagnostics in zupdate have been reformatted as 'PROGRAM: FILE: MESSAGE'.
 
-  Option '-q' now only suppresses diagnostic messages written to stderr.
-
-  Option '-s' now only suppresses messages about file differences written to
-  stdout or stderr.
-
-  Option '-l, --list' is now different from option '-v, --verbose', which
-  now undoes the effect of '--quiet'.
-
-zcmp now prints byte and line in EOF message like GNU cmp:
-"zcmp: EOF on FILE after byte B, in line L".
-
-zgrep now also accepts the following options: '-G, --basic-regexp',
-'--label=<label>', '--line-buffered', '-P, --perl-regexp', '--silent',
-'-T, --initial-tab', '-U, --binary', and '-Z, --null'.
-(Reported by Chris Jamboretz and Leah Neukirchen).
-
-ztest now exits with status 2 if an uncompressed file has a compressed file
-name extension, or if a compressed file has a wrong compressed extension.
-
-zupdate now accepts option '-d, --destdir' to write recompressed files to
-another directory. This allows, for example, recompressing files from a
-read-only file system to another place without needing to copy or link them
-to the destination directory first.
-
-zupdate now accepts option '-e, --expand-extensions', which makes it expand
-combined file name extensions; tgz --> tar.lz.
-
-zupdate now also accepts option '-i, --ignore-errors', which makes it ignore
-non-fatal errors. (Suggested by Antoni Sawicki).
-
-All utilities now support compress'd (.Z) files through gzip. For this to
-work, the gzip program used (for example GNU gzip) must be able to
-decompress .Z files.
-
-At verbosity level 1 (2 for zdiff and zgrep) or higher, '-V, --version' now
-prints the versions of the compressors used (limited by option '-M, --format').
-(The compressors used must support option '-V' for this to work).
-
-Diagnostics caused by invalid arguments to command line options now show the
-argument and the name of the option.
-
-It has been documented in the manual that the data format is detected by its
-magic bytes, not by the file name extension.
-
-The testsuite now tests tarlz (if available) as compressor for zupdate.
+The variable MAKEINFO has been added to configure and Makefile.in.