merge with lp:~mvo/apt/debian-sid with the bugfix release 0.7.23.1 in it.

diff --combined configure.in
index bf179ac9d26bc3c3d66d0d7f521bcf322ef813c4,a56544c6aa3e058cdada888ee1841a85218cc6d3..01a98c2cba8ad2a751d8105970faf3bdd53cc8d8
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.7.22.3")
+ AC_DEFINE_UNQUOTED(VERSION,"0.7.23.1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
@@@ -190,12 -190,6 +190,12 @@@ AC_PATH_PROG(DOCBOOK2MAN,docbook2man
  dnl Check for the XML tools needed to build man pages
  AC_PATH_PROG(XMLTO,xmlto)
  
 +dnl Check for the XSLTProc tool needed to build man pages together with po4a
 +AC_PATH_PROG(XSLTPROC,xsltproc)
 +
 +dnl Check for the po4a tool needed to build man pages
 +AC_PATH_PROG(PO4A,po4a)
 +
  dnl Check for graphviz
  AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO])
  AC_PATH_PROG([DOT], [dot], [])

diff --combined debian/changelog
index 10afb5ef96e7f12b1f40c08fdef0e31f516dbf46,ab94570869e34592bcf66ffe519e7da1edabd4a0..550addc9235795e5bb223430e01cf5672fb53790
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,16 +1,39 @@@
 +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
 +
 +  [ 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
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Aug 2009 09:40:08 +0200
 +
+ apt (0.7.23.1) 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/acquire-item.cc:
+     - do not segfault on invalid items (closes: #544080)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 28 Aug 2009 18:53:20 +0200
+ 
  apt (0.7.23) unstable; urgency=low
  
    [ Eugene V. Lyubimkin ]
@@@ -30,7 -20,7 +43,7 @@@
        and '{http,ftp}_proxy' environment variables are used only if options
        mentioned above are not specified.
        (Closes: #445985, #157759, #320184, #365880, #479617)
- 
+   
    [ David Kalnischkies ]
    * cmdline/apt-get.cc:
      - add APT::Get::HideAutoRemove=small to display only a short line