update version numbers to 5.0.0 (web2c version change coming separately)

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

11 files changed, 147 insertions, 153 deletions

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index dc54c9792ff..513eae694e3 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-01  Karl Berry  <karl@tug.org>
+
+	* Update version numbers to 5.98.
+
 2009-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* texc.script: use correct invocation of sed.
diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure
index 3a1021c8c74..692e78406a2 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.63 for dvipsk 5.97.
+# Generated by GNU Autoconf 2.63 for dvipsk 5.98.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='dvipsk'
 PACKAGE_TARNAME='dvipsk'
-PACKAGE_VERSION='5.97'
-PACKAGE_STRING='dvipsk 5.97'
+PACKAGE_VERSION='5.98'
+PACKAGE_STRING='dvipsk 5.98'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 
 ac_unique_file="dvips.c"
@@ -1480,7 +1480,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.97 to adapt to many kinds of systems.
+\`configure' configures dvipsk 5.98 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvipsk 5.97:";;
+     short | recursive ) echo "Configuration of dvipsk 5.98:";;
    esac
   cat <<\_ACEOF
 
@@ -1657,7 +1657,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvipsk configure 5.97
+dvipsk configure 5.98
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1671,7 +1671,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.97, which was
+It was created by dvipsk $as_me 5.98, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -6916,7 +6916,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipsk'
- VERSION='5.97'
+ VERSION='5.98'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13672,7 +13672,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvipsk config.lt 5.97
+dvipsk config.lt 5.98
 configured by $0, generated by GNU Autoconf 2.63.
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -15131,7 +15131,7 @@ exec 6>&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.97, which was
+This file was extended by dvipsk $as_me 5.98, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15194,7 +15194,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-dvipsk config.status 5.97
+dvipsk config.status 5.98
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 240c7527c86..d7adc9c3118 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,9 +1,12 @@
+2009-06-01  Karl Berry  <karl@tug.org>
+
+	* Update version numbers 5.0.0.
+
 2009-05-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* absolute.c, hash.c: Avoid C99isms (variable declaration not at
         the beginning of a block).
-
-	From  Vladimir Volovich <vvv@vsu.ru>
+	From Vladimir Volovich.
 
 2009-05-12  Karl Berry  <karl@tug.org>
 
diff --git a/Build/source/texk/kpathsea/NEWS b/Build/source/texk/kpathsea/NEWS
index 5468ea91540..35d1344121a 100644
--- a/Build/source/texk/kpathsea/NEWS
+++ b/Build/source/texk/kpathsea/NEWS
@@ -1,4 +1,9 @@
 This file records noteworthy changes.
+5.0.0 (for TeX Collection 2009)
+* Make shared library version and general package version the same.
+* Make library re-entrant, thus unavoidable binary API changes.
+* Change build system to Automake.
+
 3.5.7 (for TeX Collection 2008, 8 July 2008)
 * kpsewhich has new options --all (to report all matches) and --subdir
   (to limit matches).
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index cd5ccc01b09..de485948fcb 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.63 for Kpathsea 3.5.7dev.
+# Generated by GNU Autoconf 2.63 for Kpathsea 5.0.0.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Kpathsea'
 PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='3.5.7dev'
-PACKAGE_STRING='Kpathsea 3.5.7dev'
+PACKAGE_VERSION='5.0.0'
+PACKAGE_STRING='Kpathsea 5.0.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 
 ac_unique_file="pathsearch.c"
@@ -1480,7 +1480,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 3.5.7dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 5.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Kpathsea 3.5.7dev:";;
+     short | recursive ) echo "Configuration of Kpathsea 5.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1664,7 +1664,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kpathsea configure 3.5.7dev
+Kpathsea configure 5.0.0
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1678,7 +1678,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 3.5.7dev, which was
+It was created by Kpathsea $as_me 5.0.0, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2081,10 +2081,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-KPSEVERSION=3.5.7dev
+KPSEVERSION=5.0.0
 
 cat >>confdefs.h <<\_ACEOF
-#define KPSEVERSION "kpathsea version 3.5.7dev"
+#define KPSEVERSION "kpathsea version 5.0.0"
 _ACEOF
 
 KPSE_LT_VERSNUM=5:0:0
@@ -6932,7 +6932,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='kpathsea'
- VERSION='3.5.7dev'
+ VERSION='5.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13827,7 +13827,7 @@ exec 6>&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 3.5.7dev, which was
+This file was extended by Kpathsea $as_me 5.0.0, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13890,7 +13890,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-Kpathsea config.status 3.5.7dev
+Kpathsea config.status 5.0.0
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index d03a9c058fb..9d3276d946a 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -5,17 +5,8 @@ dnl
 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
 dnl --------------------------------------------------------
-dnl
-dnl Kpathsea package version:
-dnl   Starting development:
-dnl     kpse_devel_version = dev;
-dnl   Making releases:
-dnl     kpse_micro_version += 1;
-dnl     kpse_devel_version = ;
-dnl
-dnl Kpathsea shared library version:
+dnl Keep Kpathsea shared and package library versions the same:
 dnl   Only bug fixes:
 dnl     kpse_lib_micro += 1;
 dnl   Adding new interfaces (backwards compatible)
@@ -26,15 +17,14 @@ dnl     kpse_lib_major += 1;
 dnl     kpse_lib_minor = 0;
 dnl     kpse_lib_micro = 0;
 dnl
-m4_define([kpse_major_version], [3])[]dnl
-m4_define([kpse_minor_version], [5])[]dnl
-m4_define([kpse_micro_version], [7])[]dnl
-m4_define([kpse_devel_version], [dev])[]dnl
-m4_define([kpse_version], [kpse_major_version.kpse_minor_version.kpse_micro_version[]kpse_devel_version])[]dnl
+dnl   After a release, set kpse_lib_dev to "dev", to distinguish
+dnl   binaries built between releases.
 
 m4_define([kpse_lib_major], [5])[]dnl
 m4_define([kpse_lib_minor], [0])[]dnl
 m4_define([kpse_lib_micro], [0])[]dnl
+m4_define([kpse_lib_devel], [])[]dnl 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])
 AC_PREREQ([2.63])
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info
index 8a60c82ab91..dc344ea3538 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.info
+++ b/Build/source/texk/kpathsea/doc/kpathsea.info
@@ -1,5 +1,5 @@
-This is ../../../../texk/kpathsea/doc/kpathsea.info, produced by
-makeinfo version 4.13 from ../../../../texk/kpathsea/doc/kpathsea.texi.
+This is kpathsea.info, produced by makeinfo version 4.13 from
+kpathsea.texi.
 
 This file documents the Kpathsea library for path searching.
 
@@ -91,7 +91,7 @@ library, you must (offer to) distribute the source to the library,
 along with any changes you have made, and allow anyone to modify the
 library source and distribute their modifications.  It does not mean
 you have to distribute the source to your program, although we hope you
-will.  See the files `GPL' and `LGPL' for the text of the GNU licenses.
+will.  See the accompanying files for the text of the GNU licenses.
 
    If you know enough about TeX to be reading this manual, then you (or
 your institution) should consider joining the TeX Users Group (if
@@ -1241,7 +1241,7 @@ This is `ftp://ftp.tug.org/tex/unixtex.ftp', last updated 26 December
 2003.  Also available as `http://www.tug.org/unixtex.ftp'.  The IP
 address is currently `[130.225.2.178]'.  It is also in Kpathsea source
 distributions as `etc/unixtex.ftp' (although the network version is
-usually newer).  Mail <tex-k@mail.tug.org> with comments or questions.
+usually newer).  Mail <tex-k@tug.org> with comments or questions.
 
    Following are general instructions for Unix or other sites who wish
 to acquire the Web2c distribution, (plain) TeX, LaTeX (2e), BibTeX,
