maint: fixup badly formatted ChangeLog entries.

* build-aux/git-log-fix: Mostly missing category tags and refilling
to 64 columns, but also deleting duplicate entries from merging the
gary/reredo-test-operand-order branch.
* g/build-aux/gitlog-to-changelog.diff: Local patch to prevent
printing unqualified header lines for deleted duplicate patches.
* THANKS: Put email address for Paul Seidler here...
* build-aux/git-log-fix: ...and remove from ChangeLog here.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/THANKS b/THANKS
index b16904c8aea81ff634883e96bf9acab3d0711a9c..ef617e4a74c3fb11d43db9f3a17b998236bf083e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -153,6 +153,7 @@
   Paul Biggar                  paul.biggar@gmail.com
   Paul Eggert                  eggert@twinsun.com
   Paul Laight                  plaight@quantxautomation.co.uk
+  Paul Seidler                 sepek@lavabit.com
   Paweł Daniluk                       pawel@bioexploratorium.pl
   Peter Eisentraut             peter_e@gmx.net
   Peter Fritzsche              peter.fritzsche@gmx.de

diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
index 810c02185fa107922b95bb49d0d9fc770f621a9d..d59a4c95ff3e6ff313dec88c3a115c8e4dceb854 100644 (file)
--- a/build-aux/git-log-fix
+++ b/build-aux/git-log-fix
@@ -2,6 +2,320 @@
 # option.  It specifies what changes to make to each given SHA1's commit
 # log and metadata, using Perl-eval'able expressions.
 
