summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-01-12 09:55:29 +0100
committerJim Meyering <meyering@redhat.com>2008-01-12 09:55:29 +0100
commitdaf28a3110f39bd922f1268b79785ea1fc23ebd2 (patch)
tree0a5fb124424eeab16a401088c430388283885b51
parente4c0fce73cae9a35b323adaa33d8ac1c1d607314 (diff)
downloadcoreutils-daf28a3110f39bd922f1268b79785ea1fc23ebd2.tar.xz
Use new version of announce-gen.
* Makefile.maint (announcement): Remove use of the --gnulib-snapshot-time-stamp option. Use new --gnulib-version option instead. (gnulib-version): New variable.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.maint9
2 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c21ad109d..255116481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-12 Jim Meyering <meyering@redhat.com>
+
+ Use new version of announce-gen.
+ * Makefile.maint (announcement): Remove use of the
+ --gnulib-snapshot-time-stamp option.
+ Use new --gnulib-version option instead.
+ (gnulib-version): New variable.
+
2008-01-11 Jim Meyering <meyering@redhat.com>
* Version 6.9.92.
diff --git a/Makefile.maint b/Makefile.maint
index fe6bee501..fa2ceb673 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -2,7 +2,7 @@
# This Makefile fragment is shared between the coreutils,
# CPPI, Bison, and Autoconf.
-## Copyright (C) 2001-2007 Free Software Foundation, Inc.
+## Copyright (C) 2001-2008 Free Software Foundation, Inc.
##
## 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
@@ -617,10 +617,15 @@ rel-check:
md5sum -c $$md5_tmp < $$tarz
prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
+
+# FIXME: stop distributing xdelta files in 2008, unless someone speaks up.
+# So far, not one person has said they'd miss this.
xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
rel-files = $(xd-delta) $(DIST_ARCHIVES)
+gnulib-version = $$(cd $(gnulib_dir) && git describe)
+
# Approximate the date of last gnulib "update" by the ChangeLog file's
# mtime, and provide that date in the announcement.
announcement: NEWS ChangeLog $(rel-files)
@@ -634,7 +639,7 @@ announcement: NEWS ChangeLog $(rel-files)
--gpg-key-id=$(gpg_key_ID) \
--news=NEWS \
--bootstrap-tools=autoconf,automake,bison,gnulib \
- --gnulib-snapshot-time-stamp="$$utc_date" \
+ --gnulib-version=$(gnulib-version) \
$(addprefix --url-dir=, $(url_dir_list))
## ---------------- ##