summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-28 22:17:34 +0000
committerKarl Berry <karl@freefriends.org>2016-03-28 22:17:34 +0000
commitea0d0c9ceef4d86328ee74c5bac1d871d2a1ae4c (patch)
tree44db2f27a9ef38e95d33b6f364de4ff97d805c13
parent92fa1fe7786f2ecc80a5cb0dc18e8bffe61e4b3b (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@40168 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/icu/icu-PATCHES/TL-Changes6
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl12
2 files changed, 10 insertions, 8 deletions
diff --git a/Build/source/libs/icu/icu-PATCHES/TL-Changes b/Build/source/libs/icu/icu-PATCHES/TL-Changes
index 0a06c0599c7..3fd6e38876c 100644
--- a/Build/source/libs/icu/icu-PATCHES/TL-Changes
+++ b/Build/source/libs/icu/icu-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the icu-57.1/ tree as obtained from:
+Changes applied to the icu-57.1 tree as obtained from:
http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz
cd /tmp # or wherever
@@ -50,4 +50,6 @@ $icupkg -r 'region/*' $indat $outdat && mv $outdat $indat
$icupkg -r 'rfc*.spp' $indat $outdat && mv $outdat $indat
$icupkg -r 'zone/*' $indat $outdat && mv $outdat $indat
ls -l $indat $srcdat # indat should be much smaller
-cp $indat $srcdat
+cp $indat $srcdat
+
+# then commit.
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index cafbdce5fca..c1c2eaa0cb8 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 39763 2016-02-18 13:45:29Z preining $
+# $Id: tlmgr.pl 40150 2016-03-27 00:20:46Z preining $
#
# Copyright 2008-2016 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
-my $svnrev = '$Revision: 39763 $';
-my $datrev = '$Date: 2016-02-18 14:45:29 +0100 (Thu, 18 Feb 2016) $';
+my $svnrev = '$Revision: 40150 $';
+my $datrev = '$Date: 2016-03-27 01:20:46 +0100 (Sun, 27 Mar 2016) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -1148,10 +1148,10 @@ sub action_paper {
init_local_db();
my $texmfconfig;
if ($opts{"usermode"}) {
- chomp($texmfconfig = `kpsewhich -var-value=TEXMFCONFIG`);
- } else {
- chomp($texmfconfig = `kpsewhich -var-value=TEXMFSYSCONFIG`);
+ tlwarn("$prg: action `paper' not supported in usermode\n");
+ return ($F_ERROR);
}
+ chomp($texmfconfig = `kpsewhich -var-value=TEXMFSYSCONFIG`);
$ENV{"TEXMFCONFIG"} = $texmfconfig;
my $action = shift @ARGV;