Move most of the stuff from tlpkg, tlmgr from branch to trunk

git-svn-id: svn://tug.org/texlive/trunk@13054 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 7 insertions, 7 deletions

diff --git a/Master/tlpkg/bin/tl-fix-container-infos b/Master/tlpkg/bin/tl-fix-container-infos
index 2f627976713..df0ac5ed2be 100755
--- a/Master/tlpkg/bin/tl-fix-container-infos
+++ b/Master/tlpkg/bin/tl-fix-container-infos
@@ -64,13 +64,13 @@ sub main
   # set up the programs.
   if ($opt_nosetup) {
     # do a minimal setup
-    $::progs{'lzma'} = "lzma";
+    $::progs{'xz'} = "xz";
     $::progs{'tar'} = "tar";
   } else {
     # do a full setup
     my $ret = &TeXLive::TLUtils::setup_programs("$Master/tlpkg/installer");
     if ($ret == -1) {
-      tlwarn("$0: no lzmadec for $::_platform_, aborting.\n");
+      tlwarn("$0: no xzdec for $::_platform_, aborting.\n");
       exit 1;
     }
     if (!$ret) {
@@ -93,7 +93,7 @@ sub main
     $tlpdb->add_tlpobj($obj);
   }
   $tlpdb->save;
-  system("lzma --force -k -z $opt_location/tlpkg/texlive.tlpdb");
+  system("xz --force -k -z $opt_location/tlpkg/texlive.tlpdb");
 
   return 0;
 }
@@ -102,16 +102,16 @@ sub main
 sub do_containers {
   my ($obj, $dosrc, $dodoc) = @_;
   my $fbase = "$opt_location/archive/" . $obj->name;
-  my ($a, $b) = do_size_md ("${fbase}.tar.lzma");
+  my ($a, $b) = do_size_md ("${fbase}.tar.xz");
   $obj->containersize($a);
   $obj->containermd5($b);
   if ($dosrc && $obj->srcfiles) {
-    ($a, $b) = do_size_md ("${fbase}.source.tar.lzma");
+    ($a, $b) = do_size_md ("${fbase}.source.tar.xz");
     $obj->srccontainersize($a);
     $obj->srccontainermd5($b);
   }
   if ($dodoc && $obj->docfiles) {
-    ($a, $b) = do_size_md ("${fbase}.doc.tar.lzma");
+    ($a, $b) = do_size_md ("${fbase}.doc.tar.xz");
     $obj->doccontainersize($a);
     $obj->doccontainermd5($b);
   }
@@ -146,7 +146,7 @@ of containers to be compared against; default is C<.>.
 
 =item B<-no-setup>
 
-Does not try to setup the various programs, but uses I<lzma> and I<tar>
+Does not try to setup the various programs, but uses I<xz> and I<tar>
 from the current path.
 
 =item B<-help>