* ftparchive/contents.cc:

  - fix error output
* ftparchive/contents.cc:
  - support lzma data members
* ftparchive/multicompress.cc:
  - support lzma output

diff --git a/debian/changelog b/debian/changelog
index 832ee11..ca4a9bb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,13 @@ apt (0.7.10) unstable; urgency=low
   [ Michael Vogt ]
   * debian/rules
     - fix https install location
+  * ftparchive/contents.cc:
+    - fix error output
+  [ Chris Cheney ]
+  * ftparchive/contents.cc:
+    - support lzma data members
+  * ftparchive/multicompress.cc:
+    - support lzma output
 
  -- Michael Vogt <mvo@debian.org>  Wed, 28 Nov 2007 17:10:49 +0100
 

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 3801995..1f2cbcc 100644 (file)
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -314,7 +314,12 @@ bool ContentsExtract::Read(debDebFile &Deb)
       Compressor = "bzip2";
    }
    if (Member == 0) {
-      _error->Error(_("Internal error, could not locate member %s"),"data.tar.gz");
+      Member = Deb.GotoMember("data.tar.lzma");
+      Compressor = "lzma";
+   }
+   if (Member == 0) {
+      _error->Error(_("Internal error, could not locate member %s"),
+                   "data.tar.{gz,bz2,lzma}");
       return false;
    }
       

diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 935c988..2fc8efc 100644 (file)
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -34,6 +34,7 @@ const MultiCompress::CompType MultiCompress::Compressors[] =
       {{".","",0,0,0,1},
        {"gzip",".gz","gzip","-9n","-d",2},
        {"bzip2",".bz2","bzip2","-9","-d",3},
+       {"lzma",".lzma","lzma","-9","-d",4},
        {}};
 
 // MultiCompress::MultiCompress - Constructor                          /*{{{*/