remove /dev from version strings, as 2016 trial builds continue

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

4 files changed, 21 insertions, 15 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 3a08e75ec69..f413ba82af2 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-06  Karl Berry  <karl@tug.org>
+
+	* version.ac: remove /dev for start of 2016 builds.
+
 2016-02-27  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* kpsewhich.c: Allow Unicode file name for upmendex in kpsewhich.
diff --git a/Build/source/texk/kpathsea/c-auto.in b/Build/source/texk/kpathsea/c-auto.in
index 8029626515c..f297e7960b6 100644
--- a/Build/source/texk/kpathsea/c-auto.in
+++ b/Build/source/texk/kpathsea/c-auto.in
@@ -23,7 +23,7 @@
 #define KPATHSEA_C_AUTO_H
 
 /* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.2.2dev"
+#define KPSEVERSION "kpathsea version 6.2.2"
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 7ca877fb6c9..1960d032d00 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.69 for Kpathsea 6.2.2dev.
+# Generated by GNU Autoconf 2.69 for Kpathsea 6.2.2.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Kpathsea'
 PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.2.2dev'
-PACKAGE_STRING='Kpathsea 6.2.2dev'
+PACKAGE_VERSION='6.2.2'
+PACKAGE_STRING='Kpathsea 6.2.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1339,7 +1339,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.2.2dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1409,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Kpathsea 6.2.2dev:";;
+     short | recursive ) echo "Configuration of Kpathsea 6.2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1537,7 +1537,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kpathsea configure 6.2.2dev
+Kpathsea configure 6.2.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2376,7 +2376,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.2.2dev, which was
+It was created by Kpathsea $as_me 6.2.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2757,14 +2757,14 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-KPSEVERSION=6.2.2dev
+KPSEVERSION=6.2.2
 
 
 KPSE_LT_VERSINFO=8:2:2
 
 
 
- WEB2CVERSION=" (TeX Live 2016/dev)"
+ WEB2CVERSION=" (TeX Live 2016)"
 
 
 am__api_version='1.15'
@@ -8071,7 +8071,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='kpathsea'
- VERSION='6.2.2dev'
+ VERSION='6.2.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14695,7 +14695,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.2.2dev, which was
+This file was extended by Kpathsea $as_me 6.2.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14761,7 +14761,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.2.2dev
+Kpathsea config.status 6.2.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/kpathsea/version.ac b/Build/source/texk/kpathsea/version.ac
index 66bb0097115..35d4dfe090f 100644
--- a/Build/source/texk/kpathsea/version.ac
+++ b/Build/source/texk/kpathsea/version.ac
@@ -1,3 +1,5 @@
+dnl $Id$
+dnl   Copyright 2016 Karl Berry <tex-live@tug.org>
 dnl   Copyright 2011-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
@@ -17,5 +19,5 @@ dnl   After a release:
 dnl     append "dev", to distinguish binaries built between releases.
 dnl --------------------------------------------------------
 dnl
-dnl  m4-include this file to define the current kpathsea version
-m4_define([kpse_version], [6.2.2dev])
+dnl  this file is m4-included from configure.ac
+m4_define([kpse_version], [6.2.2])