From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 26 Mar 2010 16:02:27 +0000 (+0100)
Subject: cherry pick -r 1956..1957 lp:~donkult/apt/sid
X-Git-Tag: 0.7.25.3ubuntu4~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1c56c17a3c5548a3bb86c0d7967c0f790c7c2cca

cherry pick -r 1956..1957 lp:~donkult/apt/sid
---

diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index ad45e9a44..755ffbe96 100644
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -190,8 +190,22 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd,
       dlhs++;
    if (drhs != rhs)
       drhs++;
-   
-   return CmpFragment(dlhs,AEnd,drhs,BEnd);
+
+   // no debian revision need to be treated like -0
+   if (*(dlhs-1) == '-' && *(drhs-1) == '-')
+      return CmpFragment(dlhs,AEnd,drhs,BEnd);
+   else if (*(dlhs-1) == '-')
+   {
+      const char* null = "0";
+      return CmpFragment(dlhs,AEnd,null, null+1);
+   }
+   else if (*(drhs-1) == '-')
+   {
+      const char* null = "0";
+      return CmpFragment(null, null+1, drhs, BEnd);
+   }
+   else
+      return 0;
 }
 									/*}}}*/
 // debVS::CheckDep - Check a single dependency				/*{{{*/
diff --git a/debian/changelog b/debian/changelog
index 4164fd726..bf07b9f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.7.25.3ubuntu4) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/deb/debversion.cc:
+    - consider absent of debian revision equivalent to 0 (Closes: #573592)
+      LP: #540228
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 Mar 2010 16:57:49 +0100
+
 apt (0.7.25.3ubuntu3) lucid; urgency=low
 
   * apt-pkg/indexfile.cc: