update version numbers for possibly final build

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

14 files changed, 66 insertions, 44 deletions

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index fb218112e3c..ab58308e5d7 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-04  Karl Berry  <karl@tug.org>
+
+	* afm2tfm.c (version),
+	* dvips.h (BANNER): 5.99 for TeX Live 2010 (pretest 2, maybe final).
+
 2010-05-25  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* config.ps: include cid-base.map.
diff --git a/Build/source/texk/dvipsk/NEWS b/Build/source/texk/dvipsk/NEWS
index 95d2046d01a..81809643869 100644
--- a/Build/source/texk/dvipsk/NEWS
+++ b/Build/source/texk/dvipsk/NEWS
@@ -3,6 +3,13 @@ This file records noteworthy changes.  (Public domain.)
    Require Kpathsea to build.
    Additional robustness checks.
 
+dvips 5.99 (TeX Live 2010, 4 June 2010):
+   Use the type1 path to search for Type 1 fonts.
+   Support for Japanese pTeX.
+   Numeric overflow and sprintf checks.
+   Reformat sources.
+
+
 dvips 5.86 notes:
    Minor improvements to epsf style file.
    Another patch to t1part.c to make it more liberal in accepting pfb/pfa
diff --git a/Build/source/texk/dvipsk/afm2tfm.c b/Build/source/texk/dvipsk/afm2tfm.c
index 1b15fb85788..6b0af8942bf 100644
--- a/Build/source/texk/dvipsk/afm2tfm.c
+++ b/Build/source/texk/dvipsk/afm2tfm.c
@@ -1505,7 +1505,7 @@ writevpl(void)
 static void
 version(FILE *f)
 {
-  fputs ("afm2tfm(k) (dvips(k) 5.99/pretest) 8.1\n", f);
+  fputs ("afm2tfm(k) (dvips(k) 5.99) 8.1\n", f);
   fprintf (f, "%s\n", kpathsea_version_string);
   fputs ("Copyright 2010 Radical Eye Software.\n\
 There is NO warranty.  You may redistribute this software\n\
diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure
index 78851913685..d6997ee38c9 100755
--- a/Build/source/texk/dvipsk/configure
+++ b/Build/source/texk/dvipsk/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for dvipsk 5.99/pretest.
+# Generated by GNU Autoconf 2.65 for dvipsk 5.99.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvipsk'
 PACKAGE_TARNAME='dvipsk'
-PACKAGE_VERSION='5.99/pretest'
-PACKAGE_STRING='dvipsk 5.99/pretest'
+PACKAGE_VERSION='5.99'
+PACKAGE_STRING='dvipsk 5.99'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1431,7 +1431,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 dvipsk 5.99/pretest to adapt to many kinds of systems.
+\`configure' configures dvipsk 5.99 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1501,7 +1501,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvipsk 5.99/pretest:";;
+     short | recursive ) echo "Configuration of dvipsk 5.99:";;
    esac
   cat <<\_ACEOF
 
@@ -1611,7 +1611,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvipsk configure 5.99/pretest
+dvipsk configure 5.99
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2271,7 +2271,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 dvipsk $as_me 5.99/pretest, which was
+It was created by dvipsk $as_me 5.99, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -6996,7 +6996,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipsk'
- VERSION='5.99/pretest'
+ VERSION='5.99'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12446,7 +12446,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvipsk config.lt 5.99/pretest
+dvipsk config.lt 5.99
 configured by $0, generated by GNU Autoconf 2.65.
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -14019,7 +14019,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 dvipsk $as_me 5.99/pretest, which was
+This file was extended by dvipsk $as_me 5.99, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14085,7 +14085,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="\\
-dvipsk config.status 5.99/pretest
+dvipsk config.status 5.99
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvipsk/configure.ac b/Build/source/texk/dvipsk/configure.ac
index c5d2f6f4076..175359a7c6c 100644
--- a/Build/source/texk/dvipsk/configure.ac
+++ b/Build/source/texk/dvipsk/configure.ac
@@ -6,7 +6,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([dvipsk], [5.99/pretest], [tex-k@tug.org])
+AC_INIT([dvipsk], [5.99], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvips.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/dvipsk/dvips.h b/Build/source/texk/dvipsk/dvips.h
index 55de4575617..901ba96c970 100644
--- a/Build/source/texk/dvipsk/dvips.h
+++ b/Build/source/texk/dvipsk/dvips.h
@@ -15,7 +15,7 @@
 #define CD_IDX(i)  ((i>=MAX_2BYTES_CODE ? MAX_2BYTES_CODE : i))
 
 #define BANNER \
-"This is dvips(k) 5.99/pretest Copyright 2010 Radical Eye Software"
+"This is dvips(k) 5.99 Copyright 2010 Radical Eye Software"
 #define BANNER2 "(www.radicaleye.com)"
 #ifdef KPATHSEA
 #include "config.h"
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])
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index dc634372c4b..42d6a4f0f35 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-04  Karl Berry  <karl@tug.org>
+
+	* configure.ac (web2_version): remove pretest for
+	TeX Live 2010 (pretest 2, maybe final).
+
 2010-05-31  Karl Berry  <karl@tug.org>
 
 	* configure.ac (AC_CHECK_FUNCS): remove stat64, since we are not
diff --git a/Build/source/texk/web2c/NEWS b/Build/source/texk/web2c/NEWS
index aaa565deeb2..e49520e2bdf 100644
--- a/Build/source/texk/web2c/NEWS
+++ b/Build/source/texk/web2c/NEWS
@@ -1,7 +1,7 @@
 This file records noteworthy changes.  (Public domain.)
 
-2010 (for TeX Collection 2010)
-* BibTeX line-breaking bug fix.
+2010 (for TeX Collection 2010, 4 June 2010)
+* BibTeX line-breaking bug fix in bibtex.web.
 
 2009 (for TeX Collection 2009, 13 October 2009)
 * --shell-restricted aka shell_escape=p for restricted shell access.
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 7c7def7100b..94303351d33 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for Web2C 2010/pretest.
+# Generated by GNU Autoconf 2.65 for Web2C 2010.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Web2C'
 PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2010/pretest'
-PACKAGE_STRING='Web2C 2010/pretest'
+PACKAGE_VERSION='2010'
+PACKAGE_STRING='Web2C 2010'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1619,7 +1619,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 Web2C 2010/pretest to adapt to many kinds of systems.
+\`configure' configures Web2C 2010 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1693,7 +1693,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C 2010/pretest:";;
+     short | recursive ) echo "Configuration of Web2C 2010:";;
    esac
   cat <<\_ACEOF
 
@@ -1878,7 +1878,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C configure 2010/pretest
+Web2C configure 2010
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2790,7 +2790,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 Web2C $as_me 2010/pretest, which was
+It was created by Web2C $as_me 2010, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3164,7 +3164,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-WEB2CVERSION=2010/pretest
+WEB2CVERSION=2010
 
 
 am__api_version='1.11'
@@ -7518,7 +7518,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='web2c'
- VERSION='2010/pretest'
+ VERSION='2010'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19893,7 +19893,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Web2C config.lt 2010/pretest
+Web2C config.lt 2010
 configured by $0, generated by GNU Autoconf 2.65.
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -22653,7 +22653,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 Web2C $as_me 2010/pretest, which was
+This file was extended by Web2C $as_me 2010, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22719,7 +22719,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="\\
-Web2C config.status 2010/pretest
+Web2C config.status 2010
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index c149c13c170..2a402fc1915 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -19,7 +19,7 @@ dnl get these features if you are willing to hack the sources. If not,
 dnl it'll take a good argument to convince me to invest the time to make
 dnl them configurable.
 dnl
-m4_define([web2_version], [2010/pretest])
+m4_define([web2_version], [2010])
 AC_INIT([Web2C], web2_version(), [tex-k@tug.org])
 AC_PREREQ([2.65])
 dnl