maint: support amending the generated ChangeLog, and fix a typo

* Makefile.am (gitlog_to_changelog_options): Add support for
amending the generated ChangeLog.
(EXTRA_DIST): Update.
* .git-log-fix: New file with things to amend to the generated
ChangeLog, starting with a fix for a typo in v1.11-1963-g3b369e6
"maint: use AC_PACKAGE_BUGREPORT to avoid duplication" from
yesterday.

diff --git a/.git-log-fix b/.git-log-fix
new file mode 100755 (executable)
index 0000000..561181d
--- /dev/null
+++ b/.git-log-fix
@@ -0,0 +1,8 @@
+# This file is expected to be used via gitlog-to-changelog's --amend=FILE
+# option.  It specifies what changes to make to each given SHA1's commit
+# log and metadata, using Perl-eval'able expressions.
+
+3b369e6bbe0fb6d7359398935706c87dd9375cb6
+# Date:   Thu Feb 16 22:29:32 2012 +0100
+# Fix a typo.
+s| bur | bug |

diff --git a/Makefile.am b/Makefile.am
index b11e8fd..ce0e0b4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,7 @@ EXTRA_DIST = \
   ChangeLog.09 \
   ChangeLog.11 \
   bootstrap \
+  $(gitlog_to_changelog_fixes) \
   $(AUTOMAKESOURCES)
 
 ## Make versioned links.  We only run the transform on the root name;
@@ -117,7 +118,9 @@ recheck:
 ##
 
 gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
-gitlog_to_changelog_options = --since='2011-12-28 00:00:00' \
+gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
+gitlog_to_changelog_options = --amend=$(gitlog_to_changelog_fixes) \
+                              --since='2011-12-28 00:00:00' \
                               --no-cluster --format '%s%n%n%b'
 
 # Automatic generation of the ChangeLog from git history.