From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 22 Feb 2010 17:53:51 +0000 (+0100)
Subject: Deprecate dist-lzma in favor of dist-xz.
X-Git-Tag: v1.11.1b~92^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c84e89177b242a6133aff742e32309009e90374d;p=thirdparty%2Fautomake.git

Deprecate dist-lzma in favor of dist-xz.

* doc/automake.texi (The Types of Distributions, Options):
Adjust text to reflect renaming of lzma to xz.
* NEWS: Update.
Missing deprecation noted by Antonio Diaz Diaz.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 1729fea20..003a33060 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Deprecate dist-lzma in favor of dist-xz.
+	* doc/automake.texi (The Types of Distributions, Options):
+	Adjust text to reflect renaming of lzma to xz.
+	* NEWS: Update.
+	Missing deprecation noted by Antonio Diaz Diaz.
+
 2010-02-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	Add tests about support of wildcards in EXTRA_DIST.
diff --git a/NEWS b/NEWS
index 22846804b..a3ce191e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 New in 1.11.0a:
 
+* Miscellaneous changes:
+
+  - The `lzma' compression scheme and associated automake option `dist-lzma'
+    is obsoleted by `xz' and `dist-xz' due to upstream changes.
+
 Bugs fixed in 1.11.0a:
 
 * Bugs introduced by 1.11:
diff --git a/doc/automake.texi b/doc/automake.texi
index da4ac25ff..f319075c5 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8444,6 +8444,8 @@ Generate a gzip tar archive of the distribution.
 @item @code{dist-lzma}
 Generate an @samp{lzma} tar archive of the distribution.  @command{lzma}
 archives are frequently smaller than @command{bzip2}-compressed archives.
+The @samp{lzma} format is obsolete, you should use the @samp{xz} format
+instead.
 @trindex dist-lzma
 
 @item @code{dist-shar}
@@ -8453,7 +8455,7 @@ Generate a shar archive of the distribution.
 @item @code{dist-xz}
 Generate an @samp{xz} tar archive of the distribution.  @command{xz}
 archives are frequently smaller than @command{bzip2}-compressed archives.
-The @samp{xz} format will soon (early 2009) displace the @samp{lzma} format.
+The @samp{xz} format displaces the obsolete @samp{lzma} format.
 @trindex dist-xz
 
 @item @code{dist-zip}
@@ -8992,7 +8994,7 @@ Hook @code{dist-bzip2} to @code{dist}.
 @item @option{dist-lzma}
 @cindex Option, @option{dist-lzma}
 @opindex dist-lzma
-Hook @code{dist-lzma} to @code{dist}.
+Hook @code{dist-lzma} to @code{dist}.  Obsoleted by @code{dist-xz}.
 @trindex dist-lzma
 
 @item @option{dist-shar}
@@ -9261,7 +9263,7 @@ In order to use this option with C sources, you should add
 These three mutually exclusive options select the tar format to use
 when generating tarballs with @samp{make dist}.  (The tar file created
 is then compressed according to the set of @option{no-dist-gzip},
-@option{dist-bzip2}, @option{dist-lzma} and @option{dist-tarZ} options in use.)
+@option{dist-bzip2}, @option{dist-xz} and @option{dist-tarZ} options in use.)
 
 These options must be passed as arguments to @code{AM_INIT_AUTOMAKE}
 (@pxref{Macros}) because they can require additional configure checks.