* Merge dejagnu_1_4_branch up to dejagnu-1_4_4 tag.

17 files changed, 174 insertions, 61 deletions

diff --git a/.clean b/.clean
index 1d57e67..fc2b04f 100644
--- a/.clean
+++ b/.clean
@@ -1,11 +1,12 @@
 # this is a list of files to keep
-ChangeLog
 AUTHORS
 COPYING
 ChangeLog
+ChangeLog.0
 INSTALL
 Makefile.am
 Makefile.in
+MAINTAINERS
 NEWS
 README
 TODO
@@ -17,14 +18,15 @@ config.guess
 config.sub
 configure
 configure.in
-contrib
 dejagnu.h
+depcomp
 doc
 example
 install-sh
 lib
 missing
 mkinstalldirs
+packaging
 runtest
 runtest.exp
 site.tmpl
diff --git a/ChangeLog b/ChangeLog
index d132f76..fdcdf6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-30  Ben Elliston  <bje@wasabisystems.com>
+
+	* DejaGnu 1.4.4 released.
+
 2004-01-27  Ben Elliston  <bje@wasabisystems.com>
 
 	* Makefile.am (tarball): Depend on book1.html, not overview.html.
@@ -26,12 +30,31 @@
 
 	* baseboards/frv-sim.exp: Remove reference to devo/sim.
 
+2004-01-27  Ben Elliston  <bje@wasabisystems.com>
+
+	* doc/overview: Remove all files.
+
 2003-12-03  Ben Elliston  <bje@wasabisystems.com>
 
 	* testsuite/runtest.all/utils.test: Fix a test for proc find which
 	assumed that "subsubfile1" would appear at the end of the returned
 	list.  Adjust to use a more robust regular expression.
 
+2003-11-26  Ben Elliston  <bje@wasabisystems.com>
+
+	* doc/overview.sgml (version): Update.
+	* doc/overview/installation.html: Likewise.
+
+	* packaging/rpm/dejagnu.spec: Update version numbers throughout.
+	* packaging/pkg/pkginfo: Likewise.
+	* packaging/depot/dejagnu.psf: Likewise.
+	
+2003-10-25  Ben Elliston  <bje@wasabisystems.com>
+
+	* runtest.exp (frame_version): Bump version.	
+	* configure.in (AM_INIT_AUTOMAKE): Likewise.
+	* configure: Regenerate.
+
 2003-10-16  Rob Savoye   <rob@welcomehome.org>
 
 	* packaging/prototype: Remove sh-hms-sim.exp, add sh-sim.
diff --git a/ChangeLog.0 b/ChangeLog.0
index 06da7d4..af526b8 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -107,9 +107,6 @@
         * baseboards/frv-tiger.exp: New board description.
         * baseboards/frv-tomcat.exp: New board description.
 
-Wed Jun  5 14:52:15 PDT 2002   Joey Ekstrom <joey@ekstrom.org>
-	* dejagnu.h: modfied C functions to behave like printf.
-	
 2001-01-15  Ben Elliston  <bje@redhat.com>
 
         * lib/framework.exp (record_test): Invoke a user-defined procedure
@@ -132,8 +129,8 @@ Wed Jun  5 14:52:15 PDT 2002   Joey Ekstrom <joey@ekstrom.org>
 
 Wed Jun  5 14:52:15 PDT 2002   Joey Ekstrom <joey@ekstrom.org>
 
-	* dejagnu.h: modfied C functions to behave like printf.
-        * dejagnu.h: added wait() to fix problem with host_execute() in
+	* dejagnu.h: Modified C functions to behave like printf().
+        * dejagnu.h: Added wait() to fix problem with host_execute() in
         dejagnu.exp where if skips failed, untested, etc. messages from the
         executable.
 