@@ -1366,13 +1366,11 @@ Numerous organizations distribute various TeX CD-ROM's (and DVD's):
      minimal TeX source distribution described in the previous section
      (i.e., enough to print GNU documentation); email <gnu@gnu.org>.
 
-   * Most Linux distributions include some TeX package based on Web2c;
-     see the Linux documentation file `Distribution-HOWTO' for a
-     comparison of Linux distributions, available (for example) via
-     `http://www.linux.org'.
+   * Most GNU/Linux distributions include some TeX package based on TeX
+     Live.
 
    If you know of additional TeX distributions to add to this list,
-please inform <tex-k@mail.tug.org>.
+please inform <tex-k@tug.org>.
 
 
 File: kpathsea.info,  Node: Other TeX packages,  Prev: CD-ROM distribution,  Up: unixtex.ftp
@@ -4793,86 +4791,86 @@ Index
 
 
 Tag Table:
-Node: Top1609
-Node: Introduction2251
-Node: History4076
-Node: Installation8168
-Node: Simple installation8958
-Node: Custom installation12541
-Node: Disk space13715
-Node: Kpathsea application distributions14599
-Node: Changing search paths15714
-Node: Default path features16896
-Node: Default path generation19032
-Node: Running configure20475
-Node: configure shells21526
-Node: configure options22578
-Node: configure environment24085
-Node: configure scenarios25887
-Node: Shared library27473
-Node: Running make28487
-Node: Installing files30534
-Node: Cleaning up32481
-Node: Filename database generation33529
-Node: mktex scripts34096
-Node: mktex configuration35373
-Node: mktex script names41192
-Node: mktex script arguments42583
-Node: Installation testing43473
-Node: Security43837
-Node: TeX directory structure46404
-Node: unixtex.ftp50826
-Node: Electronic distribution52841
-Node: CD-ROM distribution55606
-Node: Other TeX packages56576
-Node: Reporting bugs57872
-Node: Bug checklist58607
-Node: Mailing lists62304
-Node: Debugging63513
-Node: Logging68591
-Node: Common problems70461
-Node: Unable to find files71292
-Node: Slow path searching73703
-Node: Unable to generate fonts75080
-Node: TeX or Metafont failing77589
-Node: Empty Makefiles79467
-Node: XtStrings80697
-Node: dlopen81533
-Node: ShellWidgetClass82351
-Node: Pointer combination warnings83983
-Node: Path searching84372
-Node: Searching overview85019
-Node: Path sources88415
-Node: Config files89486
-Node: Path expansion93131
-Node: Default expansion94080
-Node: Variable expansion96150
-Node: Tilde expansion97553
-Node: Brace expansion98533
-Node: KPSE_DOT expansion99638
-Node: Subdirectory expansion100151
-Node: Filename database102502
-Node: ls-R103556
-Node: Filename aliases106450
-Node: Database format107628
-Node: Invoking kpsewhich108641
-Node: Path searching options109586
-Node: Specially-recognized files116861
-Node: Auxiliary tasks118217
-Node: Standard options120042
-Node: TeX support120362
-Node: Supported file formats121653
-Node: File lookup128966
-Node: Glyph lookup130698
-Node: Basic glyph lookup131822
-Node: Fontmap132701
-Node: Fallback font135318
-Node: Suppressing warnings136231
-Node: Programming137336
-Node: Programming overview137849
-Node: Calling sequence140543
-Node: Program-specific files145511
-Node: Programming with config files146553
-Node: Index147865
+Node: Top1549
+Node: Introduction2191
+Node: History4012
+Node: Installation8104
+Node: Simple installation8894
+Node: Custom installation12477
+Node: Disk space13651
+Node: Kpathsea application distributions14535
+Node: Changing search paths15650
+Node: Default path features16832
+Node: Default path generation18968
+Node: Running configure20411
+Node: configure shells21462
+Node: configure options22514
+Node: configure environment24021
+Node: configure scenarios25823
+Node: Shared library27409
+Node: Running make28423
+Node: Installing files30470
+Node: Cleaning up32417
+Node: Filename database generation33465
+Node: mktex scripts34032
+Node: mktex configuration35309
+Node: mktex script names41128
+Node: mktex script arguments42519
+Node: Installation testing43409
+Node: Security43773
+Node: TeX directory structure46340
+Node: unixtex.ftp50762
+Node: Electronic distribution52772
+Node: CD-ROM distribution55537
+Node: Other TeX packages56352
+Node: Reporting bugs57648
+Node: Bug checklist58383
+Node: Mailing lists62080
+Node: Debugging63289
+Node: Logging68367
+Node: Common problems70237
+Node: Unable to find files71068
+Node: Slow path searching73479
+Node: Unable to generate fonts74856
+Node: TeX or Metafont failing77365
+Node: Empty Makefiles79243
+Node: XtStrings80473
+Node: dlopen81309
+Node: ShellWidgetClass82127
+Node: Pointer combination warnings83759
+Node: Path searching84148
+Node: Searching overview84795
+Node: Path sources88191
+Node: Config files89262
+Node: Path expansion92907
+Node: Default expansion93856
+Node: Variable expansion95926
+Node: Tilde expansion97329
+Node: Brace expansion98309
+Node: KPSE_DOT expansion99414
+Node: Subdirectory expansion99927
+Node: Filename database102278
+Node: ls-R103332
+Node: Filename aliases106226
+Node: Database format107404
+Node: Invoking kpsewhich108417
+Node: Path searching options109362
+Node: Specially-recognized files116637
+Node: Auxiliary tasks117993
+Node: Standard options119818
+Node: TeX support120138
+Node: Supported file formats121429
+Node: File lookup128742
+Node: Glyph lookup130474
+Node: Basic glyph lookup131598
+Node: Fontmap132477
+Node: Fallback font135094
+Node: Suppressing warnings136007
+Node: Programming137112
+Node: Programming overview137625
+Node: Calling sequence140319
+Node: Program-specific files145287
+Node: Programming with config files146329
+Node: Index147641
 
 End Tag Table
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi
index 0d216d5a678..196a67d7134 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.texi
+++ b/Build/source/texk/kpathsea/doc/kpathsea.texi
@@ -30,7 +30,7 @@ permission notice identical to this one.
 Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation
