summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlpsrc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-12-07 16:52:59 +0000
committerKarl Berry <karl@freefriends.org>2008-12-07 16:52:59 +0000
commite42a8e5ea29023f9e35316ec28cfad279efa9e55 (patch)
treee2ef876a6f11a7fb23c36749c77b7e3c642394ec /Master/tlpkg/tlpsrc
parent9d3965c30279fb5b9cb6ce5e611c4e3796585e4c (diff)
doc/verbose/check updates
git-svn-id: svn://tug.org/texlive/trunk@11549 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlpsrc')
-rw-r--r--Master/tlpkg/tlpsrc/bin-texlive.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/context.tlpsrc1
2 files changed, 5 insertions, 0 deletions
diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
index 560e80102e4..c185a706f5e 100644
--- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
@@ -8,7 +8,11 @@ depend texlive.infra
runpattern f texmf/fmtutil/fmtutil-hdr.cnf
runpattern d texmf/scripts/texlive/lua
runpattern d texmf/scripts/texlive/tlmgrgui
+<<<<<<< .mine
+runpattern !f texmf/scripts/texlive/tlmgrui/tlmgrgui2.pl
+=======
runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui2.pl
+>>>>>>> .r11548
runpattern f texmf/scripts/texlive/rungs.tlu
runpattern f texmf/scripts/texlive/test-tlpdb.tlu
runpattern f texmf/scripts/texlive/texconf.tlu
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index d2e537d2163..57a52ba549a 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -9,6 +9,7 @@ runpattern +d texmf-dist/fonts/cid/fontforge
# these have their own TL packages, and are not part of core context.
runpattern +!d texmf-dist/tex/context/third
runpattern +!d texmf-dist/tex/context/interface/third
+runpattern +!d texmf-dist/metapost/context/third
srcpattern +!d texmf-dist/source/context/third
docpattern +!d texmf-dist/doc/context/third
#