summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/ChangeLog-2011 (renamed from m4/ChangeLog)11
-rw-r--r--m4/Makefile.am5
2 files changed, 12 insertions, 4 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog-2011
index b13bd4f20..d466275a2 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01 Werner Koch <wk@g10code.com>
+
+ NB: ChangeLog files are no longer manually maintained. Starting
+ on December 1st, 2011 we put change information only in the GIT
+ commit log, and generate a top-level ChangeLog file from logs at
+ "make dist". See doc/HACKING for details.
+
2011-09-12 Werner Koch <wk@g10code.com>
* libcurl.m4: Fix lost hash sign introduced by previous change.
@@ -162,3 +169,7 @@
* uintmax_t.m4: New file, from gettext-0.11.5.
* ulonglong.m4: New file, from gettext-0.11.5.
* Makefile.am: New file.
+
+Local Variables:
+buffer-read-only: t
+End:
diff --git a/m4/Makefile.am b/m4/Makefile.am
index d0d84e23d..f94c0c1b2 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -12,7 +12,4 @@ EXTRA_DIST += estream.m4
EXTRA_DIST += sys_socket_h.m4 socklen.m4
-
-
-
-
+EXTRA_DIST += ChangeLog-2011