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 1729fea20198cebd499220e404702522e6f0660c..003a33060f6469a5023b60eba25416a5de47d095 100644 (file)
--- 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 22846804bd8ab88cd70322ab83bf9949f1de6337..a3ce191e76d19a0090401531d7bea614c9780f15 100644 (file)
--- 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 da4ac25ff34aa79ba79a2fd3dab81a70581fe776..f319075c5f3f5b3a9b52fd0372e8022bd1c497b2 100644 (file)
--- 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.