From 939c480a79f7776a3d6a73fbf3eef411d1e2256f Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Fri, 8 Dec 2006 10:28:05 +0100
Subject: [PATCH] Include bootstrap tool version info in the announcement form.
 * Makefile.maint (gnulib_snapshot_date): Define. (announcement): Use two new
 announce-gen options, --bootstrap-tools and --gnulib-snapshot-date. *
 Makefile.cfg (gnulib_dir): Set.

---
 ChangeLog      |  6 ++++++
 Makefile.cfg   |  4 ++++
 Makefile.maint | 10 ++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79b8851..66bf2b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-12-08  Jim Meyering  <jim@meyering.net>
 
+	Include bootstrap tool version info in the announcement form.
+	* Makefile.maint (gnulib_snapshot_date): Define.
+	(announcement): Use two new announce-gen options,
+	--bootstrap-tools and --gnulib-snapshot-date.
+	* Makefile.cfg (gnulib_dir): Set.
+
 	Post-release version change.
 	* NEWS: Add a line for 6.8-dirty.
 	* configure.ac (AC_INIT): Set new version string.
diff --git a/Makefile.cfg b/Makefile.cfg
index 0c43c21..bd42ca0 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -34,3 +34,7 @@ gpg_key_ID = D333CBA1
 # files -- otherwise, you'd need to have the upcoming version number
 # at the top of the file for each `make distcheck' run.
 local-checks-to-skip = changelog-check
+
+# The local directory containing the checked-out copy of gnulib used in
+# this release.  Used solely to get a date for the "announcement" target.
+gnulib_dir = /gnulib
diff --git a/Makefile.maint b/Makefile.maint
index f4e961f..112ce18 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -555,6 +555,11 @@ prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
 xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
 
 rel-files = $(xd-delta) $(DIST_ARCHIVES)
+
+# Approximate date of last "update" by the date on the ChangeLog file.
+gnulib_snapshot_date = \
+  $$(date -u --date $$(stat --printf @%Y $(gnulib_dir)/ChangeLog) \
+     '+%Y-%m-%d %T %z')
 announcement: NEWS ChangeLog $(rel-files)
 	@./build-aux/announce-gen					\
 	    --release-type=$(RELEASE_TYPE)				\
@@ -563,8 +568,9 @@ announcement: NEWS ChangeLog $(rel-files)
 	    --curr=$(VERSION)						\
 	    --gpg-key-id=$(gpg_key_ID)					\
 	    --news=NEWS							\
-	    $(addprefix --url-dir=, $(url_dir_list))			\
-
+	    --bootstrap-tools=autoconf,automake,bison,gnulib		\
+            --gnulib-snapshot-date=$(gnulib_snapshot_date)		\
+	    $(addprefix --url-dir=, $(url_dir_list))
 
 ## ---------------- ##
 ## Updating files.  ##
-- 
2.7.4