merged -r1875..1886 from lp:~donkult/apt/sid

diff --cc apt-pkg/packagemanager.cc
Simple merge

diff --cc debian/changelog
index 9b3bd724c6764210b2eafe92b44a09736ffea9e3,4b2719e5056726221aeab1bd3225f54c597f2b04..60893ad757e38fa2a750e970bcf9ab78125c8b91
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -11,43 -11,20 +11,54 @@@ apt (0.7.25) UNRELEASED; urgency=lo
      Closes: #479997
    * Polish translation update by Wiktor Wandachowicz
      Closes: #548571
-   * apt-pkg/packagemanager.cc:
-     - fix overly aggressive immediate config propergation
-       (thanks to David Kalnischkies)
 +  * German translation update by Holger Wansing
 +    Closes: #551534
 +  * German translation of manpages by Chris Leick
 +    Closes: #552606
 +  * Italian translation update by Milo Casagrande
 +    Closes: #555797
 +  * Simplified Chinese translation update by Aron Xu 
 +    Closes: #558737
 +  * Slovak translation update by Ivan Masár
 +    Closes: #559277
 +  
 +  [ Michael Vogt ]
-     in a machine definition). Based on the maemo git branch.
 +  * apt-pkg/packagemanager.cc:
 +    - add output about pre-depends configuring when debug::pkgPackageManager
 +      is used
 +  * methods/https.cc:
 +    - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
 +      thanks to Brian Thomason for the patch
 +  * merge lp:~mvo/apt/netrc branch, this adds support for a
 +    /etc/apt/auth.conf that can be used to store username/passwords
 +    in a "netrc" style file (with the extension that it supports "/"
++    in a machine definition). Based on the maemo git branch (Closes: #518473)
++    (thanks also to Jussi Hakala and Julian Andres Klode)
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - add "purge" to list of known actions
 +
 +  [ Brian Murray ]
 +  * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
 +    - typo fix (LP: #462328)
 +  
 +  [ Loïc Minier ]
 +  * cmdline/apt-key:
 +    - Emit a warning if removed keys keyring is missing and skip associated
 +      checks (LP: #218971)
  
+   [ David Kalnischkies ]
+   * apt-pkg/packagemanager.cc:
+     - better debug output for ImmediateAdd with depth and why
+     - improve the message shown for failing immediate configuration
+   * doc/guide.it.sgml: moved to doc/it/guide.it.sgml
+   * doc/po4a.conf: activate translation of guide.sgml and offline.sgml
+   * doc/apt.conf.5.xml:
+     - provide a few more details about APT::Immediate-Configure
+   * doc/sources.list.5.xml:
+     - add note about additional apt-transport-methods
+   * doc/apt-mark.8.xml:
+     - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
+ 
    [ Julian Andres Klode ]
    * doc/apt.conf.5.xml:
      - Deprecate unquoted values, string concatenation and explain what should
@@@ -55,13 -32,9 +66,10 @@@
      - Restrict option names to alphanumerical characters and "/-:._+".
      - Deprecate #include, we have apt.conf.d nowadays which should be
        sufficient.
--  * methods/https.cc:
--    - Add support for authentication using netrc (Closes: #518473), patch
--      by Jussi Hakala <jussi.hakala@hut.fi>.
 +  * ftparchive/apt-ftparchive.cc:
 +    - Call setlocale() so translations are actually used.
 +  * debian/apt.conf.autoremove:
 +    - Add kfreebsd-image-* to the list (Closes: #558803)
  
   -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Sep 2009 15:51:34 +0200
  

diff --cc methods/https.cc
index 3717ded7be85ce6581a9ec97ca85d795a170edfb,79e6fea3f42d6c1b173993a6092ba5d1a71329da..86d7f3a6ba6542ed894292fbfc668789690f4949
--- 1/methods/https.cc
--- 2/methods/https.cc
+++ b/methods/https.cc
@@@ -138,7 -135,7 +138,6 @@@ bool HttpsMethod::Fetch(FetchItem *Itm
     curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
     curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
     curl_easy_setopt(curl, CURLOPT_FILETIME, true);
--   curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
  
     // SSL parameters are set by default to the common (non mirror-specific) value
     // if available (or a default one) and gets overload by mirror-specific ones.