@@ -613,7 +610,7 @@ Thu Aug 30 19:31:44 2001  J"orn Rennecke <amylaar@redhat.com>
 	(all-local): Add at least `calc' building back.
 	* example/Makefile.in: Regenerated.
 
-ri Jul 21 16:01:43 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+Fri Jul 21 16:01:43 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	From 2000-04-25 Felix Lee <flee@cygnus.com>:
 	* baseboards/tx39-sim.exp: Use idt, not dve linker script.  Delete
diff --git a/baseboards/gdbserver-sample.exp b/baseboards/gdbserver-sample.exp
index dd7f942..c248b57 100644
--- a/baseboards/gdbserver-sample.exp
+++ b/baseboards/gdbserver-sample.exp
@@ -62,4 +62,3 @@ set_board_info gdb,noinferiorio 1
 
 # Can't do hardware watchpoints, in general
 set_board_info gdb,no_hardware_watchpoints 1
-
diff --git a/baseboards/mips-sim-idt32.exp b/baseboards/mips-sim-idt32.exp
index 645969d..e9d1a86 100644
--- a/baseboards/mips-sim-idt32.exp
+++ b/baseboards/mips-sim-idt32.exp
@@ -53,4 +53,3 @@ set_board_info gdb,nosignals 1
 if {[string match "*soft-float*" $current_target_name]} {
     set_board_info gdb_init_command "set mipsfpu none"
 }
-
diff --git a/baseboards/mmixware-sim.exp b/baseboards/mmixware-sim.exp
index a6ecb4b..52f5a38 100644
--- a/baseboards/mmixware-sim.exp
+++ b/baseboards/mmixware-sim.exp
@@ -76,4 +76,3 @@ set_board_info needs_status_wrapper 1
 
 # FIXME: Some gdb board variables are usually here.  I currently have
 # no clue what to set them to, so I won't.
-
diff --git a/baseboards/x86-cygmon.exp b/baseboards/x86-cygmon.exp
index 24e2017..cfa745b 100644
--- a/baseboards/x86-cygmon.exp
+++ b/baseboards/x86-cygmon.exp
@@ -27,4 +27,3 @@ if { [board_info $board obj_format] == "a.out" } {
 } else {
     set_board_info gdb,start_symbol "__start"
 }
-
diff --git a/config/default.exp b/config/default.exp
index a42572f..1f46e41 100644
--- a/config/default.exp
+++ b/config/default.exp
@@ -33,4 +33,3 @@ proc ${tool}_start { } {
     verbose "WARNING: Using the default proc for tool_start" 2
     return $spawn_id
 }
-
diff --git a/configure b/configure
index 846590b..55305bf 100755
--- a/configure
+++ b/configure
@@ -272,7 +272,7 @@ PACKAGE_BUGREPORT=
 
 ac_unique_file="runtest.exp"
 ac_subdirs_all="$ac_subdirs_all example/calc example/hello"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE YACC DOCBOOK tclsh TCLSH BOARDS CONFIG subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC DOCBOOK tclsh TCLSH BOARDS CONFIG subdirs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -821,8 +821,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-docbook       directory where the db2 sgml tools are
-  --with-tclinclude       directory where tcl header
-s are
+  --with-tclinclude       directory where tcl headers are
 
 Some influential environment variables:
   CC          C compiler command
@@ -1241,7 +1240,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version="1.6"
+am__api_version="1.7"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -1485,6 +1484,15 @@ echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
  # test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -1493,9 +1501,19 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
    { (exit 1); exit 1; }; }
 fi
 
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
 # Define the identity of the package.
  PACKAGE=dejagnu
- VERSION=1.4.3
+ VERSION=1.4.4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2542,24 +2560,16 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-
+DEPDIR="${am__leading_dot}deps"
 
           ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
-doit:
+am__doit:
 	@echo done
+.PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
@@ -2574,7 +2584,7 @@ echo "include confinc" > confmf
 # In particular we don't look at `^make:' because GNU make might
 # be invoked under some other name (usually "gmake"), in which
 # case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
    am__include=include
    am__quote=
    _am_result=GNU
@@ -2634,18 +2644,32 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_CC_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -2663,13 +2687,20 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_CC_dependencies_compiler_type=$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -2686,6 +2717,18 @@ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
 
 
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3024,18 +3067,32 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_CXX_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -3053,13 +3110,20 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_CXX_dependencies_compiler_type=$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -3075,6 +3139,18 @@ echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
 
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -3488,6 +3564,20 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -4019,6 +4109,7 @@ s,@LIBS@,$LIBS,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@CYGPATH_W@,$CYGPATH_W,;t t
 s,@PACKAGE@,$PACKAGE,;t t
 s,@VERSION@,$VERSION,;t t
 s,@ACLOCAL@,$ACLOCAL,;t t
@@ -4033,6 +4124,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
+s,@am__leading_dot@,$am__leading_dot,;t t
 s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
 s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
 s,@MAINT@,$MAINT,;t t
@@ -4050,10 +4142,14 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
 s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
 s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
 s,@CXX@,$CXX,;t t
 s,@CXXFLAGS@,$CXXFLAGS,;t t
 s,@ac_ct_CXX@,$ac_ct_CXX,;t t
 s,@CXXDEPMODE@,$CXXDEPMODE,;t t
+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
 s,@YACC@,$YACC,;t t
 s,@DOCBOOK@,$DOCBOOK,;t t
 s,@tclsh@,$tclsh,;t t
