summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am14
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in12
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/latexfileversion/latexfileversion118
l---------Master/bin/alpha-linux/latexfileversion1
l---------Master/bin/amd64-freebsd/latexfileversion1
l---------Master/bin/amd64-kfreebsd/latexfileversion1
l---------Master/bin/i386-cygwin/latexfileversion1
l---------Master/bin/i386-freebsd/latexfileversion1
l---------Master/bin/i386-kfreebsd/latexfileversion1
l---------Master/bin/i386-linux/latexfileversion1
l---------Master/bin/i386-netbsd/latexfileversion1
l---------Master/bin/i386-solaris/latexfileversion1
l---------Master/bin/mips-irix/latexfileversion1
l---------Master/bin/powerpc-aix/latexfileversion1
l---------Master/bin/powerpc-linux/latexfileversion1
l---------Master/bin/sparc-linux/latexfileversion1
l---------Master/bin/sparc-solaris/latexfileversion1
l---------Master/bin/universal-darwin/latexfileversion1
l---------Master/bin/x86_64-darwin/latexfileversion1
l---------Master/bin/x86_64-linux/latexfileversion1
l---------Master/bin/x86_64-solaris/latexfileversion1
-rw-r--r--Master/texmf-dist/doc/support/latexfileversion/ChangeLog9
-rw-r--r--Master/texmf-dist/doc/support/latexfileversion/README29
-rwxr-xr-xMaster/texmf-dist/scripts/latexfileversion/latexfileversion118
-rwxr-xr-xMaster/tlpkg/bin/check-files-by-format2
-rwxr-xr-xMaster/tlpkg/bin/check-wrapper-consistency14
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check3
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds3
-rw-r--r--Master/tlpkg/tlpsrc/collection-binextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/latexfileversion.tlpsrc1
30 files changed, 320 insertions, 22 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 60ada7f660a..d2455afa888 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/texlive/linked_scripts/
##
-## 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.
##
## TeX Live's extra scripts.
@@ -53,6 +53,7 @@ texmf_dist_scriptsdir = $(datarootdir)/texmf-dist/scripts
texmf_dist_shell_scripts = \
bibexport/bibexport.sh \
installfont/installfont-tl \
+ latexfileversion/latexfileversion \
listings-ext/listings-ext.sh \
pdfjam/pdf180 \
pdfjam/pdf270 \
@@ -142,14 +143,15 @@ bin_links = \
# The idea is to install the scripts themselves in texmf*/scripts, and
# have bin/arch/foo be a symlink to, say,
# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
-# space, but much more importantly omit duplication, and most
+# space, but more importantly omit duplication, and most
# importantly of all make it possible to invoke the same Perl script on
# Windows (see ../w32_wrapper).
-#
+#
# The installation into texmf*/scripts is ideally done with ctan2tl.
-# The copy of the wrapper for Windows is done by hand, but (todo)
-# could/should also be done by ctan2tl. The check-wrapper-consistency
-# script at least checks after the fact for problems.
+# The copy of the wrapper for Windows is done by hand, is done by
+# ctan2tl. (And for shell scripts, its addition must be undone by
+# hand.) The check-wrapper-consistency script checks after the fact for
+# problems.
#
# We also keep a copy of all the scripts here and install into the runtime.
# This is purely for other distro builders, so symlinks are not dangling in
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index fe739c29309..a61ed0f1802 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -169,14 +169,15 @@ DISTCLEANFILES = scripts.tmp
# The idea is to install the scripts themselves in texmf*/scripts, and
# have bin/arch/foo be a symlink to, say,
# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
-# space, but much more importantly omit duplication, and most
+# space, but more importantly omit duplication, and most
# importantly of all make it possible to invoke the same Perl script on
# Windows (see ../w32_wrapper).
-#
+#
# The installation into texmf*/scripts is ideally done with ctan2tl.
-# The copy of the wrapper for Windows is done by hand, but (todo)
-# could/should also be done by ctan2tl. The check-wrapper-consistency
-# script at least checks after the fact for problems.
+# The copy of the wrapper for Windows is done by hand, is done by
+# ctan2tl. (And for shell scripts, its addition must be undone by
+# hand.) The check-wrapper-consistency script checks after the fact for
+# problems.
#
# We also keep a copy of all the scripts here and install into the runtime.
# This is purely for other distro builders, so symlinks are not dangling in
@@ -213,6 +214,7 @@ texmf_dist_scriptsdir = $(datarootdir)/texmf-dist/scripts
texmf_dist_shell_scripts = \
bibexport/bibexport.sh \
installfont/installfont-tl \
+ latexfileversion/latexfileversion \
listings-ext/listings-ext.sh \
pdfjam/pdf180 \
pdfjam/pdf270 \
diff --git a/Build/source/texk/texlive/linked_scripts/latexfileversion/latexfileversion b/Build/source/texk/texlive/linked_scripts/latexfileversion/latexfileversion
new file mode 100755
index 00000000000..bae05f520aa
--- /dev/null
+++ b/Build/source/texk/texlive/linked_scripts/latexfileversion/latexfileversion
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+## latexfileversion
+##
+## This simple shell script prints the version and date of a LaTeX class or
+## style file.
+##
+## Version 0.3, 2011-12-31, Add support for arbitrary tex input file types
+## Rename from getfileversion to latexfileversion
+## Version 0.2, 2011-12-30, Avoid special characters as guillemots
+## Version 0.1, 2005-04-30, Initial version
+##
+## Copyright 2005, 2011 Harald Harders, harald.harders@gmx.de
+##
+## This programme may be distributed and/or modified under the
+## conditions of the LaTeX Project Public License, either version 1.2
+## of this license or (at your option) any later version.
+## The latest version of this license is in
+## http://www.latex-project.org/lppl.txt
+## and version 1.2 or later is part of all distributions of LaTeX
+## version 1999/12/01 or later.
+##
+## This programme consists of the files
+## latexfileversion, README, and ChangeLog.
+VERSION=0.3
+
+# help screen
+if [ -z "$1" ]
+then
+ echo 'latexfileversion v'$VERSION >&2
+ echo '' >&2
+ echo 'This programme prints the version and date of a LaTeX class or' >&2
+ echo 'style file.' >&2
+ echo '' >&2
+ echo 'Syntax:' >&2
+ echo 'latexfileversion <file>' >&2
+ echo '' >&2
+ echo 'This programme handles style files (extension .sty),' >&2
+ echo 'class files (extension .cls), and other tex input files.' >&2
+ echo 'The file extension must be given.' >&2
+ exit 1
+fi
+
+# make temporary directory
+TMPDIR=`mktemp -d /tmp/latexfileversion.XXXXXX` || exit 1
+cd $TMPDIR
+
+# extract basenames for extensions .cls and .sty
+FILE=$1
+STYLE=${1%%.sty}
+CLASS=${1%%.cls}
+
+# handle .cls files and .sty files seperately
+if [ "$CLASS.cls" == "$FILE" ]
+then
+ echo -n "Looking for class file '$CLASS.cls': "
+ # generate temporary LaTeX file
+(
+cat << EOM
+\documentclass{$CLASS}
+\nofiles
+\makeatletter
+\def\GetFileInfo#1{%
+ \def\filename{#1}%
+ \def\@tempb##1 ##2 ##3\relax##4\relax{%
+ \def\filedate{##1}%
+ \def\fileversion{##2}%
+ \def\fileinfo{##3}}%
+ \edef\@tempa{\csname ver@#1\endcsname}%
+ \expandafter\@tempb\@tempa\relax? ? \relax\relax}
+\makeatother
+\GetFileInfo{$CLASS.cls}
+\typeout{VERSION \fileversion, \filedate}
+\begin{document}
+\end{document}
+EOM
+) > latexfileversion.tex
+else
+ if [ "$STYLE.sty" == "$FILE" ]
+ then
+ echo -n "Looking for style file '$STYLE.sty': "
+ # generate temporary LaTeX file
+(
+cat << EOM
+\documentclass{ltxdoc}
+\nofiles
+\usepackage{$STYLE}
+\GetFileInfo{$STYLE.sty}
+\typeout{VERSION \fileversion, \filedate}
+\begin{document}
+\end{document}
+EOM
+) > latexfileversion.tex
+ else
+ echo -n "Looking for file '$FILE': "
+ # generate temporary LaTeX file
+(
+cat << EOM
+\documentclass{ltxdoc}
+\nofiles
+\input{$FILE}
+\GetFileInfo{$FILE}
+\typeout{VERSION \fileversion, \filedate}
+\begin{document}
+\end{document}
+EOM
+) > latexfileversion.tex
+ fi
+fi
+
+# run temporary LaTeX file which writes »VERSION ...« into the logfile
+pdflatex -interaction=nonstopmode latexfileversion.tex > /dev/null
+# extract the line containing »VERSION« and remove »VERSION «
+grep -e '^VERSION' latexfileversion.log | sed 's/VERSION //'
+
+# delete temporary directory
+rm -rf $TMPDIR
+
+#EOF
diff --git a/Master/bin/alpha-linux/latexfileversion b/Master/bin/alpha-linux/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/alpha-linux/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/latexfileversion b/Master/bin/amd64-freebsd/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/amd64-freebsd/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/latexfileversion b/Master/bin/amd64-kfreebsd/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/amd64-kfreebsd/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/latexfileversion b/Master/bin/i386-cygwin/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/i386-cygwin/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/latexfileversion b/Master/bin/i386-freebsd/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/i386-freebsd/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/latexfileversion b/Master/bin/i386-kfreebsd/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/i386-kfreebsd/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/i386-linux/latexfileversion b/Master/bin/i386-linux/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/i386-linux/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/latexfileversion b/Master/bin/i386-netbsd/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/i386-netbsd/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/i386-solaris/latexfileversion b/Master/bin/i386-solaris/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/i386-solaris/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/mips-irix/latexfileversion b/Master/bin/mips-irix/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/mips-irix/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/powerpc-aix/latexfileversion b/Master/bin/powerpc-aix/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/powerpc-aix/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/powerpc-linux/latexfileversion b/Master/bin/powerpc-linux/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/powerpc-linux/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/sparc-linux/latexfileversion b/Master/bin/sparc-linux/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/sparc-linux/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/sparc-solaris/latexfileversion b/Master/bin/sparc-solaris/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/sparc-solaris/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/universal-darwin/latexfileversion b/Master/bin/universal-darwin/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/universal-darwin/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/latexfileversion b/Master/bin/x86_64-darwin/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/x86_64-darwin/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/latexfileversion b/Master/bin/x86_64-linux/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/x86_64-linux/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/latexfileversion b/Master/bin/x86_64-solaris/latexfileversion
new file mode 120000
index 00000000000..a18f79465fc
--- /dev/null
+++ b/Master/bin/x86_64-solaris/latexfileversion
@@ -0,0 +1 @@
+../../texmf-dist/scripts/latexfileversion/latexfileversion \ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/latexfileversion/ChangeLog b/Master/texmf-dist/doc/support/latexfileversion/ChangeLog
new file mode 100644
index 00000000000..c99b4da24a3
--- /dev/null
+++ b/Master/texmf-dist/doc/support/latexfileversion/ChangeLog
@@ -0,0 +1,9 @@
+2011-12-31 v0.3 Harald Harders
+ - Rename from getfileversion to latexfileversion
+ - Add support for arbitrary tex input file types
+
+2011-12-30 v0.2 Harald Harders
+ - Avoid special characters as guillemets
+
+2005-04-30 v0.1 Harald Harders
+ - Initial version.
diff --git a/Master/texmf-dist/doc/support/latexfileversion/README b/Master/texmf-dist/doc/support/latexfileversion/README
new file mode 100644
index 00000000000..82c7ef6e925
--- /dev/null
+++ b/Master/texmf-dist/doc/support/latexfileversion/README
@@ -0,0 +1,29 @@
+
+This simple shell script prints the version and date of a LaTeX input
+files (e.g., class or style files).
+
+Syntax:
+latexfileversion <file>
+
+This programme handles style files (extension .sty),
+class files (extension .cls), and other tex input files.
+The file extension must be given.
+
+
+Copyright 2005, 2011 Harald Harders, h.harders@tu-bs.de
+
+This programme may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.2
+of this license or (at your option) any later version.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.2 or later is part of all distributions of LaTeX
+version 1999/12/01 or later.
+
+This programme consists of the files latexfileversion, README, and ChangeLog.
+
+Before version 0.3, this tool used to be named getfileversion.
+
+Harald Harders
+harald.harders@gmx.de
+2011-12-31
diff --git a/Master/texmf-dist/scripts/latexfileversion/latexfileversion b/Master/texmf-dist/scripts/latexfileversion/latexfileversion
new file mode 100755
index 00000000000..bae05f520aa
--- /dev/null
+++ b/Master/texmf-dist/scripts/latexfileversion/latexfileversion
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+## latexfileversion
+##
+## This simple shell script prints the version and date of a LaTeX class or
+## style file.
+##
+## Version 0.3, 2011-12-31, Add support for arbitrary tex input file types
+## Rename from getfileversion to latexfileversion
+## Version 0.2, 2011-12-30, Avoid special characters as guillemots
+## Version 0.1, 2005-04-30, Initial version
+##
+## Copyright 2005, 2011 Harald Harders, harald.harders@gmx.de
+##
+## This programme may be distributed and/or modified under the
+## conditions of the LaTeX Project Public License, either version 1.2
+## of this license or (at your option) any later version.
+## The latest version of this license is in
+## http://www.latex-project.org/lppl.txt
+## and version 1.2 or later is part of all distributions of LaTeX
+## version 1999/12/01 or later.
+##
+## This programme consists of the files
+## latexfileversion, README, and ChangeLog.
+VERSION=0.3
+
+# help screen
+if [ -z "$1" ]
+then
+ echo 'latexfileversion v'$VERSION >&2
+ echo '' >&2
+ echo 'This programme prints the version and date of a LaTeX class or' >&2
+ echo 'style file.' >&2
+ echo '' >&2
+ echo 'Syntax:' >&2
+ echo 'latexfileversion <file>' >&2
+ echo '' >&2
+ echo 'This programme handles style files (extension .sty),' >&2
+ echo 'class files (extension .cls), and other tex input files.' >&2
+ echo 'The file extension must be given.' >&2
+ exit 1
+fi
+
+# make temporary directory
+TMPDIR=`mktemp -d /tmp/latexfileversion.XXXXXX` || exit 1
+cd $TMPDIR
+
+# extract basenames for extensions .cls and .sty
+FILE=$1
+STYLE=${1%%.sty}
+CLASS=${1%%.cls}
+
+# handle .cls files and .sty files seperately
+if [ "$CLASS.cls" == "$FILE" ]
+then
+ echo -n "Looking for class file '$CLASS.cls': "
+ # generate temporary LaTeX file
+(
+cat << EOM
+\documentclass{$CLASS}
+\nofiles
+\makeatletter
+\def\GetFileInfo#1{%
+ \def\filename{#1}%
+ \def\@tempb##1 ##2 ##3\relax##4\relax{%
+ \def\filedate{##1}%
+ \def\fileversion{##2}%
+ \def\fileinfo{##3}}%
+ \edef\@tempa{\csname ver@#1\endcsname}%
+ \expandafter\@tempb\@tempa\relax? ? \relax\relax}
+\makeatother
+\GetFileInfo{$CLASS.cls}
+\typeout{VERSION \fileversion, \filedate}
+\begin{document}
+\end{document}
+EOM
+) > latexfileversion.tex
+else
+ if [ "$STYLE.sty" == "$FILE" ]
+ then
+ echo -n "Looking for style file '$STYLE.sty': "
+ # generate temporary LaTeX file
+(
+cat << EOM
+\documentclass{ltxdoc}
+\nofiles
+\usepackage{$STYLE}
+\GetFileInfo{$STYLE.sty}
+\typeout{VERSION \fileversion, \filedate}
+\begin{document}
+\end{document}
+EOM
+) > latexfileversion.tex
+ else
+ echo -n "Looking for file '$FILE': "
+ # generate temporary LaTeX file
+(
+cat << EOM
+\documentclass{ltxdoc}
+\nofiles
+\input{$FILE}
+\GetFileInfo{$FILE}
+\typeout{VERSION \fileversion, \filedate}
+\begin{document}
+\end{document}
+EOM
+) > latexfileversion.tex
+ fi
+fi
+
+# run temporary LaTeX file which writes »VERSION ...« into the logfile
+pdflatex -interaction=nonstopmode latexfileversion.tex > /dev/null
+# extract the line containing »VERSION« and remove »VERSION «
+grep -e '^VERSION' latexfileversion.log | sed 's/VERSION //'
+
+# delete temporary directory
+rm -rf $TMPDIR
+
+#EOF
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index ae01e703735..8c74c7f4aff 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -91,7 +91,7 @@ my $exclude_pfb = { '*base*' => 'texmf-dist/fonts/type1',
'public/itrans/' => 1,
'public/kerkis/' => 1,
'public/kpfonts/' => 1,
- 'public/libertine/' => 1,
+ 'public/libertine-legacy/' => 1,
'public/linearA/' => 1,
'public/lm/' => 1,
'public/lxfonts/' => 1,
diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index 1fde768d7f0..f31b853de3b 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2008, 2009, 2010 TeX Users Group.
+# Copyright 2008, 2009, 2010, 2011 TeX Users Group.
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -25,8 +25,7 @@ pod2usage(-exitstatus => 0, -verbose => 2) if $help;
exit (&main ());
-sub main
-{
+sub main {
my $err = 0;
chomp (my $Master = `cd $mydir/../.. && pwd`);
@@ -54,8 +53,7 @@ sub main
# return all symlinks starting with ".." in DIR as a hash, with symlink
# targets as the values. Check that targets are executable.
#
-sub unx_wrapper_entries
-{
+sub unx_wrapper_entries {
my ($DIR) = @_;
my %ret;
@@ -89,8 +87,7 @@ sub unx_wrapper_entries
# W32DIR as a .exe, and is a copy of the canonical w32 wrapper exe
# specified in W32CANONICAL.
#
-sub check_w32
-{
+sub check_w32 {
my ($w32dir, $w32canonical, %uw) = @_;
my $diff = 0;
@@ -99,7 +96,8 @@ sub check_w32
next if $target =~ /bibexport/; # shell script
next if $target =~ /context/; # does it its own way
next if $target =~ /dviout/; # gui stub
- next if $target =~ /installfont-tl/;# shell script
+ next if $target =~ /installfont-tl/; # shell script
+ next if $target =~ /latexfileversion/; # shell script
next if $target =~ /listings-ext/; # shell script
next if $target =~ /man/; # no symlink
next if $target =~ /pdfjam/; # shell scripts
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 5304612939d..c67116db43d 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -221,7 +221,8 @@ my @TLP_working = qw(
latex-tds latex-veryshortguide
latex2e-help-texinfo latex2e-help-texinfo-spanish latex2man
latex4wp latex4wp-it
- latexcheat latexcheat-esmx latexcheat-ptbr latexdiff latexmk latexmp
+ latexcheat latexcheat-esmx latexcheat-ptbr
+ latexdiff latexfileversion latexmk latexmp
lato layaureo layouts lazylist
lcd lcg lcyw leading leaflet lecturer ledmac leftidx lettre lettrine
levy lewis lexikon lfb lgreek lh lhelp
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f2fe9b13ab7..8b1130e9b28 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2044,6 +2044,7 @@ $standardxmt='\.xmt';
'latex2man' => 'latex2man$',
'latexdiff' => 'latex(diff-so|diff-vc|revise)$',
'latexmk' => '\.pl$',
+ 'latexfileversion' => 'latexfileversion$',
'listings-ext' => '\.sh$',
'match_parens' => '^match_parens$',
'mathspic' => '^mathspic\.pl$',
@@ -2668,7 +2669,7 @@ sub dotype1{
# Build/source/tex/texlive/linked_scripts/Makefile.am installs symlinks
# in the bin directories where needed. That Makefile is independently
# maintained, needs to be updated by hand when new user-visible scripts
-# are added. We do add/update the script itself under linked_scripts.
+# are added. We add/update the script itself under linked_scripts.
# We also make the symlinks/w32-wrapper-copy in Master/bin.
#
sub doscripts {
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index c7a083fa2f3..0b845170798 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -33,6 +33,7 @@ depend installfont
depend lacheck
depend latex2man
depend latexdiff
+depend latexfileversion
depend latexmk
depend listings-ext
depend match_parens
diff --git a/Master/tlpkg/tlpsrc/latexfileversion.tlpsrc b/Master/tlpkg/tlpsrc/latexfileversion.tlpsrc
new file mode 100644
index 00000000000..cafc10a4006
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/latexfileversion.tlpsrc
@@ -0,0 +1 @@
+binpattern f bin/${ARCH}/latexfileversion