cleanup the debian/rules file a bit

[apt.git] / apt-pkg / deb / debsrcrecords.cc

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 2f87c767b1318d697f2ec875a7f85a125e2c9ac9..21336e1af0d6edd531fa39f78160ba28a56d7005 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -54,7 +54,8 @@ const char **debSrcRecordParser::Binaries()
    package/version records representing the build dependency. The returned 
    array need not be freed and will be reused by the next call to this 
    function */
    package/version records representing the build dependency. The returned 
    array need not be freed and will be reused by the next call to this 
    function */

-bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly)
+bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps,
+                                       bool const &ArchOnly, bool const &StripMultiArch)

 {
    unsigned int I;
    const char *Start, *Stop;
 {
    unsigned int I;
    const char *Start, *Stop;


@@ -77,7 +78,7 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec>
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 

-                    rec.Package,rec.Version,rec.Op,true);
+                    rec.Package,rec.Version,rec.Op,true, StripMultiArch);

         
          if (Start == 0) 
             return _error->Error("Problem parsing dependency: %s", fields[I]);
         
          if (Start == 0) 
             return _error->Error("Problem parsing dependency: %s", fields[I]);


@@ -135,9 +136,15 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
         string::size_type Tmp = F.Path.rfind('.',Pos);
         if (Tmp == string::npos)
            break;
         string::size_type Tmp = F.Path.rfind('.',Pos);
         if (Tmp == string::npos)
            break;

+        if (F.Type == "tar") {
+           // source v3 has extension 'debian.tar.*' instead of 'diff.*'
+           if (string(F.Path, Tmp+1, Pos-Tmp) == "debian")
+              F.Type = "diff";
+           break;
+        }

         F.Type = string(F.Path,Tmp+1,Pos-Tmp);
         
         F.Type = string(F.Path,Tmp+1,Pos-Tmp);
         

-        if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma")
+        if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma" || F.Type == "tar")

         {
            Pos = Tmp-1;
            continue;
         {
            Pos = Tmp-1;
            continue;