+c82eaf360b1d2797054296c5e894c1271fffb7cf
+# Date:   Sun Oct 21 18:17:52 2012 -0500
+# Add file reference.
+s|(Fixed)|* gl/build-aux/options-parser (func_split_equals): $1|;
+# Add summary line.
+s|(\* gl)|options-parser: fix regexp quoting error.\n$1|;
+# Refill to 64 columns.
+s|func_split_equals shell|expr\nregexp|;
+s|\.  |.\n|
+
+b3e96ce7d1566d6120112f3b10e7782cc62cff8d
+# Date:   Mon Oct  8 17:59:51 2012 +0200
+# No empty lines in a single commit.
+s|\n\n|\n|g;
+# Move Report attribution to the end of the entry.
+s|Report by .*\.\n||;
+s|$|\nReported by Roumen Petrov.|
+
+0f31e375104b00a181557d3809e556066b3d98b1
+# Date:   Mon Oct  8 13:10:02 2012 +0200
+# No empty lines in a single commit.
+s|\n\n|\n|g;
+# Move Report attribution to the end of the entry.
+s|Report by .*\.\n||;
+s|$|\nReported by Roumen Petrov.|
+
+b78fd9740ef6a2ed67a1ef14e76483af784fb5f0
+# Date:   Sun Oct  7 00:57:26 2012 +0200
+# No empty lines in a single commit.
+s|\n\n|\n|g
+
+82791b3fb7043f81391bb36047f8533f4dd11b7b
+# Date:   Sun Oct  7 00:57:10 2012 +0200
+# No empty lines in a single commit.
+s|\n\n|\n|g
+
+a61a1114ae1464c39b54e88d1a30735c7daca4b2
+# Date:   Fri Oct  5 21:43:45 2012 +0200
+# No empty lines in a single commit.
+s|\n\n|\n|g
+
+0b1b67186407f1b03cc0c5bf1882a8db8e0ee2e2
+# Date:   Wed Oct  3 11:49:27 2012 +0700
+# No empty lines in a single commit.
+s|\n\n|\n|g
+
+## Elide duplicate log entries from merge of gary/reredo-test-operand-order
+## branch.
+# Date:   Tue Oct  2 21:05:53 2012 +0700
+4440d6523bf9c668720f9ffa66fb89e91912a504
+s|\n[\s\S]*$||
+
+0fc275469ef020177d8dff2c041456f6b6155537
+s|\n[\s\S]*$||
+
+692bc68dc9a580647a164d6338ca7e13cb593966
+s|\n[\s\S]*$||
+
+6cb0d0d771bc1e3be402929b900000ca7a8a16d4
+s|\n[\s\S]*$||
+
+d50e123595d80b5582d0663ad50e3454051c482d
+s|\n[\s\S]*$||
+
+e0f66dc54d2f7906a2513c68d76362be4bcbbef3
+s|\n[\s\S]*$||
+
+ae68608314993e81836257ac1eec449256decd53
+s|\n[\s\S]*$||
+
+d576fa9da144f2e9ab14337c9590d4abfdea985f
+s|\n[\s\S]*$||
+
+3cbc0e26f0a7f0bbea559912c3da920b4ead8e5e
+s|\n[\s\S]*$||
+
+83d52fd6d2039c048f731133bec0ae8a1bf9382d
+s|\n[\s\S]*$||
+
+1e70622d7c127b4dd90b3a5b0650d323ec2305fc
+s|\n[\s\S]*$||
+
+1fcb9bc4e4b7b7166a6f45da633f813faee6e00f
+s|\n[\s\S]*$||
+
+bf6aa3082089d12bf4500b469c096263823a75b4
+s|\n[\s\S]*$||
+
+43acd6749a29f079452cfb70b6c6e1c8f1469128
+s|\n[\s\S]*$||
+
+8c6e33197e36463cb7fcf5d575a53c3f414ec4ff
+s|\n[\s\S]*$||
+
+7db681a2696c75dc6c55261ea8fd11f92e42db2b
+s|\n[\s\S]*$||
+
+59f8a3a6e1a26d501e5865f7611d8828aac5579c
+s|\n[\s\S]*$||
+
+f2a640f7e03e5dcf1510833a0e1e4991032b5f96
+s|\n[\s\S]*$||
+
+90529a55ef40653051730d3c20203fa2ad5e8f7f
+s|\n[\s\S]*$||
+
+d702946c65b309c389ae717a4d2d6fe158c3ee5f
+s|\n[\s\S]*$||
+
+8392cd263e847a22b2409c35bf03d7c9e68d2cd0
+s|\n[\s\S]*$||
+
+430e782755bbe8061a5e7f9d856b33e3b7da3ac8
+s|\n[\s\S]*$||
+
+d60b4387c178100b0bd3835c61d0f4771330bf6a
+s|\n[\s\S]*$||
+
+47a889a4ca2009e2147fa5b2f95baefe1dca8288
+s|\n[\s\S]*$||
+
+8f975a1368594126e37d85511f1f96164e466d93
+s|\n[\s\S]*$||
+
+f8a4b90f9a712f47b7627d2cf96eed74825df91f
+s|\n[\s\S]*$||
+
+b25625e6b25427dba80051b2924060b1e84ea73e
+s|\n[\s\S]*$||
+
+3467227ccb6c99f4c2122b9fb3fa67d54b5bd54b
+s|\n[\s\S]*$||
+
+8bfac9e3e82646868907aede4ebe4deb158a2e8a
+s|\n[\s\S]*$||
+
+baffe661910947df0dcd5a5bbd6512fc0bce59b9
+s|\n[\s\S]*$||
+
+822881fe3c69ca474b8e13d60243dd9c1a1c3fea
+s|\n[\s\S]*$||
+
+f7f249a0e6b5093b8752f1ba863345bfcd5a237e
+s|\n[\s\S]*$||
+
+c03789b8ee33f136d3bbd7f7a111ad863bb4c7e8
+s|\n[\s\S]*$||
+
+78385ffd8af73b927549c3596da67233f2f92f0e
+s|\n[\s\S]*$||
+
+7d25536e80b68042a6d999c11a0c5c9dc948f82e
+s|\n[\s\S]*$||
+
+7a2a8f32bb83d6b16db8436b530ec5e88fbd0751
+s|\n[\s\S]*$||
+
+c5dec32e37e90ce46813efe7dfe8c5500cc55bbc
+s|\n[\s\S]*$||
+
+a2445f0fdbeaa72c18a893714e4437ea01faa08a
+s|\n[\s\S]*$||
+
+0c953ba5cc71bd1de615df28fbf16e27be62244e
+s|\n[\s\S]*$||
+
+f32a760fbd40796be0b7e3be41226a82db1748d4
+s|\n[\s\S]*$||
+
+a80878742dfd0f5127c1ddc5f803fab980eb816a
+s|\n[\s\S]*$||
+
+d56683630a6415e59f1be7a6540c4733e9671bd8
+s|\n[\s\S]*$||
+
+ca821436009a93c2e8f3c5ce07ed23d90bbba49e
+s|\n[\s\S]*$||
+
+c7d7e46fbea7d6249680da71ecda1d84bdec858a
+s|\n[\s\S]*$||
+
+156a851bc5d758f2d4d7fd89cef678ae72f35e77
+s|\n[\s\S]*$||
+
+87c4cffb19cf5ba8dc088e0ad357e5c3d4be2433
+s|\n[\s\S]*$||
+
+c5230035e5df31976285bf36141d89236416230d
+s|\n[\s\S]*$||
+
+cb4ed2559e89354ea846a686543206d3445ea5ec
+s|\n[\s\S]*$||
+
+9f3cec5b2ec476bd4fd978c1e23398b25d36cd2f
+s|\n[\s\S]*$||
+
+5f27eeb0a37f15b32ccb1b97b2ed9022f5df9a60
+s|\n[\s\S]*$||
+
+013c91874e974543d2f58843c1e839ba102d6ee0
+s|\n[\s\S]*$||
+
+006695fed2e9cd10664c97c69880a82545dde1ef
+s|\n[\s\S]*$||
+
+ff3b32aed7db925a7390d92ffede055b4c8ccf18
+s|\n[\s\S]*$||
+
+d43b40113ec1e8289e48d77f00e8947f2fd98fd4
+# Date:   Tue Oct 2 21:02:16 2012 +0700
+# Refill to 64 columns.
+s|( sc_prohibit_test_)|\n$1|
+
+303040ad8167d2e608b15a7b22e054659d6d409f
+# Date:   Sun Sep 16 17:43:05 2012 +0700
+# Refill to 64 columns.
+s|( prohibit_undesirable_word_seq\.)|\n$1|
+
+6370af6d4abaa9aa9d03984248229f1b8d143d52
+# Date:   Sun Sep 16 14:35:55 2012 +0700
+# Add category tag to summary line.
+s|\n(Revert )|\nmaint: $1|;
+# No empty lines in a single commit.
+s|\n\n|\n|g
+
+cf86b942c893da74d6e9faf0125364a9f114ea01
+# Date:   Tue Aug 21 21:06:45 2012 -0500
+# Add category tag to summary line.
+s|\n(Add )|\nlibtool: $1|;
+# Spell Report attribtution correctly.
+s|Thanks to (.*) for .*\n|Reported by $1.\n|
+
+9b726f35db98da01a7edaf143788cba2c2ae900a
+# Date:   Tue Aug 21 20:17:04 2012 -0500
+# Add category tag to summary line.
+s|\n(Pass )|\nlibtool: $1|
+
+70bac1d7cc3e2c955bfd0769d448c4d818a1e2b8
+# Date:   Tue Aug 21 20:14:55 2012 -0500
+# Add category tag to summary line.
+s|\n(AIX )|\nlibtool: $1|
+
+c03e516bd2f8e730deaf214ac7978abe429cebfe
+# Date:   Tue Aug 21 20:12:01 2012 -0500
+# Add category tag to summary line.
+s|\n(Update/)|\nlibtool: $1|
+
+00ed0187c1c6cc3519188bc47d5ed0ff85f2d950
+# Date:   Sun Aug 19 22:14:13 2012 +0200
+# No empty lines in a single commit.
+s|\n\n|\n|g
+
+37a284f50a93b772d86e8c68a346266aab5de7a5
+# Date:   Wed Apr 18 23:14:50 2012 -0500
+# Add category tag to summary line.
+s|\n(Handle )|\nlibtool: $1|
+
+fbe09b44b5052273fe79ea24365c554a5d54d8ce
+# Date:   Fri Mar 16 13:23:13 2012 -0500
+# Add category tag to summary line.
+s|\n(Fix )|\nlibtool: $1|;
+# Email address of Reporters is in THANKS.
+s|(Reported by .*?) *<.*>|$1.|
+
+3b94c2d8e804d485cf6124adb1572f45ae697216
+# Date:   Tue Feb 21 11:10:39 2012 -0600
+# Add category tag to summary line.
+s|\n(Improve )|\nlibtool: $1|
+
+9333e74fc7b76a11ed04a19343eb5dd75a1035f3
+# Date:   Sun Feb 19 16:21:00 2012 -0600
+# Elide duplicate log entries.
+s|\n[\s\S]*$||
+
+c0c49f289f22ae670066657c60905986da3b555f
+# Date:   Sun Feb 19 15:33:48 2012 -0600
+# Add category tag to summary line.
+s|\n(Accept )|\nlibtool: $1|
+
+96cc27eff32481be89bca4e37f43a11bf953a326
+# Date:   Sun Feb 19 14:56:33 2012 -0600
+# Add category tag to summary line.
+s|\n(Enable )|\nlibtool: $1|
+
+f16abb06f7425b6468b01324740a5dad8a97ec59
+# Date:   Sun Feb 19 14:55:06 2012 -0600
+# Add category tag to summary line.
+s|\n(Fixing )|\nlibtool: $1|
+
+e444159cc04dc6721d509d9d3d6ba0bc6f9e5048
+# Date:   Sun Feb 19 14:18:19 2012 -0600
+# Add category tag to summary line.
+s|\n(Improve )|\nltdl: $1|
+
+b2ccf68b01d3e6092e2b505386c50486b71e7dd6
+# Date:   Sun Feb 19 14:18:19 2012 -0600
+# Add category tag to summary line.
+s|\n(Deleted )|\nmaint: $1|
+
+7a78cca31bca68f3cf2e398d26b03f3980331d72
+# Date:   Sat Dec 24 09:05:19 2011 +0700
+# Fix typo.
+s|options-parses|options-parser|
+
+88992fe6771ec3258bde1b03314ce579da0ac2d5
+# Date:   Mon Dec 12 21:24:14 2011 -0600
+# Add category tag to summary line.
+s|\n(Support )|\nlibtool: $1|
+
+962aa919f51cdf8e2cee4fb2d1d9bafa34d50887
+# Date:   Fri Nov 25 14:53:42 2011 +0700
+# Elide duplicate log entries.
+s|\n[\s\S]*$||
+
 11d16ab06c36948c053c507f5f9e06ff3de221c7
 # Date:   Fri Nov 25 14:39:57 2011 +0700
 # Spell Stefano's name correctly.

