From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 20 Dec 2006 09:59:13 +0000 (+0100)
Subject: * merged from apt--mvo
X-Git-Tag: 0.7.24ubuntu1~207
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/098d7904ec731c4b3d7e87c7bdb39c9e53a43c8d

* merged from apt--mvo
---

098d7904ec731c4b3d7e87c7bdb39c9e53a43c8d
diff --cc debian/changelog
index 46ab467de,7893f2599..45f79f40a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,15 +1,21 @@@
 -apt (0.6.46.5) UNRELEASED; urgency=low
 +apt (0.6.46.4ubuntu5) feisty; urgency=low
  
 -  * apt-pkg/algorithm.cc:
 -    - use clog for all debugging
 +  * added apt-transport-https package to provide a optional
 +    https transport (apt-https spec)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Dec 2006 16:23:43 +0100
 +
 +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 --cc methods/http.cc
index 1833f41ef,06b91686c..0eef7a633
--- a/methods/http.cc
+++ b/methods/http.cc
@@@ -714,7 -715,7 +715,7 @@@ void HttpMethod::SendReq(FetchItem *Itm
        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: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
++   Req += "User-Agent: Ubuntu APT-HTTP/1.3 ("VERSION")\r\n\r\n";
     
     if (Debug == true)
        cerr << Req << endl;