diff --git a/configure.in b/configure.in
index 04b673b..c781631 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(runtest.exp)
 dnl AC_CONFIG_AUX_DIR(..)
 
 dnl These are required by automake
-AM_INIT_AUTOMAKE(dejagnu, 1.4.3)
+AM_INIT_AUTOMAKE(dejagnu, 1.4.4)
 AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET
 
diff --git a/doc/overview.sgml b/doc/overview.sgml
index d5c59d8..928f4d0 100644
--- a/doc/overview.sgml
+++ b/doc/overview.sgml
@@ -4,7 +4,7 @@
 
 <?Fm: Validation Off>
 
-<!ENTITY version "1.4.3">
+<!ENTITY version "1.4.4">
 <!ENTITY dj "DejaGnu">
 
 <!ENTITY dejagnu-copyright "
diff --git a/example/calc/Makefile.am b/example/calc/Makefile.am
index 454b2b8..1268884 100644
--- a/example/calc/Makefile.am
+++ b/example/calc/Makefile.am
@@ -20,4 +20,4 @@ AUTOMAKE_OPTIONS = dejagnu
 noinst_PROGRAMS = calc
 calc_SOURCES = calc.c
 
-RUNTESTDEFAULTFLAGS = --tool calc CALC=`pwd`/calc --srcdir $$srcdir/testsuite
\ No newline at end of file
+RUNTESTDEFAULTFLAGS = --tool calc CALC=`pwd`/calc --srcdir $$srcdir/testsuite
diff --git a/lib/standard.exp b/lib/standard.exp
index 66001a3..6396aa6 100644
--- a/lib/standard.exp
+++ b/lib/standard.exp
@@ -18,7 +18,7 @@
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #
-# A set of standard functions for tools. Calls the 
+# A set of standard functions for tools. Calls the
 # target-machine-specific versions.
 #
 
diff --git a/packaging/depot/dejagnu.psf b/packaging/depot/dejagnu.psf
index a3a8849..8a4520c 100644
--- a/packaging/depot/dejagnu.psf
+++ b/packaging/depot/dejagnu.psf
@@ -25,7 +25,7 @@ product
 	tag dejagnu
 	title "dejagnu"
 	description "dejagnu"
-	revision 1.4.3
+	revision 1.4.4
 	#
 	architecture S700/S800_HPUX_11
 	machine_type 9000/[78]*
@@ -36,7 +36,7 @@ product
 	fileset
 		tag exec
 		title "dejagnu executables"
-		revision 1.4.3
+		revision 1.4.4
 
 #		postinstall dejagnu.postinstall
 #		postremove dejagnu.postremove
@@ -49,7 +49,7 @@ product
 	fileset
 		tag library
 		title "dejagnu library"
-		revision 1.4.3
+		revision 1.4.4
 
 		directory /opt/dejagnu/share=/opt/dejagnu/share
 		file_permissions -u 222 -g bin -o bin
@@ -59,7 +59,7 @@ product
 	fileset
 		tag manpages
 		title "dejagnu manpages"
-		revision 1.4.3
+		revision 1.4.4
 
 		directory /opt/dejagnu/man=/opt/dejagnu/man
 		file_permissions -u 222 -g bin -o bin
@@ -68,7 +68,7 @@ product
 	fileset
 		tag includes
 		title "dejagnu includes"
-		revision 1.4.3
+		revision 1.4.4
 
 		directory /opt/dejagnu/include=/opt/dejagnu/include
 		file_permissions -u 222 -g bin -o bin
diff --git a/packaging/pkg/pkginfo b/packaging/pkg/pkginfo
index 892e917..ad1f59f 100644
--- a/packaging/pkg/pkginfo
+++ b/packaging/pkg/pkginfo
@@ -1,6 +1,6 @@
 PKG=DejaGnu
-NAME=DejaGnu 1.4.3
-VERSION=1.4.3
+NAME=DejaGnu 1.4.4
+VERSION=1.4.4
 ARCH=sparc
 CLASSES=none
 CATEGORY=utility
diff --git a/packaging/rpm/dejagnu.spec b/packaging/rpm/dejagnu.spec
index 1f7414c..300d93c 100644
--- a/packaging/rpm/dejagnu.spec
+++ b/packaging/rpm/dejagnu.spec
@@ -1,4 +1,4 @@
-%define version 1.4.3
+%define version 1.4.4
 
 Summary: A front end for testing other programs.
 Name: dejagnu
diff --git a/runtest.exp b/runtest.exp
index aa26fd4..7baaa54 100755
--- 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.3.x
+set frame_version	1.4.4
 if ![info exists argv0] {
     send_error "Must use a version of Expect greater than 5.0\n"
     exit 1