summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-04-16 13:41:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-04-16 13:41:48 +0000
commitb517e15e9fb22ebb6d36127ff64470f8a00309d0 (patch)
treeaf53263115d70f4a420fc95c6c9b2228a701d6b1 /Build
parent075862c5ff18610119538267c9b817d21d767780 (diff)
kpathsea: Minor build fix and clean up
git-svn-id: svn://tug.org/texlive/trunk@25986 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog17
-rw-r--r--Build/source/texk/kpathsea/Makefile.am4
-rw-r--r--Build/source/texk/kpathsea/Makefile.in6
-rw-r--r--Build/source/texk/kpathsea/c-unistd.h2
-rw-r--r--Build/source/texk/kpathsea/cnf.c9
-rw-r--r--Build/source/texk/kpathsea/cnf.h10
-rwxr-xr-xBuild/source/texk/kpathsea/configure5
-rw-r--r--Build/source/texk/kpathsea/configure.ac3
-rw-r--r--Build/source/texk/kpathsea/db.h4
-rw-r--r--Build/source/texk/kpathsea/doc/Makefile.in4
-rw-r--r--Build/source/texk/kpathsea/getopt.h4
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.in4
-rw-r--r--Build/source/texk/kpathsea/mingw32.h17
-rw-r--r--Build/source/texk/kpathsea/version.ac6
-rw-r--r--Build/source/texk/kpathsea/win32/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.am5
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.in7
-rw-r--r--Build/source/texk/kpathsea/win32/mktexpk.c7
-rw-r--r--Build/source/texk/kpathsea/win32/mktextfm.c7
-rw-r--r--Build/source/texk/ptexenc/version.ac6
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst2
21 files changed, 89 insertions, 46 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index dd54531130a..779e65407a4 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * cnf.[ch]: Drop KPSEDLL from kpathsea_cnf_get(), and remove
+ kpse_cnf_get().
+ * db.h: Drop KPSEDLL from kpathsea_db_insert().
+ * Makefile.am: Do not install cnf.h.
+ * mingw32.h: Add a copyright statement.
+
+ * configure.ac: Subst tex_live_version from ../../version.ac
+ as WEB2CVERSION for WIN32 programs.
+
2012-04-09 Karl Berry <karl@tug.org>
* getopt.h (getopt) [!__cplusplus]: do not declare when compiling
@@ -13,6 +24,12 @@
* texmf.cnf (glob_str_size): increase from 5000 to 20000 per Akira,
06 Apr 2012 10:25:18.
+2012-04-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * c-unistd.h: Declare getopt() (via <kpathsea/getopt.h>) only
+ for Mingw and Cygwin; for other systems using the GNU C library
+ g++-4.7 might choke on incompatible exception specifications.
+
2012-03-11 Karl Berry <karl@tug.org>
* *.c: prepend kpathsea: to warnings.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index 795aee6fe2e..51cb04911dd 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/kpathsea/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -137,7 +137,6 @@ normal_headers = \
c-stat.h \
c-std.h \
c-unistd.h \
- cnf.h \
concatn.h \
debug.h \
expand.h \
@@ -162,6 +161,7 @@ normal_headers = \
version.h
noinst_HEADERS = \
+ cnf.h \
db.h \
default.h \
fn.h \
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 26752886371..3e5e68feeb8 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -90,7 +90,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
- $(top_srcdir)/ac/mktex.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/mktex.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -350,6 +351,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -456,7 +458,6 @@ normal_headers = \
c-stat.h \
c-std.h \
c-unistd.h \
- cnf.h \
concatn.h \
debug.h \
expand.h \
@@ -481,6 +482,7 @@ normal_headers = \
version.h
noinst_HEADERS = \
+ cnf.h \
db.h \
default.h \
fn.h \
diff --git a/Build/source/texk/kpathsea/c-unistd.h b/Build/source/texk/kpathsea/c-unistd.h
index a8c49ba09c1..1f5f2fcb964 100644
--- a/Build/source/texk/kpathsea/c-unistd.h
+++ b/Build/source/texk/kpathsea/c-unistd.h
@@ -24,8 +24,10 @@
#include <kpathsea/systypes.h>
#if HAVE_UNISTD_H
+#if defined (WIN32) || defined (__CYGWIN__)
# define __need_getopt
#include <kpathsea/getopt.h>
+#endif
#include <unistd.h>
#endif
diff --git a/Build/source/texk/kpathsea/cnf.c b/Build/source/texk/kpathsea/cnf.c
index 1f9dc744c88..97cf02d6a93 100644
--- a/Build/source/texk/kpathsea/cnf.c
+++ b/Build/source/texk/kpathsea/cnf.c
@@ -271,12 +271,3 @@ kpathsea_cnf_get (kpathsea kpse, const_string name)
return ret;
}
-
-#if defined(KPSE_COMPAT_API)
-string
-kpse_cnf_get (const_string name)
-{
- return kpathsea_cnf_get(kpse_def, name);
-}
-#endif
-
diff --git a/Build/source/texk/kpathsea/cnf.h b/Build/source/texk/kpathsea/cnf.h
index dca285a3da7..45f95f9aebf 100644
--- a/Build/source/texk/kpathsea/cnf.h
+++ b/Build/source/texk/kpathsea/cnf.h
@@ -1,6 +1,6 @@
/* cnf.h: runtime config files.
- Copyright 1994, 1995, 2008 Karl Berry.
+ Copyright 1994, 1995, 2008, 2012 Karl Berry.
Copyright 1999, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -19,6 +19,8 @@
#ifndef KPATHSEA_CNF_H
#define KPATHSEA_CNF_H
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
#include <kpathsea/c-proto.h>
#include <kpathsea/types.h>
@@ -26,10 +28,8 @@
On the first call, also read all the `texmf.cnf' files in the
path for kpse_cnf_format (and initialize the path). */
-extern KPSEDLL string kpathsea_cnf_get (kpathsea kpse, const_string name);
+extern string kpathsea_cnf_get (kpathsea kpse, const_string name);
-#if defined(KPSE_COMPAT_API)
-extern KPSEDLL string kpse_cnf_get (const_string var);
-#endif
+#endif /* MAKE_KPSE_DLL */
#endif /* not KPATHSEA_CNF_H */
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 6f79049b660..a530e6eef90 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -696,6 +696,7 @@ am__isrc
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
+WEB2CVERSION
KPSE_LT_VERSINFO
KPSEVERSION
target_alias
@@ -2410,6 +2411,10 @@ $as_echo "#define KPSEVERSION \"kpathsea version 6.1.0dev\"" >>confdefs.h
KPSE_LT_VERSINFO=7:0:1
+
+ WEB2CVERSION=2012/dev
+
+
am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index 2688cb01130..79ad5910402 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -17,6 +17,9 @@ AC_SUBST([KPSEVERSION], [kpse_version])
AC_DEFINE([KPSEVERSION], ["kpathsea version kpse_version"])
KPSE_LT_VERSION([kpse])
+m4_include([../../version.ac])[] dnl define tex_live_version
+AC_SUBST([WEB2CVERSION], [tex_live_version])
+
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([kpathsea])
dnl Include additional code for kpathsea.
diff --git a/Build/source/texk/kpathsea/db.h b/Build/source/texk/kpathsea/db.h
index d5ddb3d6200..8c06cb85edc 100644
--- a/Build/source/texk/kpathsea/db.h
+++ b/Build/source/texk/kpathsea/db.h
@@ -44,8 +44,8 @@ extern str_list_type *kpathsea_db_search_list (kpathsea kpse,
boolean all);
/* Insert the filename FNAME into the database.
- Called by mktexpk et al. */
-extern KPSEDLL void kpathsea_db_insert (kpathsea kpse, const_string fname);
+ Called by mktex() in tex-make.c. */
+extern void kpathsea_db_insert (kpathsea kpse, const_string fname);
#endif /* MAKE_KPSE_DLL */
diff --git a/Build/source/texk/kpathsea/doc/Makefile.in b/Build/source/texk/kpathsea/doc/Makefile.in
index ad27a1a5d99..551b1a0d308 100644
--- a/Build/source/texk/kpathsea/doc/Makefile.in
+++ b/Build/source/texk/kpathsea/doc/Makefile.in
@@ -64,7 +64,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
- $(top_srcdir)/ac/mktex.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/mktex.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -187,6 +188,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/kpathsea/getopt.h b/Build/source/texk/kpathsea/getopt.h
index a2530b8bf8f..8acf05fb4fb 100644
--- a/Build/source/texk/kpathsea/getopt.h
+++ b/Build/source/texk/kpathsea/getopt.h
@@ -121,8 +121,8 @@ struct option
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. And not when
- compiling with C++; g++ 4.7.0 has introduced a conflicting
- declaration. */
+ compiling with C++; g++ 4.7.0 chokes on conflicting exception
+ specifications. */
#if !defined (__cplusplus)
extern KPSEDLL int getopt (int argc, char *const *argv, const char *shortopts);
#endif
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index f3d6eece941..73479714c9b 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -64,7 +64,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
- $(top_srcdir)/ac/mktex.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/mktex.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -177,6 +178,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/kpathsea/mingw32.h b/Build/source/texk/kpathsea/mingw32.h
index 4c1da11085b..fbd3a0d15d1 100644
--- a/Build/source/texk/kpathsea/mingw32.h
+++ b/Build/source/texk/kpathsea/mingw32.h
@@ -1,3 +1,20 @@
+/* mingw32.h: declarations for mingw32.
+
+ Copyright 2009-2012 Taco Hoekwater <taco@luatex.org>.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>. */
+
#ifndef _MINGW32_H_
#define _MINGW32_H_
diff --git a/Build/source/texk/kpathsea/version.ac b/Build/source/texk/kpathsea/version.ac
index 837485cca92..627f3264b75 100644
--- a/Build/source/texk/kpathsea/version.ac
+++ b/Build/source/texk/kpathsea/version.ac
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -12,9 +12,7 @@ dnl a.b.c => a.b.c+1
dnl Adding new interfaces (backwards compatible)
dnl a.b.c => a.b+1.0
dnl Modifying or revoking interfaces (not backwards compatible)
-dnl a.b.c => a+1.b.c
-dnl kpse_lib_minor = 0;
-dnl kpse_lib_micro = 0;
+dnl a.b.c => a+1.0.0
dnl
dnl After a release:
dnl append "dev", to distinguish binaries built between releases.
diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog
index e9395b5bce9..87391e2e45c 100644
--- a/Build/source/texk/kpathsea/win32/ChangeLog
+++ b/Build/source/texk/kpathsea/win32/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (AM_CPPFLAGS): Define WEB2C_KPSE_VERSION.
+ * mktexpk.c, mktextfm.c: Drop WINWEB2CVERSION, WINKPSEVERSION,
+ use WEB2C_KPSE_VERSION with versions from configure.
+
2011-08-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* fmtutil.c: Add parens around assignment used as truth value.
diff --git a/Build/source/texk/kpathsea/win32/Makefile.am b/Build/source/texk/kpathsea/win32/Makefile.am
index 3f5cfc9d35c..1e0614ac519 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.am
+++ b/Build/source/texk/kpathsea/win32/Makefile.am
@@ -1,9 +1,10 @@
## Makefile.am for the TeX Live subdirectory texk/dviljk/win32/
##
-## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
+INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CPPFLAGS = -DWEB2C_KPSE_VERSION='"Web2C-$(WEB2CVERSION) Kpathsea-$(KPSEVERSION)"'
AM_CFLAGS = $(WARNING_CFLAGS)
# Build WIN32 replacements for Unix shell scripts.
diff --git a/Build/source/texk/kpathsea/win32/Makefile.in b/Build/source/texk/kpathsea/win32/Makefile.in
index 1b0da7e023a..b91cb047ab3 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.in
+++ b/Build/source/texk/kpathsea/win32/Makefile.in
@@ -67,7 +67,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
- $(top_srcdir)/ac/mktex.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/mktex.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -202,6 +203,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -254,7 +256,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
+INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CPPFLAGS = -DWEB2C_KPSE_VERSION='"Web2C-$(WEB2CVERSION) Kpathsea-$(KPSEVERSION)"'
AM_CFLAGS = $(WARNING_CFLAGS)
fmtutil_SOURCES = \
dirutil.c \
diff --git a/Build/source/texk/kpathsea/win32/mktexpk.c b/Build/source/texk/kpathsea/win32/mktexpk.c
index e4f23087644..e4bd7c3e5e2 100644
--- a/Build/source/texk/kpathsea/win32/mktexpk.c
+++ b/Build/source/texk/kpathsea/win32/mktexpk.c
@@ -33,9 +33,6 @@
#include "getdestdir.h"
#include "mktexupd.h"
-#define WINWEB2CVERSION "Web2C-2011"
-#define WINKPSEVERSION " Kpathsea-6.0.1"
-
#define LLBUF 1024
#define LBUF 512
#define SBUF 256
@@ -118,8 +115,8 @@ skipchar(char **p)
static void
version (void)
{
- fprintf (stderr, "%s, (C version 1.5 --ak 2006-2011)\n", progname);
- fprintf (stderr, WINWEB2CVERSION WINKPSEVERSION "\n");
+ fprintf (stderr, "%s, (C version 1.5 --ak 2006-2012)\n", progname);
+ fprintf (stderr, WEB2C_KPSE_VERSION "\n");
}
static void
diff --git a/Build/source/texk/kpathsea/win32/mktextfm.c b/Build/source/texk/kpathsea/win32/mktextfm.c
index 14ef9526b85..a418f4b339f 100644
--- a/Build/source/texk/kpathsea/win32/mktextfm.c
+++ b/Build/source/texk/kpathsea/win32/mktextfm.c
@@ -7,9 +7,6 @@
* change current dir to tmp.
*/
-#define WINWEB2CVERSION "Web2C-2011"
-#define WINKPSEVERSION " Kpathsea-6.0.1"
-
#include <kpathsea/kpathsea.h>
#include "dirutil.h"
@@ -32,8 +29,8 @@ usage (void)
static void
version (void)
{
- fprintf (stderr, "%s, (C version 1.4 --ak 2009-2011)\n", progname);
- fprintf (stderr, WINWEB2CVERSION WINKPSEVERSION "\n");
+ fprintf (stderr, "%s, (C version 1.4 --ak 2009-2012)\n", progname);
+ fprintf (stderr, WEB2C_KPSE_VERSION "\n");
return;
}
diff --git a/Build/source/texk/ptexenc/version.ac b/Build/source/texk/ptexenc/version.ac
index 0a69d319571..2f11af4ad18 100644
--- a/Build/source/texk/ptexenc/version.ac
+++ b/Build/source/texk/ptexenc/version.ac
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -12,9 +12,7 @@ dnl a.b.c => a.b.c+1
dnl Adding new interfaces (backwards compatible)
dnl a.b.c => a.b+1.0
dnl Modifying or revoking interfaces (not backwards compatible)
-dnl a.b.c => a+1.b.c
-dnl kpse_lib_minor = 0;
-dnl kpse_lib_micro = 0;
+dnl a.b.c => a+1.0.0
dnl
dnl After a release:
dnl append "dev", to distinguish binaries built between releases.
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 859ebf64d46..1265c6cb1a7 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -44,6 +44,7 @@ ebong/ebong.py
epspdf/epspdf.rb
epspdf/epspdftk.tcl
epstopdf/epstopdf.pl
+exceltex/exceltex
fig4latex/fig4latex
findhyph/findhyph
fontools/afm2afm
@@ -72,6 +73,7 @@ musixtex/musixtex.lua
oberdiek/pdfatfi.pl
pax/pdfannotextractor.pl
pdfcrop/pdfcrop.pl
+pedigree-perl/pedigree.pl
perltex/perltex.pl
pkfix/pkfix.pl
pkfix-helper/pkfix-helper