diff options
author | Karl Berry <karl@freefriends.org> | 2015-04-03 22:17:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-04-03 22:17:44 +0000 |
commit | 985392e08babce077d50d317f983fb8552ac9d2e (patch) | |
tree | 2e0ce4fad6dc57066dc447a56b5871748f4f5acd /Master/tlpkg | |
parent | 6df9888bcbc7b386695b916acb8d0b329ea36ff2 (diff) |
cfr-initials (3apr15)
git-svn-id: svn://tug.org/texlive/trunk@36711 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkginfo | 8 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/cfr-initials.tlpsrc | 0 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc | 1 |
5 files changed, 11 insertions, 2 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 71d03c47af6..d18c997adfa 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -112,7 +112,7 @@ my @TLP_working = qw( cbcoptic cbfonts cbfonts-fd cc-pl ccaption ccfonts ccicons cclicenses cd cd-cover cdpbundl - cell cellspace celtic censor cfr-lm + cell cellspace celtic censor cfr-initials cfr-lm changebar changelayout changepage changes chappg chapterfolder chbibref checkcites chem-journal chemarrow chembst chemcompounds chemcono chemexec diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index b2e93fbcf70..387c226162d 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -342,7 +342,7 @@ sub prepare { # now we have a tds, so unzip it in a tmpdir and be sure it's readable. my $tmpdir = ©_to_tmpdir ($pkg); my $unpack = ($tds_path =~ /zip$/) - ? "unzip -q $tds_path -d $tmpdir" + ? "unzip -q -o $tds_path -d $tmpdir" : "tar -C $tmpdir -xf $tds_path"; system ($unpack) == 0 || die "unpack failed: $!\n($unpack)"; system ("chmod -R a+rX $tmpdir"); @@ -398,6 +398,11 @@ sub copy_to_tmpdir { system ("cd $pkgdir && unzip -q $zip && rm $zip"); } + if ($pkgname eq "latex") { + my $latex_doc_zip = "$CTAN/install/macros/latex/latex-doc.tds.zip"; + system ("cd $pkgdir && unzip -q -o $latex_doc_zip </dev/null"); + } + # the pl package in TeX Live is a combination of the pl-mf and # plpsfont packages on CTAN, per Thomas Esser and GUST as of many # years ago. So combine them. ctan2tds will flatten everything out, @@ -406,5 +411,6 @@ sub copy_to_tmpdir { my $plpsfont_zip = "$CTAN/language/polish/plpsfont.zip"; system ("cd $pkgdir && unzip -q $plpsfont_zip"); } + return $pkgdir; } diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 3e6626c0f05..93396978114 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2191,6 +2191,8 @@ sub specialins { } my $raw_dir = "$RAW_DIR/$packagedir"; + return if (-e "$RAW_DIR/$packagedir/TDS_READY"); + my @ins = `find $raw_dir -regex ".*$standardins" -type f -print`; if (@ins) { print "\t SPECIALINS found normal ins: @ins"; diff --git a/Master/tlpkg/tlpsrc/cfr-initials.tlpsrc b/Master/tlpkg/tlpsrc/cfr-initials.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/cfr-initials.tlpsrc diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc index fae4f003255..3d7717b4c94 100644 --- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc @@ -49,6 +49,7 @@ depend cantarell depend carlito depend carolmin-ps depend ccicons +depend cfr-initials depend cfr-lm depend cherokee depend cinzel |