diff options
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLConfig.pm | 5 | ||||
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 8 | ||||
| -rw-r--r-- | Build/source/utils/biber/README | 5 | ||||
| -rw-r--r-- | Build/source/utils/biber/TeXLive/TLConfig.pm | 5 | ||||
| -rw-r--r-- | Build/source/utils/biber/TeXLive/TLUtils.pm | 8 | ||||
| -rw-r--r-- | Master/tlpkg/dev/srclist.txt | 2 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/mptopdf-extract | 8 |
7 files changed, 19 insertions, 22 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm index 6eb7755df44..4e88b3aa484 100644 --- a/Build/source/texk/tests/TeXLive/TLConfig.pm +++ b/Build/source/texk/tests/TeXLive/TLConfig.pm @@ -5,7 +5,7 @@ package TeXLive::TLConfig; -my $svnrev = '$Revision: 29725 $'; +my $svnrev = '$Revision: 29883 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -184,7 +184,8 @@ our %TLPDBOptions = ( our %TLPDBSettings = ( "platform" => [ "s", "Main platform for this computer" ], - "available_architectures" => [ "l", "All available/installed architectures" ] + "available_architectures" => [ "l", "All available/installed architectures" ], + "usertree" => [ "b", "This tree acts as user tree" ] ); our $WindowsMainMenuName = "TeX Live $ReleaseYear"; diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index f4faeef0d56..b5902c6ed12 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 29725 $'; +my $svnrev = '$Revision: 29926 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -1327,7 +1327,7 @@ sub install_packages { # if a package is relocatable we have to cancel the reloc prefix # before we save it to the local tlpdb if ($tlpobj->relocated) { - $tlpobj->cancel_reloc_prefix; + $tlpobj->replace_reloc_prefix; } $totlpdb->add_tlpobj($tlpobj); # we have to write out the tlpobj file since it is contained in the @@ -3678,10 +3678,10 @@ sub compare_tlpobjs { $ret{'revision'} = "$rA:$rB"; } if ($tlpA->relocated) { - $tlpA->cancel_reloc_prefix; + $tlpA->replace_reloc_prefix; } if ($tlpB->relocated) { - $tlpB->cancel_reloc_prefix; + $tlpB->replace_reloc_prefix; } my @fA = $tlpA->all_files; my @fB = $tlpB->all_files; diff --git a/Build/source/utils/biber/README b/Build/source/utils/biber/README index 80145b266ca..ed3952db40e 100644 --- a/Build/source/utils/biber/README +++ b/Build/source/utils/biber/README @@ -1,4 +1,4 @@ - Copyright 2011 Karl Berry <tex-live@tug.org> + Copyright 2011-2013 Karl Berry <tex-live@tug.org> This file is free software; the copyright holder gives unlimited permission to copy and/or distribute it, @@ -25,8 +25,7 @@ TeXLive/TLUtils.pm file here, along with a custom ./TeXLive/TLConfig.pm, to avoid duplicating the platform-detection logic. TLUtils.pm is kept in sync via the "srclist-update" mechanism; see -Master/tlpkg/dev/srclist.txt. The copy here in biber is a strictly a slave. +Master/tlpkg/dev/srclist.txt. The copy here in biber is strictly a slave. For any real information about or discussion of biber, please see their web site at http://biblatex-biber.sourceforge.net. - diff --git a/Build/source/utils/biber/TeXLive/TLConfig.pm b/Build/source/utils/biber/TeXLive/TLConfig.pm index 6eb7755df44..4e88b3aa484 100644 --- a/Build/source/utils/biber/TeXLive/TLConfig.pm +++ b/Build/source/utils/biber/TeXLive/TLConfig.pm @@ -5,7 +5,7 @@ package TeXLive::TLConfig; -my $svnrev = '$Revision: 29725 $'; +my $svnrev = '$Revision: 29883 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -184,7 +184,8 @@ our %TLPDBOptions = ( our %TLPDBSettings = ( "platform" => [ "s", "Main platform for this computer" ], - "available_architectures" => [ "l", "All available/installed architectures" ] + "available_architectures" => [ "l", "All available/installed architectures" ], + "usertree" => [ "b", "This tree acts as user tree" ] ); our $WindowsMainMenuName = "TeX Live $ReleaseYear"; diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm index f4faeef0d56..b5902c6ed12 100644 --- a/Build/source/utils/biber/TeXLive/TLUtils.pm +++ b/Build/source/utils/biber/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 29725 $'; +my $svnrev = '$Revision: 29926 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -1327,7 +1327,7 @@ sub install_packages { # if a package is relocatable we have to cancel the reloc prefix # before we save it to the local tlpdb if ($tlpobj->relocated) { - $tlpobj->cancel_reloc_prefix; + $tlpobj->replace_reloc_prefix; } $totlpdb->add_tlpobj($tlpobj); # we have to write out the tlpobj file since it is contained in the @@ -3678,10 +3678,10 @@ sub compare_tlpobjs { $ret{'revision'} = "$rA:$rB"; } if ($tlpA->relocated) { - $tlpA->cancel_reloc_prefix; + $tlpA->replace_reloc_prefix; } if ($tlpB->relocated) { - $tlpB->cancel_reloc_prefix; + $tlpB->replace_reloc_prefix; } my @fA = $tlpA->all_files; my @fB = $tlpB->all_files; diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt index e10cbf80401..a35a81a1e6a 100644 --- a/Master/tlpkg/dev/srclist.txt +++ b/Master/tlpkg/dev/srclist.txt @@ -15,7 +15,7 @@ # Basic config files. Master/texmf-dist/web2c/texmf.cnf Build/source/texk/kpathsea/ -Master/texmf-dist/web2c/fmtutil.cnf Build/source/texk/texlive/linked_scripts/tetex/fmtutil.cnf +Master/texmf-dist/web2c/fmtutil.cnf Build/source/texk/texlive/tl_scripts/fmtutil.cnf # Platform detection for biber and tests: Master/tlpkg/TeXLive/TLUtils.pm Build/source/utils/biber/TeXLive/ diff --git a/Master/tlpkg/libexec/mptopdf-extract b/Master/tlpkg/libexec/mptopdf-extract index 66dbd8c69b0..ea27181b167 100755 --- a/Master/tlpkg/libexec/mptopdf-extract +++ b/Master/tlpkg/libexec/mptopdf-extract @@ -7,18 +7,14 @@ tlbindir=`cd \`dirname $0\` && cd ../bin && pwd` PATH=$tlbindir:$PATH # tlpfiles -# Get files of our mptopdf package, ignoring top-level directory. -# And ignoring the man page until it is present in ConTeXt. +# Get files of our mptopdf package, ignoring top-level directory +# and ignoring the man pages in TL locations. files=`tlpfiles mptopdf | sed 's,[^/]*/,,' | grep -v doc/man` if test -z "$files"; then echo "$0: failed to get files for mptopdf." >&2 exit 1 fi -# Add man page in cont-tmf location: -files="$files -doc/context/scripts/mkii/mptopdf.man" - # We will extract them from the current context release. ctan=/home/ftp/mirror/rsync.tex.ac.uk/CTAN #context_zip=$ctan/macros/context/current/cont-tmf.zip |