merged from lp:~mvo/apt/mvo

diff --cc debian/changelog
index 13d46cec95a5ba3940dce1e6550aa9b91949f2b7,896f850b058c42b213cfdbce4eb44890f9d6acec..0ce1602956ed8b7abbf7e89430a799315fdfe5ed
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,23 +1,61 @@@
 -apt (0.7.25.4) UNRELEASED; urgency=low
++apt (0.7.25.3ubuntu7) UNRELEASEDlucid; urgency=low
++
++  Cherry pick fixes from the lp:~mvo/apt/mvo branch:
+ 
+   [ Evan Dandrea ]
+   * Remember hosts with general failures for
+     https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
+   
 -  [ Ivan Masár ]
 -  * Slovak translation update. Closes: #568294
++  [ Michael Vogt ]
++  * improve debug output for Debug::pkgPackageManager
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Apr 2010 19:29:03 +0200
++
 +apt (0.7.25.3ubuntu6) lucid; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix crash when pkg.VersionList() is empty (LP: #556056)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 08 Apr 2010 21:13:25 +0200
 +
 +apt (0.7.25.3ubuntu5) lucid; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * cmdline/apt-get.cc:
 +    - try version match in FindSrc first exact than fuzzy (LP: #551178)
 +
 +  [ Jean-Baptiste Lallement ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - always escape '%' (LP: #130289) (Closes: #500560)
 +    - unescape '%' sequence only if followed by 2 hex digit
 +    - username/password are urlencoded in proxy string (RFC 3986)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Mar 2010 21:59:42 +0200
 +
 +apt (0.7.25.3ubuntu4) lucid; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/deb/debversion.cc:
 +    - consider absent of debian revision equivalent to 0 (Closes: #573592)
 +      LP: #540228
 +  * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
 +   - fix memory leaks in error conditions in DoSource()
 +  * apt-pkg/deb/dpkgpm.cc:
 +   - fix error message construction in OpenLog()
    
 + -- 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:
 +    - remove "cs" from languages that need the full langcode when
 +      downloading translations (thanks to Steve Langasek)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Mar 2010 09:42:39 +0100
 +
 +apt (0.7.25.3ubuntu2) lucid; urgency=low
 +
    [ Michael Vogt ]
 -  * merged lp:~mvo/apt/history
 -    - this writes a /var/log/apt/history tagfile that contains details
 -      from the transaction (complements term.log)
 -  * methods/http.cc:
 -    - add cache-control headers even if no cache is given to allow
 -      adding options for intercepting proxies
 -    - add Acquire::http::ProxyAutoDetect configuration that 
 -      can be used to call a external helper to figure out the 
 -      proxy configuration and return it to apt via stdout
 -      (this is a step towards WPAD and zeroconf/avahi support)
    * abicheck/
      - add new abitest tester using the ABI Compliance Checker from
        http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker

diff --cc doc/examples/configure-index
Simple merge

diff --cc methods/connect.cc
index ea3794e16548054e5f6b1c989b46091a2354c64b,2f6b4833e2e636ccf12e87ce8c6b3d5ab86796eb..a5af1f1a68f094d929d4748405e00bd49c3b6bbe
--- 1/methods/connect.cc
--- 2/methods/connect.cc
+++ b/methods/connect.cc
@@@ -114,7 -115,10 +114,10 @@@ static bool DoConnect(struct addrinfo *
     {
        errno = Err;
        if(errno == ECONNREFUSED)
 -         Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
 +         Owner->SetFailReason("ConnectionRefused");
+       else if (errno == ETIMEDOUT)
 -       Owner->SetFailExtraMsg("\nFailReason: ConnectionTimedOut");
++       Owner->SetFailReason("ConnectionTimedOut");
+       bad_addr.insert(bad_addr.begin(), string(Name));
        return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
                           Service,Name);
     }