Re: [PATCH] Version 2.4.3_rc1.

[Joel E. Denny]

On Thu, 29 Jul 2010, Joel E. Denny wrote:

> Subject: [PATCH] Version 2.4.3_rc1.

I pushed the first patch below to branch-2.4.3.

> * configure.ac (AM_INIT_AUTOMAKE): Underscore rather than dash
> in version string now indicates a release candidate and that we
> thus cannot enable gnits.  Dash confuses git-version-gen.

I got confused.  I want the dash too.  I pushed the second patch below to 
branch-2.4.3, branch-2.5, and master.

>From 6895eefc044ee80c588f4b58ce7e4bdbd1bfb6b2 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Thu, 29 Jul 2010 21:55:02 -0400
Subject: [PATCH] Prepare for 2.4.3 release.

* NEWS (2.4.3_rc1): Rename back to...
(2.4.3): ... this, and unset date.
---
 ChangeLog |    6 ++++++
 NEWS      |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40496f1..a40193c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-29  Joel E. Denny  <address@hidden>
+
+       Prepare for 2.4.3 release.
+       * NEWS (2.4.3_rc1): Rename back to...
+       (2.4.3): ... this, and unset date.
+
 2010-07-28  Joel E. Denny  <address@hidden>
 
        Version 2.4.3_rc1.
diff --git a/NEWS b/NEWS
index 3482406..2ab2250 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 Bison News
 ----------
 
-* Changes in version 2.4.3_rc1 (2010-07-29):
+* Changes in version 2.4.3 (????-??-??):
 
 ** Problems with spawning M4 on at least FreeBSD 8 and FreeBSD 9 have
    been fixed.
-- 
1.7.0.4

>From 122ff4442985540837fae4b4c904c7018a1a3d38 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Thu, 29 Jul 2010 22:05:09 -0400
Subject: [PATCH] maint: enable gnits only at stable releases.

* configure.ac (AM_INIT_AUTOMAKE): Underscore or dash in a
version string should disable gnits.  Explain in comments.
---
 ChangeLog    |    6 ++++++
 configure.ac |   12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a40193c..15c236e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-29  Joel E. Denny  <address@hidden>
 
+       maint: enable gnits only at stable releases.
+       * configure.ac (AM_INIT_AUTOMAKE): Underscore or dash in a
+       version string should disable gnits.  Explain in comments.
+
+2010-07-29  Joel E. Denny  <address@hidden>
+
        Prepare for 2.4.3 release.
        * NEWS (2.4.3_rc1): Rename back to...
        (2.4.3): ... this, and unset date.
diff --git a/configure.ac b/configure.ac
index fa69470..73aa473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,11 +37,15 @@ AC_CONFIG_MACRO_DIR([m4])
 #
 # To avoid 1.11, we make 1.11.1 the minimum version.
 #
-# We want gnits strictness only when rolling a formal release so that we can,
-# for example, run make dist at other times without being required to add a
-# bogus NEWS entry.
+# We want gnits strictness only when rolling a stable release.  For
+# release candidates, we use version strings like 2.4.3_rc1, but gnits
+# doesn't like that, so we let the underscore disable gnits.  Between
+# releases, we want to be able run make dist without being required to
+# add a bogus NEWS entry.  In that case, the version string
+# automatically contains a dash, which we also let disable gnits.
 AM_INIT_AUTOMAKE([1.11.1 dist-bzip2]
-                 m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [_], [gnu], [gnits]))
+                 m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[-_]],
+                           [gnu], [gnits]))
 AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
 
 # Checks for the compiler.
-- 
1.7.0.4