diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-04-15 06:07:39 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-04-15 06:07:39 +0000 |
commit | ff05aef0836e14dd47dd6748bbfdfe224fdc4c70 (patch) | |
tree | 915da63180814ba82d31701f981623453eb00123 | |
parent | 33256031eaec3a90c1fea22b9d9de4b84db3c55c (diff) |
Sync linked scripts + a typo
git-svn-id: svn://tug.org/texlive/trunk@36863 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 2 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl | 9 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 7 |
3 files changed, 10 insertions, 8 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 5c7d61d3fea..d1e18d87892 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -2,7 +2,7 @@ * mktexlsr (treefile): switch back to hard-coded path, as indeed it seems there are several systems without support for - mktexmp --tmpdir, just mktemp. TL2015 pretest emails. + mktemp --tmpdir, just mktemp. TL2015 pretest emails. 2015-04-12 Karl Berry <karl@tug.org> diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl index 135e5d2ed07..497692611a2 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: fmtutil.pl 36821 2015-04-13 00:30:41Z preining $ +# $Id: fmtutil.pl 36861 2015-04-15 02:44:03Z preining $ # fmtutil - utility to maintain format files. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # @@ -33,11 +33,11 @@ BEGIN { } -my $svnid = '$Id: fmtutil.pl 36821 2015-04-13 00:30:41Z preining $'; -my $lastchdate = '$Date: 2015-04-13 02:30:41 +0200 (Mon, 13 Apr 2015) $'; +my $svnid = '$Id: fmtutil.pl 36861 2015-04-15 02:44:03Z preining $'; +my $lastchdate = '$Date: 2015-04-15 04:44:03 +0200 (Wed, 15 Apr 2015) $'; $lastchdate =~ s/^\$Date:\s*//; $lastchdate =~ s/ \(.*$//; -my $svnrev = '$Revision: 36821 $'; +my $svnrev = '$Revision: 36861 $'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; my $version = "svn$svnrev ($lastchdate)"; @@ -111,6 +111,7 @@ our @cmdline_options = ( "fmtdir=s", "no-engine-subdir", "no-error-if-no-engine=s", + "no-error-if-no-format", "quiet|silent|q", "test", "dolinks", diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 10dbda74888..238e347bfc1 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 36770 2015-04-12 02:41:15Z preining $ +# $Id: tlmgr.pl 36854 2015-04-14 12:08:59Z preining $ # # Copyright 2008-2015 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 36770 $'; -my $datrev = '$Date: 2015-04-12 04:41:15 +0200 (Sun, 12 Apr 2015) $'; +my $svnrev = '$Revision: 36854 $'; +my $datrev = '$Date: 2015-04-14 14:08:59 +0200 (Tue, 14 Apr 2015) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -211,6 +211,7 @@ sub main { "reinstall-forcibly-removed" => 1, "self" => 1 }, "version" => { }, + "_include_tlpobj" => { }, ); my %optarg; |