diff options
| -rw-r--r-- | Master/tlpkg/TeXLive/TLMedia.pm | 2 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 3 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-containers | 25 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 9 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/bin-texlive.tlpsrc | 4 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/context.tlpsrc | 1 | ||||
| -rw-r--r-- | TODO | 2 |
7 files changed, 30 insertions, 16 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm index 1c7a3e1100b..344b4a0d2b7 100644 --- a/Master/tlpkg/TeXLive/TLMedia.pm +++ b/Master/tlpkg/TeXLive/TLMedia.pm @@ -278,7 +278,7 @@ sub _install_package { if (!download_file($what, $lzmafile) || (! -r $lzmafile)) { tlwarn("Downloading \n"); tlwarn(" $what\n"); - tlwarn("did not succeed, please retry!\n"); + tlwarn("did not succeed, please retry.\n"); unlink($tarfile, $lzmafile); return(0); } diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 5f3c6ffc39c..081dd9fa770 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -265,7 +265,6 @@ sub from_file { my $ret = 0; do { my $tlp = TeXLive::TLPOBJ->new; - ddebug("creating tlp from $path...\n"); $ret = $tlp->from_fh($retfh,1); if ($ret) { $self->add_tlpobj($tlp); @@ -490,7 +489,7 @@ sub expand_dependencies { next if ($p =~ m/^00texlive/); my $pkg = $self->get_package($p); if (!defined($pkg)) { - debug("W: $p is mentioned somewhere but not available, disabling it!\n"); + debug("W: $p is mentioned somewhere but not available, disabling\n"); $install{$p} = 0; next; } diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers index f13baa9e5e4..6a96f6e7b71 100755 --- a/Master/tlpkg/bin/tl-update-containers +++ b/Master/tlpkg/bin/tl-update-containers @@ -57,7 +57,7 @@ sub main # check that we have a target db. if (! $opt_recreate && ! -r "$opt_location/tlpkg/texlive.tlpdb") { die "$0: Cannot load tlpdb from output directory $opt_location;\n" - . "specify --recreate if you want to populate anew.\n"; + . " specify --recreate if you want to populate anew.\n"; } # get source db, same hierarchy from which we are being run. @@ -78,15 +78,16 @@ sub main tlwarn("$0: unknown container format $format in 00texlive.config; ", "ignoring and continuing with $type"); } - debug("format=$type srcsplit=$srcsplit docsplit=$docsplit\n"); + debug("$Master: format=$type srcsplit=$srcsplit docsplit=$docsplit\n"); + my $nettlpdb; + my %count; my @todopacks = (); my @removepacks = (); my @removecontainers = (); my $opt_containerdir = "$opt_location/$TeXLive::TLConfig::Archive"; - my $nettlpdb; - my %count; - + &debug("output containerdir = $opt_containerdir\n"); + if ($opt_recreate) { # remake everything. if (@ARGV) { @@ -340,14 +341,16 @@ sub main $nettlpdb->save; system("lzma --force -k -z $opt_location/tlpkg/texlive.tlpdb"); - # do a last check that all the containers are actually present - foreach my $p ($nettlpdb->list_packages) { - next if $p =~ /00texlive/; - if (! -r "$opt_containerdir/$p.tar.lzma") { - tlwarn("$0: container for $p is missing, strange\n"); + if (! @ARGV) { + # do a last check that all the containers are actually present + foreach my $p ($nettlpdb->list_packages) { + next if $p =~ /00texlive/; + if (! -r "$opt_containerdir/$p.tar.lzma") { + tlwarn("$0: container for $p is missing, strange\n"); + } } } - + return 0; } diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 1327209c257..9b90328faf6 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -9,11 +9,14 @@ vc_id='$Id$' unset CDPATH unset LS_COLORS +yyyy=2008 + chicken=false critical= recreate= testinstall=true -yyyy=2008 +verbose= + while test $# -gt 0; do case $1 in @@ -23,6 +26,7 @@ while test $# -gt 0; do --no-testinstall|-N) testinstall=false;; --recreate) recreate=--recreate;; --testlocation) shift; tltrybase=$1;; + -v|-vv|-vvv) verbose=$1;; --help) echo "xxtodo. Sorry."; exit 0;; --version) echo "$vc_id"; exit 0;; --*) echo "$0: unrecognized option \`$1'." >&2 @@ -64,7 +68,8 @@ echo "$0: Updating $tltry in cow-shell..." cd $tltry cow-shell <<END_COW echo "$0: Running tl-update-containers..." -$Master/tlpkg/bin/tl-update-containers -location $tltry $critical $recreate +$Master/tlpkg/bin/tl-update-containers \ + $verbose -location $tltry $critical $recreate # It is scary, but I guess we should update the installer package every # day, partly for the sake of doc.html and partly so it actually gets diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc index 560e80102e4..c185a706f5e 100644 --- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc +++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc @@ -8,7 +8,11 @@ depend texlive.infra runpattern f texmf/fmtutil/fmtutil-hdr.cnf runpattern d texmf/scripts/texlive/lua runpattern d texmf/scripts/texlive/tlmgrgui +<<<<<<< .mine +runpattern !f texmf/scripts/texlive/tlmgrui/tlmgrgui2.pl +======= runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui2.pl +>>>>>>> .r11548 runpattern f texmf/scripts/texlive/rungs.tlu runpattern f texmf/scripts/texlive/test-tlpdb.tlu runpattern f texmf/scripts/texlive/texconf.tlu diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc index d2e537d2163..57a52ba549a 100644 --- a/Master/tlpkg/tlpsrc/context.tlpsrc +++ b/Master/tlpkg/tlpsrc/context.tlpsrc @@ -9,6 +9,7 @@ runpattern +d texmf-dist/fonts/cid/fontforge # these have their own TL packages, and are not part of core context. runpattern +!d texmf-dist/tex/context/third runpattern +!d texmf-dist/tex/context/interface/third +runpattern +!d texmf-dist/metapost/context/third srcpattern +!d texmf-dist/source/context/third docpattern +!d texmf-dist/doc/context/third # @@ -19,6 +19,8 @@ Contents - move texlive.infra doc files to docpattern. - install rework-AddFormat-lines.patch and get rid of texmf/fmtutil. - rename 00texlive-installation.config to 00texlive.installation. +- change V to 4 in dvipdfm/config (if we don't replace with dvipdfmx). + 1. Package updates ================== |