Prepare for release.

* maint.mk (PREV_VERSION_REGEXP): New macro, missed when
backporting update-NEWS_hash from gnulib.
* cfg.mk (old_NEWS_hash): Correctly generate.
* build-aux/gendocs.sh: Temporarily break sync from upstream, to
avoid including spurious directories in info source tarball.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index d435c19671ae51dac7da6b254254f8dc59469365..3611164661d144812906d9495cce468ec7d296b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-21  Eric Blake  <eblake@redhat.com>
 
+       Prepare for release.
+       * maint.mk (PREV_VERSION_REGEXP): New macro, missed when
+       backporting update-NEWS_hash from gnulib.
+       * cfg.mk (old_NEWS_hash): Correctly generate.
+       * build-aux/gendocs.sh: Temporarily break sync from upstream, to
+       avoid including spurious directories in info source tarball.
+
        Avoid spurious testsuite failures.
        * doc/autoconf.texi (Generating Sources): Don't mix gcc '-E' and
        '-o -', since the former already implies stdout, while the latter

diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 8cab8f6cdf90fecf8a84af9c1d35da26afba3c7e..7cb25244224fdd1ffbc04d1d9026f374f4afcc78 100755 (executable)
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -2,7 +2,7 @@
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
 
-scriptversion=2010-05-04.09
+scriptversion=2010-07-21.10
 
 # Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 # Free Software Foundation, Inc.
@@ -282,8 +282,11 @@ fi
 
 echo Making .tar.gz for sources...
 d=`dirname $srcfile`
-srcfiles=`ls $d/*.texinfo $d/*.texi $d/*.txi $d/*.eps 2>/dev/null` || true
+(
+cd "$d"
+srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` || true
 tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
+)
 texi_tgz_size=`calcsize $outdir/$PACKAGE.texi.tar.gz`
 
 if test -n "$docbook"; then

diff --git a/cfg.mk b/cfg.mk
index e3c5800f3f773ffae47a233e29dddb4ce110648a..71f5e6ede69917f59cd065df2dbbeafd8cf32926 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -110,4 +110,4 @@ update-copyright-env = \
   UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72
 
 # Prevent incorrect NEWS edits.
-old_NEWS_hash = d41d8cd98f00b204e9800998ecf8427e
+old_NEWS_hash = 8cc9e3fa54a0b12094a7ecfdbd539f82

diff --git a/maint.mk b/maint.mk
index efc5062c734f4dee4591d31debb26b258fda4832..99af2ff1fb5aa08535769c11a413e1d4d6329925 100644 (file)
--- a/maint.mk
+++ b/maint.mk
@@ -51,6 +51,7 @@ endif
 
 PREV_VERSION := $(shell cat $(prev_version_file) 2>/dev/null)
 VERSION_REGEXP = $(subst .,\.,$(VERSION))
+PREV_VERSION_REGEXP = $(subst .,\.,$(PREV_VERSION))
 
 this-vc-tag = v$(VERSION)
 this-vc-tag-regexp = v$(VERSION_REGEXP)