Merge branches 'remove-acdir-option' and 'remove-obsolete-m4'

[platform/upstream/automake.git] / NEWS

diff --git a/NEWS b/NEWS
index 4e49512..8653603 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,21 +1,12 @@
-New in 1.12:
+New in 1.13:
 
-* WARNING: Future backward-incompatibilities!
+* Obsolete features removed:
 
-  - Starting from the next major Automake version (1.13), the rules to
-    build pdf, ps and dvi output from Texinfo input will use the '--tidy'
-    option by default.  Since such an option was introduced in Texinfo
-    4.9, this means that Makefiles generated by future Automake versions
-    will require at least that version of Texinfo.
+  - The deprecated aclocal option '--acdir' has been removed.  You
+    should use the options '--automake-acdir' and '--system-acdir'
+    instead (which have been introduced in Automake 1.11.2).
 
-  - Starting from the next major Automake version (1.13), the parallel
-    testsuite harness (previously only enabled by the 'parallel-tests'
-    option) will become the default one; the older serial testsuite
-    harness will still be available through the use of the 'serial-tests'
-    option.
-
-  - The following long-obsolete m4 macros will be removed in the
-    next major Automake version (1.13):
+  - The following long-obsolete m4 macros have been removed:
 
       AM_PROG_CC_STDC:    superseded by AC_PROG_CC since October 2002
       fp_PROG_CC_STDC:    broken alias for AM_PROG_CC_STDC
@@ -29,8 +20,25 @@ New in 1.12:
                           of the now-removed automatic de-ANSI-fication
                           support of Automake)
 
-  - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
-    the next major Automake version (1.13).
+  - All the "old alias" macros in 'm4/obsolete.m4' have been removed.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.12:
+
+* WARNING: Future backward-incompatibilities!
+
+  - Starting from the next major Automake version (1.13), the rules to
+    build pdf, ps and dvi output from Texinfo input will use the '--tidy'
+    option by default.  Since such an option was introduced in Texinfo
+    4.9, this means that Makefiles generated by future Automake versions
+    will require at least that version of Texinfo.
+
+  - Starting from the next major Automake version (1.13), the parallel
+    testsuite harness (previously only enabled by the 'parallel-tests'
+    option) will become the default one; the older serial testsuite
+    harness will still be available through the use of the 'serial-tests'
+    option.
 
   - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option)
     will be deprecated in the next minor version of Automake (1.12.1) and
@@ -45,11 +53,6 @@ New in 1.12:
     all be deprecated in the next minor version of Automake (1.12.1)
     and removed in the next major version (1.13).
 
-  - The '--acdir' option of aclocal is deprecated, and will probably
-    be removed in the next major Automake release (1.13).  You should
-    use the options '--automake-acdir' and '--system-acdir' instead
-    (which have been introduced in Automake 1.11.2).
-
   - The exact order in which the directories in the aclocal macro
     search path are looked up is probably going to be changed in the
     next Automake release (1.13).