summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-27 23:16:41 +0000
committerKarl Berry <karl@freefriends.org>2014-02-27 23:16:41 +0000
commit77b2cdcf0f4f2799b3cf49993773b5959fb4b6d5 (patch)
tree45f8bd0e578032b308b3f25a99873527cb4d82b6 /Master
parent0b9cf8dc5d3785da3a0d3065dc2fb8ffe1398e3b (diff)
resolve pgf conflicts (none serious, it seems)
git-svn-id: svn://tug.org/texlive/trunk@33063 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl1
-rw-r--r--Master/tlpkg/tlpsrc/svg.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tools.tlpsrc3
3 files changed, 4 insertions, 1 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 391793f26b8..696cc400cf3 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -4768,6 +4768,7 @@ sub check_runfiles {
# build a list of all runtime files associated to 'normal' packages
(my $non_normal = `ls "$Master/bin"`) =~ s/\n/\$|/g; # binaries
$non_normal .= '^0+texlive|^bin-|^collection-|^scheme-|^texlive-|^texworks';
+ $non_normal .= '|^pgf$'; # has lots of intentionally duplicated .lua
my @runtime_files = ();
#
foreach my $tlpn ($localtlpdb->list_packages) {
diff --git a/Master/tlpkg/tlpsrc/svg.tlpsrc b/Master/tlpkg/tlpsrc/svg.tlpsrc
index 185fcf9bf20..ecf3cb5cb48 100644
--- a/Master/tlpkg/tlpsrc/svg.tlpsrc
+++ b/Master/tlpkg/tlpsrc/svg.tlpsrc
@@ -1,2 +1 @@
srcpattern +!d texmf-dist/source/latex/stex/schema/rnc/svg
-runpattern +!d texmf-dist/tex/generic/pgf/frontendlayer/svg
diff --git a/Master/tlpkg/tlpsrc/tools.tlpsrc b/Master/tlpkg/tlpsrc/tools.tlpsrc
index 6dd6e01ff19..75339f906e1 100644
--- a/Master/tlpkg/tlpsrc/tools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tools.tlpsrc
@@ -3,4 +3,7 @@ docpattern +!d texmf-dist/doc/fonts/gnu-freefont/tools
docpattern +!d texmf-dist/doc/fonts/punknova/tools
docpattern +!d texmf-dist/doc/latex/tcldoc/tools
docpattern +!d texmf-dist/doc/latex/tcldoc/tools
+#
+runpattern +!d texmf-dist/tex/generic/pgf/graphdrawing/lua/pgf/gd/tools
+#
srcpattern +!d texmf-dist/source/jfontmaps/tools