* 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

diff --cc apt-inst/contrib/arfile.cc
Simple merge

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

diff --cc debian/changelog
index 9b2004b,cad2238..822c714
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,97 -1,14 +1,104 @@@
 -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)
 +
 +  [ 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)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Sep 2009 17:24:20 +0200
 +
 +apt (0.7.24) UNRELEASED; 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.
 +  * 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.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)
 +
 +  [ 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/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)
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Aug 2009 09:40:08 +0200
 +
 +apt (0.7.23.1) unstable; 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/acquire-item.cc:
 +    - do not segfault on invalid items (closes: #544080)
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 31 Aug 2009 11:08:03 +0200
 + -- Michael Vogt <mvo@debian.org>  Fri, 28 Aug 2009 21:53:20 +0200
  
 -apt (0.7.22.3) UNRELEASED; urgency=low
 +apt (0.7.23) unstable; urgency=low
  
    [ Eugene V. Lyubimkin ]
    * methods/{http,https,ftp}, doc/apt.conf.5.xml: