fix: remove duplicated ChangeLog entries

diff --git a/ChangeLog b/ChangeLog
index 6a96524dc8f7d79c399dddb6aff72d7274c326b9..758814e441ab3b849b7835a0d27440eda330f1a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,42 +1,3 @@
-2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
-
-       java: allow both JAVA and nobase_JAVA in the same Makefile.am
-       * automake.in (handle_java): Also strip `nobase_' from the given
-       prefix, when needed.
-       * tests/java-clean.test: Update and extend.
-       * tests/java-compile-install.test: Likewise.
-       * tests/java-no-duplicate.test: Likewise.
-       * tests/java-sources.test: Likewise.
-       * tests/java-noinst.test: Likewise.
-       * tests/java-mix-dist-nodist.test: Renamed to ...
-       * tests/java-mix.test: ... this, and extended.
-       * tests/java-nobase.test: New test, still xfailing due to
-       unrelated issues.
-       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
-
-2011-04-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
-
-       java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
-       Fixes automake bug#8434.
-       * automake.in (handle_java): Strip `dist_' and `nodist_' from
-       the given prefix.  Define a new internal Makefile variable
-       `am__java_sources'.  Related adjustments.
-       * lib/am/java.am (JAVAC, JAVAROOT, CLASSPATH_ENV): Define only the
-       first time this am file is processed.
-       (class%DIR%.stamp): Stamp file renamed ...
-       (class%NDIR%.stamp): ... to this, so that the `dist_' and `nodist_'
-       prefixes are stripped from the name of the stampfile.  Adjust
-       declaration of dependencies by using the new automake-generated
-       internal variable `$(am__java_sources)'.  In the rule, use `$@'
-       as the name of the target, rather than hard-coding it.
-       * tests/java.test: Update and extend.
-       * tests/java-no-duplicate.test: New test.
-       * tests/java-mix-dist-nodist.test: Likewise.
-       * tests/java-compile-and-install.test: Likewise.
-       * tests/java-clean.test: Likewise.
-       * tests/java-sources.test: Likewise.
-       * tests/Makefile.am (TESTS): Update.
-
 2011-09-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: fix spurious failure on fast machines