-approved by the TeX Users Group.
+approved by the @TeX{} Users Group.
 @end copying
 
 @c Define new indices for commands, filenames, and options.
@@ -65,9 +65,9 @@ approved by the TeX Users Group.
 @title Kpathsea library
 @subtitle for version @value{version}
 @subtitle @value{month-year}
-@author Karl Berry (@email{kb@@mail.tug.org})
-@author Olaf Weber (@email{infovore@@xs4all.nl})
-@author Taco Hoekwater (@email{taco@@luatex.org})
+@author Karl Berry
+@author Olaf Weber
+@author Taco Hoekwater
 
 @page
 @vskip 0pt plus 1filll
@@ -143,8 +143,8 @@ We distribute the library under the GNU Library General Public License
 you must (offer to) distribute the source to the library, along with any
 changes you have made, and allow anyone to modify the library source and
 distribute their modifications.  It does not mean you have to distribute
-the source to your program, although we hope you will.  See the files
-@file{GPL} and @file{LGPL} for the text of the GNU licenses.
+the source to your program, although we hope you will.  See the
+accompanying files for the text of the GNU licenses.
 
 @cindex @TeX{} Users Group
 If you know enough about @TeX{} to be reading this manual, then you (or
diff --git a/Build/source/texk/kpathsea/doc/unixtex.texi b/Build/source/texk/kpathsea/doc/unixtex.texi
index 19cf159f465..bf47da2a317 100644
--- a/Build/source/texk/kpathsea/doc/unixtex.texi
+++ b/Build/source/texk/kpathsea/doc/unixtex.texi
@@ -21,7 +21,7 @@ is @uref{ftp://ftp.tug.org/tex/unixtex.ftp}, last updated 26 December
 2003.  Also available as @uref{http://www.tug.org/unixtex.ftp}.  The
 IP address is currently @code{[130.225.2.178]}.  It is also in
 Kpathsea source distributions as @file{etc/unixtex.ftp} (although the
-network version is usually newer).  Mail @email{tex-k@@mail.tug.org}
+network version is usually newer).  Mail @email{tex-k@@tug.org}
 with comments or questions.
 
 Following are general instructions for Unix or other sites who wish to
@@ -208,14 +208,12 @@ minimal @TeX{} source distribution described in the previous section
 
 @item
 @cindex Linux, using Web2c
-Most Linux distributions include some @TeX{} package based on
-Web2c; see the Linux documentation file @samp{Distribution-HOWTO} for a
-comparison of Linux distributions, available (for example) via
-@uref{http://www.linux.org}.
+Most GNU/Linux distributions include some @TeX{} package based on
+@TeX{} Live.
 @end itemize
 
 If you know of additional @TeX{} distributions to add to this
-list, please inform @email{tex-k@@mail.tug.org}.
+list, please inform @email{tex-k@@tug.org}.
 
 @ignore
 
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index e8bb6ddbf65..794e790475f 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -1,7 +1,7 @@
 /* kpsewhich -- standalone path lookup and variable expansion for Kpathsea.
    Ideas from Thomas Esser, Pierre MacKay, and many others.
 
-   Copyright 1995-2008 Karl Berry & Olaf Weber.
+   Copyright 1995-2009 Karl Berry & Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -467,7 +467,7 @@ read_command_line (kpathsea kpse, int argc,  string *argv)
     } else if (ARGUMENT_IS ("version")) {
       extern KPSEDLL char *kpathsea_version_string; /* from version.c */
       puts (kpathsea_version_string);
-      puts ("Copyright 2008 Karl Berry & Olaf Weber.\n\
+      puts ("Copyright 2009 Karl Berry & Olaf Weber.\n\
 License LGPLv2.1+: GNU Lesser GPL version 2.1 or later <http://gnu.org/licenses/lgpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n");
diff --git a/Build/source/texk/kpathsea/version.c b/Build/source/texk/kpathsea/version.c
index 5259a8f51a9..a5c2ddbf492 100644
--- a/Build/source/texk/kpathsea/version.c
+++ b/Build/source/texk/kpathsea/version.c
@@ -1,6 +1,6 @@
 /*  version.c: version number for libkpathsea.
 
-    Copyright 1993, 1996, 2008 Karl Berry.
+    Copyright 1993, 1996, 2008, 2009 Karl Berry.
     Copyright 1997, 1999, 2005 Olaf Weber.
   
    This library is free software; you can redistribute it and/or
@@ -21,13 +21,9 @@
 
 KPSEDLL char *kpathsea_version_string = (char *) KPSEVERSION;
 
-/* If you are redistributing a modified version of my original
-   distribution, please change this address.
-
-   Also change the address in makempx.in, mpto.c, and newer.c in
-   web2c/mpware/, and in dvilj/dvihp.
-
-   Thanks.  --kb@cs.umb.edu  */
+/* If you are redistributing a modified version of the original
+   distribution, please change this address here, among many other
+   places.  Thanks.  */
 
 KPSEDLL char *kpathsea_bug_address = (char *) 
-  "Email bug reports to tex-k@mail.tug.org.\n";
+  "Email bug reports to tex-k@tug.org.\n";