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.

diff --cc debian/changelog
index 417cd2436da6dbdeb6668d1158716d36c0219769,16e8929ad570dcde5f21840f22cca41167c7d0dd..685c048ea9985fd0d37a6fcbcc501a99b0dd2259
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -6,17 -6,7 +6,21 @@@ apt (0.7.22.4) unstable; urgency=lo
        (thanks to Simon Richter, closes: #509866)
    * apt-inst/contrib/arfile.cc:
      - show propper error message for Invalid archive members
 +  * 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.
  
 +  [ 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

diff --cc methods/https.cc
Simple merge

diff --cc po/apt-all.pot
index a1864629031088d089e2754e6e0a0009130d2521,b05e180c1a71279dbc7d56e3e3e3fff7a3f2785c..a6caa7ac3d34212cc5dc81e94cbc73d1185d076e
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-07-26 01:10+0200\n"
 -"POT-Creation-Date: 2009-10-16 15:18+0200\n"
++"POT-Creation-Date: 2009-11-04 13:06+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -2285,7 -2292,7 +2292,7 @@@ msgstr "
  msgid "Malformed line %u in source list %s (vendor id)"
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:426
++#: apt-pkg/packagemanager.cc:432
  #, c-format
  msgid ""
  "This installation run will require temporarily removing the essential "
@@@ -2654,6 -2661,6 +2661,21 @@@ msgstr "
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
  
++#: apt-pkg/indexcopy.cc:530
++#, c-format
++msgid "Skipping nonexistent file %s"
++msgstr ""
++
++#: apt-pkg/indexcopy.cc:536
++#, c-format
++msgid "Can't find authentication record for: %s"
++msgstr ""
++
++#: apt-pkg/indexcopy.cc:542
++#, c-format
++msgid "Hash mismatch for: %s"
++msgstr ""
++
  #: apt-pkg/deb/dpkgpm.cc:49
  #, c-format
  msgid "Installing %s"