Merging upstream version 1.0~rc6.

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

1 files changed, 46 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b2c1d0..fb6093e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,54 @@
+2013-03-15  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.0-rc6 released.
+	* zdiff.cc (set_data_feeder): Call decompressor with option "-q"
+	  only if verbosity < 0.
+	* zutils.cc (set_data_feeder): Likewise.
+
+2013-02-21  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.0-rc5 released.
+	* main.cc (main): Zgrep now shows file names by default when
+	  '--recursive' is selected.
+	* zcmp.cc: Fixed deadlock when '-n' option is used.
+	* main.cc: Use 'setmode' instead of '_setmode' on Windows and OS/2.
+
+2012-12-04  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.0-rc4 released.
+	* main.cc (main): Make 'grep_show_name' tri-state so that file name
+	  is no prefixed to output by default when searching one file.
+	* zcat.cc (Line_number): Fixed a portability issue with Solaris 9.
+
+2012-10-26  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.0-rc3 released.
+	* Added new option '--format' to all utilities.
+	* Makefile.in: Added new target 'install-bin'.
+
+2012-04-30  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.0-rc2 released.
+	* Minor fixes.
+	* configure: 'datadir' renamed to 'datarootdir'.
+
+2012-01-18  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.0-rc1 released.
+	* Changed quote characters in messages as advised by GNU Standards.
+	* INSTALL: Document installing zutils along with GNU gzip.
+
 2011-01-11  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 0.9 released.
-	* configure: Added new options `DIFF' and `GREP'.
+	* configure: Added new options 'DIFF' and 'GREP'.
 	* zcmp.cc: Fixed deadlock when files differ.
 	* zgrep.cc: Fixed deadlock when binary file matches.
 
 2010-11-15  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 0.8 released.
-	* main.cc: Added new options `--zcat', `--zgrep' and `--ztest'.
+	* main.cc: Added new options '--zcat', '--zgrep' and '--ztest'.
 	* zcat.cc: New file implementing zcat+cat functionality in C++.
 	* zcmp.cc: New file implementing zcmp+cmp functionality in C++.
 	* doc/zcmp.1: New file.
@@ -20,7 +60,7 @@
 	  documentation because egrep and fgrep are deprecated.
 	* ztest.cc: New file implementing ztest functionality in C++.
 	* Makefile.in: Added quotes to directory names.
-	* testsuite/check.sh: Use `test.txt' instead of `COPYING' for testing.
+	* testsuite/check.sh: Use 'test.txt' instead of 'COPYING' for testing.
 	* Removed environment safeguards from configure as requested by
 	  Richard Stallman. Now environment variables affect configure.
 
@@ -28,14 +68,14 @@
 
 	* Version 0.7 released.
 	* Added new utility; ztest.
-	* zcat.in: Added new option `--recursive'.
+	* zcat.in: Added new option '--recursive'.
 
 2009-10-05  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 0.6 released.
 	* zcat.in, zgrep.in: Removed again default compressor. Format of
 	  data read from stdin is now automatically detected.
-	* Makefile.in: Added `--name' option to help2man invocation.
+	* Makefile.in: Added '--name' option to help2man invocation.
 
 2009-10-01  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
@@ -66,7 +106,7 @@
 	* Version 0.1 released.
 
 
-Copyright (C) 2009, 2010, 2011 Antonio Diaz Diaz.
+Copyright (C) 2009, 2010, 2011, 2012, 2013 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