[PATCH] Prepare for release.

[Eric Blake]

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

Signed-off-by: Eric Blake <address@hidden>
---

A couple things I noticed while trying to follow HACKING to
do the release (in fact, this would have been post-2.67, if
it hadn't been for the fact that my upload key is not sorted
yet, so I got the chance to rebase instead).

The gendocs.sh bug has been reported upstream to bug-texinfo.

 ChangeLog            |    8 ++++++++
 build-aux/gendocs.sh |    7 +++++--
 maint.mk             |    1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aba6597..ecb4cfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-21  Eric Blake  <address@hidden>

+       Prepare for release.
+       * maint.mk (PREV_VERSION_REGEXP): New macro, missed when
+       backporting update-NEWS_hash from gnulib.
+       * build-aux/gendocs.sh: Temporarily break sync from upstream, to
+       avoid including spurious directories in info source tarball.
+
        Minor testsuite size reduction.
        * lib/autotest/general.m4 (AT_INIT) <serial testing>: Ensure
        at_jobs is 1.
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 8cab8f6..7cb2524 100755
--- 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/maint.mk b/maint.mk
index efc5062..99af2ff 100644
--- 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)
-- 
1.7.1.1