news: fix botched merges, some cleanups

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/NEWS b/NEWS
index c71ef84..dd6c636 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -49,10 +49,6 @@ New in 1.11.3a:
 
 Bugs fixed in 1.11.3a:
 
-* Bugs introduced by 1.11.3:
-
-  - NONE YET
-
 * Bugs introduced by 1.11.2:
 
   - A definition of 'noinst_PYTHON' before 'python_PYTHON' (or similar)
@@ -69,6 +65,17 @@ Bugs fixed in 1.11.3a:
     '-I' is non-existent, aclocal will now create it before trying to copy
     files in it.
 
+  - An empty declaration of a "foo_PRIMARY" don't cause anymore the
+    generated install rules to create an empty $(foodir) directory;
+    for example, if Makefile.am contains something like:
+
+      pkglibexec_SCRIPTS =
+      if FALSE
+      pkglibexec_SCRIPTS += bar.sh
+      endif
+
+    the $(pkglibexec) directory will not be created upon "make install".
+
 \f
 New in 1.11.3:
 
@@ -218,27 +225,6 @@ Bugs fixed in 1.11.2:
   - The order of Yacc and Lex flags is fixed to be consistent with other
     languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
     $(LFLAGS), so that the user variables override the developer variables.
-  - An empty declaration of a "foo_PRIMARY" don't cause anymore the
-    generated install rules to create an empty $(foodir) directory;
-    for example, if Makefile.am contains something like:
-
-      pkglibexec_SCRIPTS =
-      if FALSE
-      pkglibexec_SCRIPTS += bar.sh
-      endif
-
-    the $(pkglibexec) directory will not be created upon "make install".
-
-  - It is now possible for a foo_SOURCES variable to hold Vala sources
-    together with C header files, as well as with sources and headers for
-    other supported languages (e.g., C++).  Previously, only mixing C and
-    Vala sources was supported.
-
-  - Vala support now works better in VPATH setups.
-
-  - The "deleted header file problem" for *.am files is avoided by stub
-    rules.  This allows `make' to trigger a rerun of `automake' also if
-    some previously needed `.am' file has been removed.
 
   - "make distcheck" now correctly complains also when "make uninstall"
     leaves one and only one file installed in $(prefix).