* merged from apt--mvo

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 5e878ff650d85a9a12026fdd2463e4f6fbe5feb0..bd814729155e6380a2b61f70bb37a6b3316cb456 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -512,7 +512,7 @@ void pkgProblemResolver::MakeScores()
          on the same level. We enhance the score of installed packages 
         if those are not obsolete
       */
-      if (I->CurrentVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
+      if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
         Score += 1;
    }
 
@@ -861,7 +861,12 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
               OldEnd = LEnd;
            }
            else
+            {
               Start++;
+              // We only worry about critical deps.
+              if (Start.IsCritical() != true)
+                  continue;
+            }
 
            // Dep is ok
            if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 518988bb660edffb6c2f00ef20d2267dc182bee0..5eb2d67bb9d63408170eb9ff04122dc1810249cb 100644 (file)
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -67,7 +67,7 @@ string debRecordParser::MD5Hash()
 /* */
 string debRecordParser::SHA1Hash()
 {
-   return Section.FindS("SHA1Sum");
+   return Section.FindS("SHA1");
 }
                                                                        /*}}}*/
 // RecordParser::Maintainer - Return the maintainer email              /*{{{*/

diff --git a/debian/changelog b/debian/changelog
index 9f8326739ee7529eac139bcc5b702732d55087a5..c40804746674b357c0b52699c7784d59abee0c6c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,12 @@ apt (0.6.46.5) UNRELEASED; urgency=low
     - use clog for all debugging
     - only increase the score of installed applications if they 
       are not obsolete 
+    - fix resolver bug on removal triggered by weak-dependencies 
+      with or-groups
+  * methods/http.cc:
+    - send apt version in User-Agent
+  * apt-pkg/deb/debrecords.cc:
+    - fix SHA1Hash() return value
 
  -- Michael Vogt <mvo@debian.org>  Thu, 14 Dec 2006 11:31:41 +0100
 

diff --git a/methods/http.cc b/methods/http.cc
index 1f3b038bc4a515391ff0feb8ac3ca326733cee1b..5aefd4c1f120047f9ab8ddfac04e0d1fc9f7d330 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -44,6 +44,7 @@
 // Internet stuff
 #include <netdb.h>
 
+#include "config.h"
 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"
@@ -713,7 +714,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       Req += string("Authorization: Basic ") + 
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    
-   Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n";
+   Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
    
    if (Debug == true)
       cerr << Req << endl;