summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-23 18:08:37 +0000
committerKarl Berry <karl@freefriends.org>2009-11-23 18:08:37 +0000
commitaf69feffd5d70a729a1abac22d7341a488bca7af (patch)
tree78bd76ea608648c9d21d34743811b28805fe08cf /Master/tlpkg
parent011a86d8d8e37bf87d987880ac4ee50de04c6718 (diff)
new latex package combinedgraphics (~1nov09)
git-svn-id: svn://tug.org/texlive/trunk@16144 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds5
-rw-r--r--Master/tlpkg/tlpsrc/collection-pictures.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/combinedgraphics.tlpsrc0
4 files changed, 5 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index f75c7934901..59a46846d7a 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -58,7 +58,7 @@ my @WorkingTLP = qw(
clock clrscode cm-super
cmap cmcyr cmdstring cmdtrack cmll cmpica codedoc codepage
collref colorinfo colorsep colortbl colorwav
- combine commath compactbib complexity comprehensive
+ combine combinedgraphics commath compactbib complexity comprehensive
computational-complexity confproc constants
context-account context-algorithmic context-bnf context-chromato
context-construction-plan context-degrade context-fixme
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 6bcdbbc0442..b111d49b409 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -266,7 +266,7 @@ $Master = "$mydir/../..";
'gfsneohellenic', "&MAKEflatten",
'gfsporson', "&MAKEflatten",
'gfssolomos', "&MAKEflatten",
- 'glhyph', "die 'merged into hyph-utf8'",
+ 'glhyph', "die 'skipping, merged into hyph-utf8'",
'graphicp', "die 'skipping, experimental ca.2003'",
'graphicxsp', "die 'skipping, requires adobe distiller'",
'grnumalt', "die 'skipping, nonfree'",
@@ -368,7 +368,8 @@ $Master = "$mydir/../..";
'matlab', "die 'skipping, requires nonfree matlab'",
'mdwfonts', "die 'skipping, too many tfm duplicates'",
'mem', "die 'skipping, experimental ca.2006'",
- 'meper', "die 'skipping, requires Java, confused licensed'",
+ 'memo2', "die 'skipping, latex 2.09'",
+ 'meper', "die 'skipping, requires Java, confused license'",
'metalogo', "&MAKEflatten",
'metaobj', "&MAKEflatten",
'metauml', "&MAKEmetauml",
diff --git a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
index 85808fd73d9..baf1aaa8fc8 100644
--- a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
@@ -4,6 +4,7 @@ depend asyfig
depend autoarea
depend bardiag
depend cachepic
+depend combinedgraphics
depend circuitikz
depend curve
depend curve2e
diff --git a/Master/tlpkg/tlpsrc/combinedgraphics.tlpsrc b/Master/tlpkg/tlpsrc/combinedgraphics.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/combinedgraphics.tlpsrc