Merging upstream version 1.3.

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

1 files changed, 20 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a8a0a1..b8264e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,30 +1,41 @@
+2012-02-25  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.3 released.
+	* main.c (close_and_set_permissions): Inability to change output
+	  file attributes has been downgraded from error to warning.
+	* encoder.c (Mf_init): Return false if out of memory instead of
+	  calling cleanup_and_fail.
+	* Small change in '--help' output and man page.
+	* Changed quote characters in messages as advised by GNU Standards.
+	* configure: 'datadir' renamed to 'datarootdir'.
+
 2011-05-18  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 1.2 released.
-	* main.c: Added new option `-F, --recompress'.
+	* main.c: Added new option '-F, --recompress'.
 	* main.c (decompress): Print only one status line for each
-	  multimember file when only one `-v' is specified.
+	  multi-member file when only one '-v' is specified.
 	* encoder.h (Lee_update_prices): Update high length symbol prices
-	  independently of the value of `pos_state'. This gives better
-	  compression for large values of `--match-length' without being
+	  independently of the value of 'pos_state'. This gives better
+	  compression for large values of '--match-length' without being
 	  slower.
 	* encoder.h encoder.c: Optimize pair price calculations. This
-	  reduces compression time for large values of `--match-length'
+	  reduces compression time for large values of '--match-length'
 	  by up to 6%.
 
 2011-01-11  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 1.1 released.
-	* Code has been converted to `C89 + long long' from C99.
+	* Code has been converted to 'C89 + long long' from C99.
 	* main.c: Fixed warning about fchown return value being ignored.
-	* decoder.c: `-tvvvv' now shows compression ratio.
+	* decoder.c: '-tvvvv' now shows compression ratio.
 	* main.c: Match length limit set by options -1 to -8 has been
 	  reduced to extend range of use towards gzip. Lower numbers now
 	  compress less but faster. (-1 now takes 43% less time for only
 	  20% larger compressed size).
 	* encoder.c: Compression of option -9 has been slightly increased.
 	* main.c (open_instream): Do not show the message
-	  " and `--stdout' was not specified" for directories, etc.
+	  " and '--stdout' was not specified" for directories, etc.
 	* New examples have been added to the manual.
 
 2010-04-05  Antonio Diaz Diaz  <ant_diaz@teleline.es>
@@ -34,7 +45,7 @@
 	* Translated to C from the C++ source of lzip 1.10.
 
 
-Copyright (C) 2010, 2011 Antonio Diaz Diaz.
+Copyright (C) 2010, 2011, 2012 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