[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1035-g9bb2b6f

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9bb2b6f474d6a1e1371c82323726449ef2daac02

The branch, master has been updated
       via  9bb2b6f474d6a1e1371c82323726449ef2daac02 (commit)
       via  60a52756639ead678f500a25c094fd525c9cdef5 (commit)
       via  15721c4885b8f24ca9ce2c5f2c42899277a11261 (commit)
      from  8f80364582061d4bb13b74de9cd1ad35556a7afe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9bb2b6f474d6a1e1371c82323726449ef2daac02
Author: Stefano Lattarini <address@hidden>
Date:   Tue Sep 20 20:27:23 2011 +0200

    fix: cleanup NEWS after botched merges

commit 60a52756639ead678f500a25c094fd525c9cdef5
Merge: 8f80364 15721c4
Author: Stefano Lattarini <address@hidden>
Date:   Tue Sep 20 20:21:06 2011 +0200

    Merge branch 'maint'
    
    * maint:
      fix: typo in NEWS

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    8 ++++++++
 NEWS      |   21 +++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d8c45e..0fdb295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-09-20  Stefano Lattarini  <address@hidden>
 
+       * NEWS: Cleanup after botched merges.
+
+2011-09-20  Stefano Lattarini  <address@hidden>
+
+       * NEWS: Fix typo.
+
+2011-09-20  Stefano Lattarini  <address@hidden>
+
        docs: document planned precedence changes in aclocal search path
        * doc/automake.texi (Macro Search Path): Explicitly state that the
        lookup order for extra directories of `.m4' files will be changed
diff --git a/NEWS b/NEWS
index 2b47eea..9f07e5f 100644
--- a/NEWS
+++ b/NEWS
@@ -7,20 +7,9 @@ New in 1.11a:
   - The deprecated options `--output-dir', `--Werror' and `--Wno-error'
     have been removed.
 
-* New targets:
-
-  - New `cscope' target to build a cscope database for the source tree.
-
-  - The `--acdir' option of aclocal is deprecated, and will probably be
-    removed in the next major Automake release (1.12).
-
-  - 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.12).
-
 * Changes to aclocal:
 
-  - The `--acdir' option is deprecated.  Now you should use th new options
+  - The `--acdir' option is deprecated.  Now you should use the new options
     `--automake-acdir' and `--system-acdir' instead.
 
   - The `ACLOCAL_PATH' environment variable is now interpreted as a
@@ -28,6 +17,14 @@ New in 1.11a:
     automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION)
     and before the system acdir (by default ${prefix}/share/aclocal).
 
+  - 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.12).
+
+* New targets:
+
+  - New `cscope' target to build a cscope database for the source tree.
+
 * Miscellaneous changes:
 
   - The `dist' and `dist-all' targets now can run compressors in parallel.


hooks/post-receive
-- 
GNU Automake