merged from the mvo branch

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

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

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

diff --cc apt-pkg/makefile
Simple merge

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

diff --cc debian/changelog
index 3c93178f56a3699ca96c78ac2c5cd11b6f6287ff,685c048ea9985fd0d37a6fcbcc501a99b0dd2259..32d019cc54f294185d9be47dacdb17dbe568f877
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,105 -1,26 +1,119 @@@
 -apt (0.7.22.4) unstable; urgency=low
 +apt (0.7.24ubuntu1) UNRELEASED; urgency=low
  
    [ Michael Vogt ]
 +  * apt-pkg/pkgcache.cc:
 +    - do not set internel "needs-configure" state for packages in 
 +      triggers-pending state. dpkg will deal with the trigger and
 +      it if does it before we trigger it, dpkg will error out
 +      (LP: #414631)
    * apt-pkg/deb/dpkgpm.cc:
 -    - when tcgetattr() returns non-zero skip all pty magic 
 -      (thanks to Simon Richter, closes: #509866)
 -  * apt-inst/contrib/arfile.cc:
 -    - show propper error message for Invalid archive members
 +    - include df -l output in the apport log as well (thanks to
 +      tjaalton)
+   * 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.
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Dec 2009 17:42:36 +0100
+   [ Brian Murray ]
+   * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
+     - typo fix (LP: #462328)
+   
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 09 Dec 2009 09:56:03 +0100
 +
 +apt (0.7.24) unstable; urgency=low
 +
 +  [ Nicolas François ]
 +  * Cleaned up the first patch draft from KURASAWA Nozomu to finally
 +    get po4a support for translating the man pages.
 +    Many thanks to both for this excellent work! (Closes: #441608)
 +  * doc/ja/*, doc/po/ja.po:
 +    - remove the old ja man page translation and replace it with
 +      the new po4a-powered translation by KURASAWA Nozomu.
 +  * doc/*.?.xml (manpages):
 +    - add contrib to author tags and also add refmiscinfo to fix warnings
 +  * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak:
 +    - fix a few typos in the comments of this files
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - when tcgetattr() returns non-zero skip all pty magic 
 +      (thanks to Simon Richter, closes: #509866)
 +  * apt-inst/contrib/arfile.cc:
 +    - show propper error message for Invalid archive members
 +
 +  [ David Kalnischkies ]
 +  * doc/Doxyfile.in:
 +    - update file with doxygen 1.6.1 (current unstable)
 +    - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9
 +  * buildlib/po4a_manpage.mak, doc/makefile, configure:
 +    - simplify the makefiles needed for po4a manpages
 +  * apt-pkg/contrib/configuration.cc:
 +    - add a helper to easily get a vector of strings from the config
 +  * apt-pkg/contrib/strutl.cc:
 +    - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208)
 +  * doc/apt-get.8.xml:
 +    - fix two little typos in the --simulate description. (Closes: #545059)
 +  * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml:
 +    - add an order subgroup to the compression types to simplify reordering
 +      a bit and improve the documentation for this option group.
 +  * doc/apt.conf.5.xml:
 +    - document the Acquire::http::Dl-Limit option
 +    - try to be crystal clear about the usage of :: and {} (Closes: #503481)
 +  * doc/apt-cache.8.xml:
 +    - clarify the note for the pkgnames command (Closes: #547599)
 +  * doc/apt.ent, all man pages:
 +    - move the description of files to globally usable entities
 +  * doc/apt_preferences.5.xml:
 +    - document the new preferences.d folder (Closes: #544017)
 +  * methods/rred.cc:
 +    - add at the top without failing (by Bernhard R. Link, Closes: #545694)
 +  * buildlib/sizetable:
 +    - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058)
 +  * debian/prerm:
 +    - remove file as nobody will upgrade from 0.4.10 anymore
 +  * debian/control:
 +    - remove gnome-apt suggestion as it was removed from debian
 +  * apt-pkg/deb/dpkgpm.cc, apt-pkg/packagemanager.cc, apt-pkg/orderlist.cc:
 +    - add and document _experimental_ options to make (aggressive)
 +      use of dpkg's trigger and configuration handling (Closes: #473461)
 +  * cmdline/apt-get.cc:
 +    - ignore versions that are not candidates when selecting a package
 +      instead of a virtual one (by Marius Vollmer, Closes: #547788)
 +
 +  [ Christian Perrier ]
 +  * doc/fr/*, doc/po/fr.po:
 +    - remove the old fr man page translation and replace it with
 +      the new po4a-powered translation
 +  * doc/de: dropped (translation is too incomplete to be useful in
 +      the transition to the po4a-powered translations)
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 25 Sep 2009 19:57:25 +0200
 +
 +apt (0.7.23.1ubuntu2) karmic; urgency=low
 +
 +  [ Michael Vogt ]
 +  * debian/control:
 +    - fix Vcr-Bzr header
 +
 +  [ Kees Cook ]
 +  * debian/apt.cron.daily:
 +    - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Oct 2009 19:05:19 +0200
 +
 +apt (0.7.23.1ubuntu1) karmic; urgency=low
 +
 +  [ Matt Zimmerman ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - Suppress apport reports on dpkg short reads (these I/O errors are not 
 +      generally indicative of a bug in the packaging)
 +
    [ Loïc Minier ]
    * cmdline/apt-key:
      - Emit a warning if removed keys keyring is missing and skip associated

diff --cc doc/examples/configure-index
index b768195938b721693ceca23909b32093ed5f392c,fc2bede4e40cdfead6ad282f3eaa1a9155acd140..adef8035905dce47a6cb43e3b22230828cb12b64
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -396,9 -363,10 +397,10 @@@ Debu
    Acquire::Http "false";   // Show http command traffic
    Acquire::Https "false";   // Show https debug
    Acquire::gpgv "false";   // Show the gpgv traffic
 +  Acquire::Mirror "false"; // Show debugging of the mirror method
    aptcdrom "false";        // Show found package files
    IdentCdrom "false";
 -  
+   acquire::netrc "false";  // netrc parser
  }
  
  /* Whatever you do, do not use this configuration file!! Take out ONLY

diff --cc methods/http.cc
index ba0241fc1d3f34c7227dd32f6d44d6e01ec2ad9d,50478b44c846e8ffa6a16a8baff5180d84ffea10..e2057f436b25b032f1e14d1de2dec3197489712c
--- 1/methods/http.cc
--- 2/methods/http.cc
+++ b/methods/http.cc
@@@ -724,11 -725,13 +725,13 @@@ void HttpMethod::SendReq(FetchItem *Itm
        Req += string("Proxy-Authorization: Basic ") + 
            Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
  
+    maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
     if (Uri.User.empty() == false || Uri.Password.empty() == false)
+    {
        Req += string("Authorization: Basic ") + 
            Base64Encode(Uri.User + ":" + Uri.Password) + "\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;