Ubuntu Wiki

   1 diff -Nrua apt-0.7.9/apt-pkg/acquire-item.cc apt-0.7.9.lzma/apt-pkg/acquire-item.cc
   2 --- apt-0.7.9/apt-pkg/acquire-item.cc	2007-10-06 16:16:27.000000000 -0500
   3 +++ apt-0.7.9.lzma/apt-pkg/acquire-item.cc	2007-11-21 15:02:09.000000000 -0600
   4 @@ -563,7 +563,9 @@
   5     if(comprExt.empty()) 
   6     {
   7        // autoselect the compression method
   8 -      if(FileExists("/bin/bzip2")) 
   9 +      if(FileExists("/usr/bin/lzma"))
  10 +         CompressionExtension = ".lzma";
  11 +      else if(FileExists("/bin/bzip2")) 
  12  	 CompressionExtension = ".bz2";
  13        else 
  14  	 CompressionExtension = ".gz";
  15 @@ -702,7 +704,9 @@
  16     
  17     string compExt = Desc.URI.substr(Desc.URI.size()-3);
  18     const char *decompProg;
  19 -   if(compExt == "bz2") 
  20 +   if(compExt == "lzma") 
  21 +      decompProg = "lzma";
  22 +   else if(compExt == "bz2") 
  23        decompProg = "bzip2";
  24     else if(compExt == ".gz") 
  25        decompProg = "gzip";
  26 diff -Nrua apt-0.7.9/ftparchive/contents.cc apt-0.7.9.lzma/ftparchive/contents.cc
  27 --- apt-0.7.9/ftparchive/contents.cc	2007-07-24 07:33:30.000000000 -0500
  28 +++ apt-0.7.9.lzma/ftparchive/contents.cc	2007-11-21 14:56:55.000000000 -0600
  29 @@ -314,6 +314,10 @@
  30        Compressor = "bzip2";
  31     }
  32     if (Member == 0) {
  33 +      Member = Deb.GotoMember("data.tar.lzma");
  34 +      Compressor = "lzma";
  35 +   }
  36 +   if (Member == 0) {
  37        _error->Error(_("Internal error, could not locate member %s"),"data.tar.gz");
  38        return false;
  39     }
  40 diff -Nrua apt-0.7.9/ftparchive/multicompress.cc apt-0.7.9.lzma/ftparchive/multicompress.cc
  41 --- apt-0.7.9/ftparchive/multicompress.cc	2007-07-24 07:33:30.000000000 -0500
  42 +++ apt-0.7.9.lzma/ftparchive/multicompress.cc	2007-11-21 14:56:27.000000000 -0600
  43 @@ -34,6 +34,7 @@
  44        {{".","",0,0,0,1},
  45         {"gzip",".gz","gzip","-9n","-d",2},
  46         {"bzip2",".bz2","bzip2","-9","-d",3},
  47 +       {"lzma",".lzma","lzma","-9","-d",4},
  48         {}};
  49  
  50  // MultiCompress::MultiCompress - Constructor				/*{{{*/
  51 diff -Nrua apt-0.7.9/ftparchive/writer.cc apt-0.7.9.lzma/ftparchive/writer.cc
  52 --- apt-0.7.9/ftparchive/writer.cc	2007-09-12 15:03:03.000000000 -0500
  53 +++ apt-0.7.9.lzma/ftparchive/writer.cc	2007-11-21 14:57:34.000000000 -0600
  54 @@ -815,9 +815,11 @@
  55     AddPattern("Packages");
  56     AddPattern("Packages.gz");
  57     AddPattern("Packages.bz2");
  58 +   AddPattern("Packages.lzma");
  59     AddPattern("Sources");
  60     AddPattern("Sources.gz");
  61     AddPattern("Sources.bz2");
  62 +   AddPattern("Sources.lzma");
  63     AddPattern("Release");
  64     AddPattern("md5sum.txt");
  65