summaryrefslogtreecommitdiff
path: root/Master/tlpkg/libexec
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-26 17:36:08 +0000
committerKarl Berry <karl@freefriends.org>2011-09-26 17:36:08 +0000
commit36f4773630d68c441e9996e5d26c8c943311e7d1 (patch)
treede0e24b5881ace8c647c868764170a4d7931e84e /Master/tlpkg/libexec
parent0454199fb8d0690826381492ba9d7eaebf491dec (diff)
avoid installing conflicting bbding10.mf or dingbat.mf
git-svn-id: svn://tug.org/texlive/trunk@24098 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/libexec')
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds5
1 files changed, 3 insertions, 2 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index e442d5ad567..467582a7053 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1883,8 +1883,9 @@ $standardmfinstall = '\.mf$';
'asaetr' => 'NULL', # cmcscsl10.mf conflict
'astro' => 'astrosym.(cal|cmn|mac|uni|xtr)',
'cmcyr' => '\.mf',
- 'ibygrk' => 'ibycus4\.map', # tex|mf source
- 'wnri' => $standardmfinstall . '|wnindic\.map', # mf source
+ 'ibygrk' => 'ibycus4\.map', # tex|mf source
+ 'niceframe', => '(karta|umrand).*\.mf', # not bbding or dingbat
+ 'wnri' => $standardmfinstall . '|wnindic\.map',# mf source
);
# packages which have dvips header files