summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-18 22:31:49 +0000
committerKarl Berry <karl@freefriends.org>2022-02-18 22:31:49 +0000
commit8b9b189c69bebe3c33a73417347e6c97b8ee1220 (patch)
tree02ae7ee7b39e173c092d63fb61ea7a25110ae872 /Master/tlpkg
parent45c6e09eb8045e03b06158780f9fde21742d4cb3 (diff)
rm japanese-otf-uptex, merged into japanese-otf
git-svn-id: svn://tug.org/texlive/trunk@62077 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds4
-rw-r--r--Master/tlpkg/tlpsrc/collection-langjapanese.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/japanese-otf-uptex.tlpsrc4
4 files changed, 3 insertions, 8 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index f5203db36b2..0c5ad1e5bcc 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -421,7 +421,7 @@ my @TLP_working = qw(
iso10303 isodate isodoc isomath isonums isopt isorot isotope
issuulinks istgame itnumpar
iwhdp iwona
- jablantile jacow jamtimes japanese-otf japanese-otf-uptex
+ jablantile jacow jamtimes japanese-otf
jbact jfmutil jigsaw
jknapltx jkmath jlabels jlreq jlreq-deluxe
jmb jmlr jneurosci jnuexam josefin jpsj jsclasses
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f856bb41147..cf0ef001054 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -674,7 +674,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'jadetex', "&MAKEjadetex",
'japanese', "die 'skipping, now babel-japanese'",
'japanese-otf',"&MAKEjapaneseotf",
- 'japanese-otf-uptex',"&MAKEjapaneseotf",
+ 'japanese-otf-uptex', "die 'skipping, merged into japanese-otf'",
'jas99', "die 'skipping, obsolete on CTAN, use jas99m'",
'jasthesis', "die 'skipping, noinfo license'",
'javadoc', "die 'skipping, requires java and no source'",
@@ -5672,7 +5672,7 @@ sub MAKEjapaneseotf {
# if we are building "japanese-otf" package, remove these two
# style files, as they are overriden by the files in
# "japanese-otf-uptex"
- if ($package eq "japanese-otf") {
+ if ($package eq "xjapanese-otf") {
&SYSTEM("$RM sty/mlutf.sty sty/otf.sty");
}
&SYSTEM("$MV sty/* $DEST/tex/platex/$package/; rmdir sty");
diff --git a/Master/tlpkg/tlpsrc/collection-langjapanese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langjapanese.tlpsrc
index 8e38c5d80b3..9ba2b4553dc 100644
--- a/Master/tlpkg/tlpsrc/collection-langjapanese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langjapanese.tlpsrc
@@ -26,7 +26,6 @@ depend ifptex
depend ifxptex
depend ipaex
depend japanese-otf
-depend japanese-otf-uptex
depend jlreq
depend jlreq-deluxe
depend jsclasses
diff --git a/Master/tlpkg/tlpsrc/japanese-otf-uptex.tlpsrc b/Master/tlpkg/tlpsrc/japanese-otf-uptex.tlpsrc
deleted file mode 100644
index 3e20271f817..00000000000
--- a/Master/tlpkg/tlpsrc/japanese-otf-uptex.tlpsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-depend japanese-otf
-## disabled for now
-##depend uptex
-execute addKanjiMap otf-up-@jaEmbed@.map