update version numbers for possibly final build

git-svn-id: svn://tug.org/texlive/trunk@18730 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 20 insertions, 15 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 20d16adec84..8ef552e867a 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-04  Karl Berry  <karl@tug.org>
+
+	* configure.ac (kpse_lib_devel): empty for TeX Live 2010
+	 (pretest 2, maybe final).
+
 2010-05-30  Karl Berry  <karl@tug.org>
 
 	* texmf.cnf (shell_escape_commands): turns out fc-list is not
diff --git a/Build/source/texk/kpathsea/NEWS b/Build/source/texk/kpathsea/NEWS
index b1c0ee777cf..cb63a2c572c 100644
--- a/Build/source/texk/kpathsea/NEWS
+++ b/Build/source/texk/kpathsea/NEWS
@@ -1,7 +1,7 @@
 This file records noteworthy changes.  (Public domain.)
 
-6.0.0 (for TeX Collection 2010)
-* Change xmalloc and friends to use size_t, changing the ABI.
+6.0.0 (for TeX Collection 2010, 4 June 2010)
+* Change xmalloc and friends to use size_t, unfortunately changing the ABI.
 
 5.0.0 (for TeX Collection 2009, 13 October 2009)
 * Make shared library version and general package version the same.
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 697a1c4dfdf..f4fad078887 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for Kpathsea 6.0.0dev.
+# Generated by GNU Autoconf 2.65 for Kpathsea 6.0.0.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Kpathsea'
 PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.0.0dev'
-PACKAGE_STRING='Kpathsea 6.0.0dev'
+PACKAGE_VERSION='6.0.0'
+PACKAGE_STRING='Kpathsea 6.0.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1436,7 +1436,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 Kpathsea 6.0.0dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1506,7 +1506,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Kpathsea 6.0.0dev:";;
+     short | recursive ) echo "Configuration of Kpathsea 6.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1620,7 +1620,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kpathsea configure 6.0.0dev
+Kpathsea configure 6.0.0
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2141,7 +2141,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 Kpathsea $as_me 6.0.0dev, which was
+It was created by Kpathsea $as_me 6.0.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2515,9 +2515,9 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-KPSEVERSION=6.0.0dev
+KPSEVERSION=6.0.0
 
-$as_echo "#define KPSEVERSION \"kpathsea version 6.0.0dev\"" >>confdefs.h
+$as_echo "#define KPSEVERSION \"kpathsea version 6.0.0\"" >>confdefs.h
 
 KPSE_LT_VERSINFO=6:0:0
 
@@ -6873,7 +6873,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='kpathsea'
- VERSION='6.0.0dev'
+ VERSION='6.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12629,7 +12629,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 Kpathsea $as_me 6.0.0dev, which was
+This file was extended by Kpathsea $as_me 6.0.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12695,7 +12695,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="\\
-Kpathsea config.status 6.0.0dev
+Kpathsea config.status 6.0.0
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index c2b0d8de104..0792103f6cb 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -23,7 +23,7 @@ dnl   binaries built between releases.
 m4_define([kpse_lib_major], [6])[]dnl
 m4_define([kpse_lib_minor], [0])[]dnl
 m4_define([kpse_lib_micro], [0])[]dnl
-m4_define([kpse_lib_devel], [dev])[]dnl empty or "dev"
+m4_define([kpse_lib_devel], [])[]dnl empty or "dev"
 m4_define([kpse_version], [kpse_lib_major.kpse_lib_minor.kpse_lib_micro[]kpse_lib_devel])[]dnl
 
 AC_INIT([Kpathsea], [kpse_version], [tex-k@tug.org])