diff --git a/gl/build-aux/gitlog-to-changelog.diff b/gl/build-aux/gitlog-to-changelog.diff
new file mode 100644 (file)
index 0000000..a36c872
--- /dev/null
+++ b/gl/build-aux/gitlog-to-changelog.diff
@@ -0,0 +1,56 @@
+--- gnulib/build-aux/gitlog-to-changelog       2012-10-22 15:47:21.000000000 +0700
++++ build-aux/gitlog-to-changelog      2012-10-22 15:47:14.000000000 +0700
+@@ -351,26 +351,6 @@
+               . substr ($_, 5) . "\n";
+         }
+ 
+-      # If clustering of commit messages has been disabled, if this header
+-      # would be different from the previous date/name/email/coauthors header,
+-      # or if this or the previous entry consists of two or more paragraphs,
+-      # then print the header.
+-      if ( ! $cluster
+-          || $date_line ne $prev_date_line
+-          || "@coauthors" ne "@prev_coauthors"
+-          || $multi_paragraph
+-          || $prev_multi_paragraph)
+-        {
+-          $prev_date_line eq ''
+-            or print "\n";
+-          print $date_line;
+-          @coauthors
+-            and print join ("\n", @coauthors), "\n";
+-        }
+-      $prev_date_line = $date_line;
+-      @prev_coauthors = @coauthors;
+-      $prev_multi_paragraph = $multi_paragraph;
+-
+       # If there were any lines
+       if (@line == 0)
+         {
+@@ -378,6 +358,26 @@
+         }
+       else
+         {
++          # If clustering of commit messages has been disabled, if this header
++          # would be different from the previous date/name/email/coauthors header,
++          # or if this or the previous entry consists of two or more paragraphs,
++          # then print the header.
++          if ( ! $cluster
++              || $date_line ne $prev_date_line
++              || "@coauthors" ne "@prev_coauthors"
++              || $multi_paragraph
++              || $prev_multi_paragraph)
++            {
++              $prev_date_line eq ''
++                or print "\n";
++              print $date_line;
++              @coauthors
++                and print join ("\n", @coauthors), "\n";
++            }
++          $prev_date_line = $date_line;
++          @prev_coauthors = @coauthors;
++          $prev_multi_paragraph = $multi_paragraph;
++
+           if ($append_dot)
+             {
+               # If the first line of the message has enough room, then