summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-12 01:53:29 +0000
committerKarl Berry <karl@freefriends.org>2013-11-12 01:53:29 +0000
commiteee40537d2f2afa939757b0cfc3877a9de6a539a (patch)
treec562416ed3dac60d23afd98424c06961a08dc8da /Master/tlpkg
parent6cafe69d37728ca48ca50b388e807918724ac5a5 (diff)
merriweather (11nov13)
git-svn-id: svn://tug.org/texlive/trunk@32129 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/merriweather.tlpsrc1
3 files changed, 3 insertions, 1 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 23853b6a0d6..383130c7532 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -302,7 +302,7 @@ my @TLP_working = qw(
mcaption mceinleger mcite mciteplus
mdframed mdputu mdsymbol mdwtools media9 meetingmins memdesign memexsupp
memoir MemoirChapStyles memory mentis
- menu menukeys
+ menu menukeys merriweather
metafont-beginners metago metalogo metaobj metaplot
metapost-examples metatex metauml
method metre metrix
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index 0837424ed1f..307be1966d2 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -138,6 +138,7 @@ depend mathabx-type1
depend mathdesign
depend mdputu
depend mdsymbol
+depend merriweather
depend mintspirit
depend mnsymbol
depend newpx
diff --git a/Master/tlpkg/tlpsrc/merriweather.tlpsrc b/Master/tlpkg/tlpsrc/merriweather.tlpsrc
new file mode 100644
index 00000000000..9159251090b
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/merriweather.tlpsrc
@@ -0,0 +1 @@
+execute addMap merriweather.map