* merged from apt--mvo

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 5e878ff650d85a9a12026fdd2463e4f6fbe5feb0..eb59a42ca973b2202f1e09ef670574ed4f9911b9 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -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 46ab467de54a384f9c36659aca533c7532257bea..45f79f40aba7a982b69842a612c41b46477bdf08 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,13 @@ apt (0.6.46.4ubuntu4) feisty; urgency=low
   
   * apt-pkg/algorithms.cc:
     - only increase the score of installed applications if they 
-      are not obsolete (lp: #63680)
+      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 <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 

diff --git a/methods/http.cc b/methods/http.cc
index 1833f41efdbaf692213e9a926719ab20d1f43832..0eef7a633a9aa9f1d0f8b2cb26e21f703b9f5b10 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"
@@ -714,7 +715,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       Req += string("Authorization: Basic ") + 
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    
-   Req += "User-Agent: Ubuntu APT-HTTP/1.3\r\n\r\n";
+   Req += "User-Agent: Ubuntu APT-HTTP/1.3 ("VERSION")\r\n\r\n";
    
    if (Debug == true)
       cerr << Req << endl;