From: Glenn Morris <rgm@gnu.org>
Date: Fri, 24 Apr 2015 18:34:37 +0000 (-0400)
Subject: * build-aux/gitlog-to-emacslog: Convert "Fixes:" to "(Bug#)".
X-Git-Tag: emacs-25.0.90~2316
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/9eabc76e5b6079c4a97964db83e2b6f53fd0f436

* build-aux/gitlog-to-emacslog: Convert "Fixes:" to "(Bug#)".

Fixes: debbugs:20325
---

diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index 2b82115a49..d994d140fe 100755
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -4,6 +4,8 @@
 
 # Copyright (C) 2014-2015 Free Software Foundation, Inc.
 
+# Author: Paul Eggert
+
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -17,8 +19,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Written by Paul Eggert
-
 LC_ALL=C
 export LC_ALL
 
@@ -38,6 +38,14 @@ ${srcprefix}build-aux/gitlog-to-changelog --ignore-matching='^; ' \
 
 if test -s "${distprefix}ChangeLog.tmp"; then
 
+  # Fix up bug references.
+  # This would be better as eg a --transform option to gitlog-to-changelog,
+  # but... effort.  FIXME does not handle rare cases like:
+  # Fixes: debbugs:19434 debbugs:19519
+  sed 's/	Fixes: \(debbugs:\|bug#\)\([0-9][0-9]*\)/	(Bug#\2)/' \
+      "${distprefix}ChangeLog.tmp" > "${distprefix}ChangeLog.tmp2"
+  mv "${distprefix}ChangeLog.tmp2" "${distprefix}ChangeLog.tmp"
+
   # Find the years covered by the generated ChangeLog, so that
   # a proper copyright notice can be output.
   years=`