On Sat, Oct 26, 2013 at 6:25 PM, Jim Meyering <[email protected]> wrote:
> On Sat, Oct 26, 2013 at 12:20 PM, Paul Eggert <[email protected]> wrote:
>> Jim Meyering wrote:
>>> Here's the announcement:
>>>
>>>   https://savannah.gnu.org/forum/forum.php?forum_id=7763
>>>
>>>
>>>
>>
>> In that release 'grep --version' outputs this:
>>
>> grep (GNU grep) 2.14.56-1e3d
>
> Well, that's an unpleasant surprise -- and cause for at least one more
> pre-release check.
> I don't know yet what went wrong, but will post as soon as I do.
> Thanks for the heads up.

As explained in
http://git.sv.gnu.org/cgit/gnulib.git/commit/?id=4c2f17d2a6, this was
due to a mismatch between README-release instructions and semantics of
the "release" target in maint.mk.  I've adjusted the latter so this
won't happen again.  Here's the change that pulls in the gnulib fix:
From 4c2f17d2a671eb6fc6ae318647040598f67705cc Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email protected]>
Date: Sat, 26 Oct 2013 19:26:13 -0700
Subject: [PATCH] maint.mk: fix "release" target to build _version

This fixes a bug in README-release whereby following the outlined
steps, one would publish a tarball whose programs would report
--version output not consistent with the package version number.
This bug caused grep-2.15 to produce a grep program whose
--version option made it print 2.14.56-1e3d rather than 2.15.
* top/maint.mk (release): Making this target build "_version"
ensures that the new version number is reflected in configure.
---
 ChangeLog    | 11 +++++++++++
 top/maint.mk |  1 +
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8992e91..ba3d83a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-10-26  Jim Meyering  <[email protected]>
+
+       maint.mk: fix "release" target to build _version
+       This fixes a bug in README-release whereby following the outlined
+       steps, one would publish a tarball whose programs would report
+       --version output not consistent with the package version number.
+       This bug caused grep-2.15 to produce a grep program whose
+       --version option made it print 2.14.56-1e3d rather than 2.15.
+       * top/maint.mk (release): Making this target build "_version"
+       ensures that the new version number is reflected in configure.
+
 2013-10-21  Ben Pfaff  <[email protected]>

        install-reloc: Support multi-binary installation.
diff --git a/top/maint.mk b/top/maint.mk
index c9f8cc8..bf8f53a 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1424,6 +1424,7 @@ alpha beta stable: $(local-check) writable-files 
$(submodule-checks)
        $(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@

 release:
+       $(AM_V_GEN)$(MAKE) _version
        $(AM_V_GEN)$(MAKE) $(release-type)

 # Override this in cfg.mk if you follow different procedures.
-- 
1.8.4.1.600.g3d092bf

Reply via email to