summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-08-24 22:22:12 +0000
committerKarl Berry <karl@freefriends.org>2014-08-24 22:22:12 +0000
commit6174026a5a41417436fcde26fa3a58dd0967a3fe (patch)
tree97a5d33c75e3ba499fbcdb87d298755fb354634f /Master/tlpkg
parentccb98061a257ee9db378e34301646d7e05ecc957 (diff)
rm persian-modern, unresolvable conflict with persian-hm
git-svn-id: svn://tug.org/texlive/trunk@35036 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
-rw-r--r--Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/persian-modern.tlpsrc0
4 files changed, 2 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 0c2b60bdaaf..93ba1f76e48 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -372,7 +372,7 @@ my @TLP_working = qw(
pdf-trans pdfcomment pdfcprot pdfcrop pdfjam pdfmarginpar
pdfpages pdfscreen pdfslide pdfsync pdftex-def pdftricks pdftricks2 pdfx
pecha pedigree-perl perception perfectcut perltex
- permute persian-bib persian-modern
+ permute persian-bib
petiteannonce petri-nets pfarrei
pgf pgf-blur pgf-soroban pgf-umlcd pgf-umlsd pgfgantt pgfkeyx pgfmolbio
pgfopts pgfplots
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8e1a70f5026..4c63a8b9fd8 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -760,7 +760,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'pedigree', "die 'skipping, use pedigree-perl'",
'persian-hm-ftx',"die 'skipping, legality?'", #"&MAKEflatten",
'persian-hm-xbs',"die 'skipping, legality?'", #"&MAKEflatten",
- 'persian-modern',"&MAKEflatten",
+ 'persian-modern',"die 'skipping, legality?'", #"&MAKEflatten",
# 'pgf', "&MAKEcopy",
'pgothic', "die 'skipping, use bookhands'",
'phaistos', "&MAKEflatten",
diff --git a/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
index bc1381e39eb..c667425df2c 100644
--- a/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
@@ -14,6 +14,5 @@ depend hyphen-farsi
depend imsproc
depend lshort-persian
depend persian-bib
-depend persian-modern
depend simurgh
depend tram
diff --git a/Master/tlpkg/tlpsrc/persian-modern.tlpsrc b/Master/tlpkg/tlpsrc/persian-modern.tlpsrc
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/tlpkg/tlpsrc/persian-modern.tlpsrc
+++ /dev/null