diff options
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-txi | 3 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tlpkginfo | 16 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tlprm | 2 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 4 |
4 files changed, 12 insertions, 13 deletions
diff --git a/Master/tlpkg/bin/tl-update-txi b/Master/tlpkg/bin/tl-update-txi index 0b17e361ded..b3002c15e3b 100755 --- a/Master/tlpkg/bin/tl-update-txi +++ b/Master/tlpkg/bin/tl-update-txi @@ -8,7 +8,8 @@ : ${CTAN=/home/ftp/tex-archive} -texihtml="makeinfo --html --no-split" +texihtml_top="-c TOP_NODE_UP_URL=http://tug.org/texinfohtml" +texihtml="makeinfo --html --no-split $texihtml_top" texipdf="texi2pdf --quiet --clean" # Convenience variables. diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 2bde3b9d208..b2e93fbcf70 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -15,7 +15,7 @@ sub main { || die "$0: TEX_CATALOGUE ($CATALOGUE) must point to entries/ subdir" . " of a TeX Catalogue checkout.\n"; - # erroneous or problematic tds files (when new, tell RobinF and author) + # erroneous or problematic tds files (when new, tell CTAN and author) $erroneous_tds = join ("|", qw(countriesofeurope dad ebproof engpron gost hacm he-she hobby imtekda mathdesign spanish sttools), @@ -29,7 +29,7 @@ sub main { #$amsfonts_tds_pkgs = "amsfonts"; # (amstex and amsfonts handled from the original.) $latex_tds_pkgs = "latex-tds"; - $latex_tds_pkgs .= "|cyrillic|graphics|latex|psnfss|tools"; # latex + $latex_tds_pkgs .= "|psnfss"; # cyrillic|graphics|latex|tools on their own $latex_tds_pkgs .= "|knuth"; # other $latex_tds_dir = "$CTAN/macros/latex/contrib/latex-tds"; @@ -322,6 +322,9 @@ sub prepare { } elsif ($pkg eq "hfoldsty") { $tds_path = glob ("$CTAN/fonts/hfoldsty/hfoldsty-v*.zip"); + } elsif ($pkg eq "latex") { + $tds_path = "$CTAN/install/macros/latex/latex-base.tds.zip"; + } elsif ($pkg eq "pgf") { $tds_path = "$CTAN/install/graphics/pgf/base/pgf.tds.zip"; @@ -331,14 +334,7 @@ sub prepare { # ...and except for files in latex-tds... } elsif ($pkg =~ /^($latex_tds_pkgs)$/) { - if ($pkg =~ /^($amslatex_tds_pkgs)$/) { - $tds_path = "$latex_tds_dir/amslatex.tds.zip" ; - } else { - $tds_path = "$latex_tds_dir/$pkg.tds.zip"; - } - # and more latex exceptions to the latex exceptions: - $tds_path = "$latex_tds_dir/source.tds.zip" if $pkg eq "latex-tds"; - $tds_path = "$latex_tds_dir/base.tds.zip" if $pkg eq "latex"; + $tds_path = "$latex_tds_dir/$pkg.tds.zip"; } return $ctan_loc unless (-s $tds_path); diff --git a/Master/tlpkg/bin/tlprm b/Master/tlpkg/bin/tlprm index 14a98ed4370..caf374d9f92 100755 --- a/Master/tlpkg/bin/tlprm +++ b/Master/tlpkg/bin/tlprm @@ -76,7 +76,7 @@ sub main { `printf "$removals" >$commit_file`; print "if license in Catalogue is free, and package isn't, " - . "tell Robin.Fairbairns\@cl.cam.ac.uk.\n"; + . "tell ctan\@dante.de\n"; # show with line numbers for next-error. my $tsrc = "$Master/tlpkg/tlpsrc"; diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 5f98a1de448..3e6626c0f05 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -557,6 +557,8 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'lastbib', "die 'skipping, nonfree'", 'latex_maker', "die 'skipping, ruby'", 'latex-fonts', "&MAKEflatten", + 'latex-base', "die 'skipping, use latex'", + 'latex-doc', "die 'skipping, use latex'", 'latex-help-texinfo', "die 'skipping, use latex2e-help-texinfo'", 'latex-pro-pragmatiky', "die 'skipping, no source'", 'latex-sciences-humaines', "die 'skipping, no source'", @@ -812,7 +814,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'psfragx', "&MAKEflatten", 'pslatex', "&MAKEpslatex", 'psizzl', "die 'skipping, needs to be its own format-level directory'", - 'psnfss', "&MAKEpsnfss", +# 'psnfss', tds.zip now "&MAKEpsnfss", 'psnfss-addons', "die 'skipping, do not understand, sorry'", 'psnfssx', "die 'skipping, situation too confused, sorry'", 'pst-2dplot', "&MAKEpst", |