Re: support for lzip

[Ralf Wildenhues]

* Ralf Wildenhues wrote on Sat, Feb 20, 2010 at 06:09:48PM CET:
> * Antonio Diaz Diaz wrote on Thu, Feb 18, 2010 at 07:28:07PM CET:
> > Ralf Wildenhues wrote:
> > >Well, to be honest, I regard the addition of lzma support as a mistake
> > >in hindsight.  We should have waited and added xz support only, with a
> > >stable xz release.  It was also a mistake that I did not deprecate lzma
> > >support more prominently in the 1.11 release; will fix that for 1.11.1.
> > 
> > It seems this has not been fixed in 1.11.1.
> 
> Darn.  Thanks for the reminder.

Done as follows.

Cheers,
Ralf

    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.

diff --git a/NEWS b/NEWS
index 2284680..a3ce191 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 da4ac25..f319075 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8444,6 +8444,8 @@ The Types of Distributions
 @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 @@ The Types of Distributions
 @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 @@ Options
 @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 @@ Options
 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},
address@hidden, @option{dist-lzma} and @option{dist-tarZ} options in use.)
address@hidden, @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.