merge from debian-sid apt 0.7.24

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 0113fb95a9db6ef37bb6b283175aa078c6a4b17e,94dee639e9ea270d7827944b83faca840ec73c5e..3c93178f56a3699ca96c78ac2c5cd11b6f6287ff
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,4 +1,18 @@@
-   [ 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)
- 
-   [ Brian Murray ]
-   * cmdline/apt-get.cc:
-     - typo fix (LP: #370094)
- 
-   [ Loïc Minier ]
-   * cmdline/apt-key:
-     - Emit a warning if removed keys keyring is missing and skip associated
-       checks (LP: #218971)
- 
-   [ Kees Cook ]
-   * debian/apt.cron.daily:
-     - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
- 
-  -- Kees Cook <kees@ubuntu.com>  Wed, 14 Oct 2009 15:27:56 -0700
 +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:
 +    - include df -l output in the apport log as well (thanks to
 +      tjaalton)
 +
- apt (0.7.24) UNRELEASED; urgency=low
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Dec 2009 17:42:36 +0100
 +
+ apt (0.7.24) unstable; urgency=low
  
    [ Nicolas François ]
    * Cleaned up the first patch draft from KURASAWA Nozomu to finally
@@@ -86,12 -62,11 +76,64 @@@
    * doc/fr/*, doc/po/fr.po:
      - remove the old fr man page translation and replace it with
        the new po4a-powered translation
-   * doc/pl, doc/de: dropped (pl translation is useless as the translated
-     document is not provideed anymore and the de translation is too
-     incomplete to be used)
+   * 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
++      checks (LP: #218971)
++
++  [ Brian Murray ]
++  * cmdline/apt-get.cc:
++    - typo fix (LP: #370094)
++
++  [ 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
++  * apt-pkg/acquire-worker.cc:
++    - show error details of failed methods
++  * apt-pkg/contrib/fileutl.cc:
++    - if a process aborts with signal, show signal number
++  * methods/http.cc:
++    - ignore SIGPIPE, we deal with EPIPE from write in 
++      HttpMethod::ServerDie() (LP: #385144)
++  * debian/apt.cron.daily:
++    - if the timestamp is too far in the future, delete it 
++      (LP: #135262)
++  
++  [ Merge ]
++  * merged from debian, reverted the libdlopen-udev branch
++    because its too late in the release process for this now
++  * not merged the proxy behaviour change from 0.7.23 (that will
++    be part of lucid)
 +
-  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Aug 2009 09:40:08 +0200
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Sep 2009 18:15:10 +0200
 +
  apt (0.7.23.1) unstable; urgency=low
  
    [ Michael Vogt ]