3 files changed, 29 insertions, 1 deletions
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index c3e579ad1..26ca36799 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -92,18 +92,44 @@ string debRecordParser::LongDesc()
    return Section.FindS("Description");
 }
 									/*}}}*/
+
+static const char *SourceVerSeparators = " ()";
+
 // RecordParser::SourcePkg - Return the source package name if any	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 string debRecordParser::SourcePkg()
 {
    string Res = Section.FindS("Source");
-   string::size_type Pos = Res.find(' ');
+   string::size_type Pos = Res.find_first_of(SourceVerSeparators);
    if (Pos == string::npos)
       return Res;
    return string(Res,0,Pos);
 }
 									/*}}}*/
+// RecordParser::SourceVer - Return the source version number if present	/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SourceVer()
+{
+   string Pkg = Section.FindS("Source");
+   string::size_type Pos = Pkg.find_first_of(SourceVerSeparators);
+   if (Pos == string::npos)
+      return "";
+
+   string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos);
+   if(VerStart == string::npos)
+     return "";
+
+   string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart);
+   if(VerEnd == string::npos)
+     // Corresponds to the case of, e.g., "foo (1.2" without a closing
+     // paren.  Be liberal and guess what it means.
+     return string(Pkg, VerStart);
+   else
+     return string(Pkg, VerStart, VerEnd - VerStart);
+}
+									/*}}}*/
 // RecordParser::GetRec - Return the whole record			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index efef2e588..bb72275a5 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -38,6 +38,7 @@ class debRecordParser : public pkgRecords::Parser
    virtual string MD5Hash();
    virtual string SHA1Hash();
    virtual string SourcePkg();
+   virtual string SourceVer();
    
    // These are some general stats about the package
    virtual string Maintainer();
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 08f004414..dcfec07ef 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -58,6 +58,7 @@ class pkgRecords::Parser
    virtual string MD5Hash() {return string();};
    virtual string SHA1Hash() {return string();};
    virtual string SourcePkg() {return string();};
+   virtual string SourceVer() {return string();};
 
    // These are some general stats about the package
    virtual string Maintainer() {return string();};