From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 22 Feb 2010 21:16:34 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3092078407feadbd3d76e4d82c4685467d2e6d2;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

d3092078407feadbd3d76e4d82c4685467d2e6d2
diff --cc NEWS
index 704302e8a,a3ce191e7..ebb52d63d
--- a/NEWS
+++ b/NEWS
@@@ -10,11 -2,10 +10,14 @@@ New in 1.11a
  
  * Miscellaneous changes:
  
 +  - The `dist' and `dist-all' targets now can run compressors in parallel.
 +
+   - 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 fixed in 1.11a:
 +
 +  - Lots of minor bugfixes.
  
  * Bugs introduced by 1.11:
  
diff --cc tests/Makefile.am
index ec28566a4,4b73a627e..de56d3697
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -312,7 -306,9 +312,10 @@@ extra5.test 
  extra6.test \
  extra7.test \
  extra8.test \
 +extra9.test \
+ extra10.test \
+ extra11.test \
+ extra12.test \
  f90only.test \
  flavor.test \
  flibs.test \
diff --cc tests/Makefile.in
index d7e9cd593,709739e41..9da84246f
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -554,7 -541,9 +554,10 @@@ extra5.test 
  extra6.test \
  extra7.test \
  extra8.test \
 +extra9.test \
+ extra10.test \
+ extra11.test \
+ extra12.test \
  f90only.test \
  flavor.test \
  flibs.test \