* NEWS: Add entry for changes since version 1.6.

	* configure.ac (AC_INIT): Update version number.
	* configure: Regenerate.
	* runtest.exp (frame_version): Update version number.
	* doc/dejagnu.texi: Likewise.
	* doc/runtest.1: Update datestamp.

7 files changed, 25 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 8101346..fa618d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2017-10-16  Ben Elliston  <bje@gnu.org>
 
+	* NEWS: Add entry for changes since version 1.6.
+	* configure.ac (AC_INIT): Update version number.
+	* configure: Regenerate.
+	* runtest.exp (frame_version): Update version number.
+	* doc/dejagnu.texi: Likewise.
+	* doc/runtest.1: Update datestamp.
+
+2017-10-16  Ben Elliston  <bje@gnu.org>
+
 	* config.guess: Update to version 2017-09-26.
 	* config.sub: Likewise.
 
diff --git a/NEWS b/NEWS
index 0734ede..c338240 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
 
 Changes since 1.6:
 
+Minor bug fixes, no major changes.
+
 Changes since 1.5.3:
 
 1. Proper support for target communication via SSH has been added.
diff --git a/configure b/configure
index 9d2b283..cc3d026 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU DejaGnu 1.6.1-git.
+# Generated by GNU Autoconf 2.69 for GNU DejaGnu 1.6.1.
 #
 # Report bugs to <bug-dejagnu@gnu.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU DejaGnu'
 PACKAGE_TARNAME='dejagnu'
-PACKAGE_VERSION='1.6.1-git'
-PACKAGE_STRING='GNU DejaGnu 1.6.1-git'
+PACKAGE_VERSION='1.6.1'
+PACKAGE_STRING='GNU DejaGnu 1.6.1'
 PACKAGE_BUGREPORT='bug-dejagnu@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/dejagnu/'
 
@@ -1252,7 +1252,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU DejaGnu 1.6.1-git to adapt to many kinds of systems.
+\`configure' configures GNU DejaGnu 1.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1319,7 +1319,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU DejaGnu 1.6.1-git:";;
+     short | recursive ) echo "Configuration of GNU DejaGnu 1.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1416,7 +1416,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU DejaGnu configure 1.6.1-git
+GNU DejaGnu configure 1.6.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1509,7 +1509,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU DejaGnu $as_me 1.6.1-git, which was
+It was created by GNU DejaGnu $as_me 1.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2372,7 +2372,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dejagnu'
- VERSION='1.6.1-git'
+ VERSION='1.6.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4596,7 +4596,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU DejaGnu $as_me 1.6.1-git, which was
+This file was extended by GNU DejaGnu $as_me 1.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4655,7 +4655,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU DejaGnu config.status 1.6.1-git
+GNU DejaGnu config.status 1.6.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 13aa2c5..713c113 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl along with DejaGnu; if not, write to the Free Software Foundation,
 dnl Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 AC_PREREQ(2.50)
-AC_INIT([GNU DejaGnu], 1.6.1-git, [bug-dejagnu@gnu.org])
+AC_INIT([GNU DejaGnu], 1.6.1, [bug-dejagnu@gnu.org])
 AM_INIT_AUTOMAKE([1.14 subdir-objects])
 AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET
diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index a63f5b4..e6b824b 100644
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -11,7 +11,7 @@
 @top DejaGnu
 
 @ifnottex
-This file documents DejaGnu version 1.6.1-git.
+This file documents DejaGnu version 1.6.1.
 
 @insertcopying
 @end ifnottex
diff --git a/doc/runtest.1 b/doc/runtest.1
index 51cdccc..5b70d35 100644
--- a/doc/runtest.1
+++ b/doc/runtest.1
@@ -1,4 +1,4 @@
-.TH runtest 1 "2016-04-03"
+.TH runtest 1 "2017-10-16"
 .SH NAME
 runtest \- DejaGnu test driver
 .SH SYNOPSIS
diff --git a/runtest.exp b/runtest.exp
index 02c10ed..39bd2dc 100644
--- a/runtest.exp
+++ b/runtest.exp
@@ -19,7 +19,7 @@
 
 # This file was written by Rob Savoye <rob@welcomehome.org>.
 
-set frame_version	1.6.1-git
+set frame_version	1.6.1
 if {![info exists argv0]} {
     send_error "Must use a version of Expect greater than 5.0\n"
     exit 1