From 6b16d0ac0408b4bbbca9e8b652e382ee806394fb Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Wed, 21 Jul 2010 10:31:52 -0600
Subject: [PATCH] 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>
---
 ChangeLog            | 7 +++++++
 build-aux/gendocs.sh | 7 +++++--
 cfg.mk               | 2 +-
 maint.mk             | 1 +
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d435c196..36111646 100644
--- 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 8cab8f6c..7cb25244 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/cfg.mk b/cfg.mk
index e3c5800f..71f5e6ed 100644
--- 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 efc5062c..99af2ff1 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)