* configure.ac (AC_INIT): Set version to 1.5.

	* configure: Regenerate.
	* runtest.exp (frame_version): Set to 1.5.
	* doc/dejagnu.texi: Regenerate.

5 files changed, 35 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index dde7b5c..9246569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-06  Ben Elliston  <bje@gnu.org>
+
+	* configure.ac (AC_INIT): Set version to 1.5.
+	* configure: Regenerate.
+	* runtest.exp (frame_version): Set to 1.5.
+	* doc/dejagnu.texi: Regenerate.
+
 2011-03-04  Ben Elliston  <bje@gnu.org>
 
 	* texinfo.tex: Import latest version from ftp://tug.org/tex.
diff --git a/configure b/configure
index 03801f7..5b4b59c 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.65 for GNU DejaGnu 1.4.99.
+# Generated by GNU Autoconf 2.65 for GNU DejaGnu 1.5.
 #
 # Report bugs to <bug-dejagnu@gnu.org>.
 #
@@ -551,8 +551,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU DejaGnu'
 PACKAGE_TARNAME='dejagnu'
-PACKAGE_VERSION='1.4.99'
-PACKAGE_STRING='GNU DejaGnu 1.4.99'
+PACKAGE_VERSION='1.5'
+PACKAGE_STRING='GNU DejaGnu 1.5'
 PACKAGE_BUGREPORT='bug-dejagnu@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/dejagnu/'
 
@@ -1212,7 +1212,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.4.99 to adapt to many kinds of systems.
+\`configure' configures GNU DejaGnu 1.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1278,7 +1278,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU DejaGnu 1.4.99:";;
+     short | recursive ) echo "Configuration of GNU DejaGnu 1.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1370,7 +1370,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU DejaGnu configure 1.4.99
+GNU DejaGnu configure 1.5
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1463,7 +1463,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.4.99, which was
+It was created by GNU DejaGnu $as_me 1.5, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2271,7 +2271,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dejagnu'
- VERSION='1.4.99'
+ VERSION='1.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4573,7 +4573,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.4.99, which was
+This file was extended by GNU DejaGnu $as_me 1.5, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4632,7 +4632,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.4.99
+GNU DejaGnu config.status 1.5
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index d3a9d04..4554bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,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.4.99, [bug-dejagnu@gnu.org])
+AC_INIT([GNU DejaGnu], 1.5, [bug-dejagnu@gnu.org])
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET
diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index cecb048..6c719c8 100644
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -2408,46 +2408,46 @@ explanations of the command-line options.
 
 @strong{Tcl Variables For Command Line Options}
 
-@multitable @columnfractions 0.333333333333333 0.333333333333333 0.333333333333333
+@multitable @columnfractions 0.2 0.2 0.2 0.2 0.2
 @item
-runtest@tab Tcl@tab optionvariabledescription
+runtest@tab Tcl@tab option@tab variable@tab description
 @item
---all@tab all_flag@tab display all test results if set
+--all@tab all_flag@tab display all test results if set@tab 
 @item
 --baud@tab baud@tab set the default baud rate to something other than
-9600.
+9600.@tab 
 @item
 --connect@tab connectmode@tab @code{rlogin},
 @code{telnet}, @code{rsh},
 @code{kermit}, @code{tip}, or
-@code{mondfe}
+@code{mondfe}@tab 
 @item
 --outdir@tab outdir@tab directory for @file{tool.sum} and
-@file{tool.log.}
+@file{tool.log.}@tab 
 @item
---objdir@tab objdir@tab directory for pre-compiled binaries
+--objdir@tab objdir@tab directory for pre-compiled binaries@tab 
 @item
 --reboot@tab reboot@tab reboot the target if set to
 @emph{"1"}; do not reboot if set to
-@emph{"0"} (the default).
+@emph{"0"} (the default).@tab 
 @item
---srcdir@tab srcdir@tab directory of test subdirectories
+--srcdir@tab srcdir@tab directory of test subdirectories@tab 
 @item
---strace@tab tracelevel@tab a number: Tcl trace depth
+--strace@tab tracelevel@tab a number: Tcl trace depth@tab 
 @item
---tool@tab tool@tab name of tool to test; identifies init, test subdir
+--tool@tab tool@tab name of tool to test; identifies init, test subdir@tab 
 @item
 --verbose@tab verbose@tab verbosity level.  As option, use multiple times; as
-variable, set a number, 0 or greater.
+variable, set a number, 0 or greater.@tab 
 @item
---target@tab target_triplet@tab The canonical configuration string for the target.
+--target@tab target_triplet@tab The canonical configuration string for the target.@tab 
 @item
---host@tab host_triplet@tab The canonical configuration string for the host.
+--host@tab host_triplet@tab The canonical configuration string for the host.@tab 
 @item
 --build@tab build_triplet@tab The canonical configuration string for the build
-host.
+host.@tab 
 @item
---mail@tab address@tab Email the output log to the specified address.
+--mail@tab address@tab Email the output log to the specified address.@tab 
 @end multitable
 
 @node Personal Config File, , Option Variables, Config File Values
diff --git a/runtest.exp b/runtest.exp
index 2637ed3..2140020 100644
--- a/runtest.exp
+++ b/runtest.exp
@@ -20,7 +20,7 @@
 
 # This file was written by Rob Savoye <rob@welcomehome.org>.
 
-set frame_version	1.4.99
+set frame_version	1.5
 if {![info exists argv0]} {
     send_error "Must use a version of Expect greater than 5.0\n"
     exit 1