merged from david

diff --cc configure.in
index e7ef002cc8aa88ba4cbd45634ea8433d4e322ef7,e7ef002cc8aa88ba4cbd45634ea8433d4e322ef7..2a768d3d765c72ab31f2ec49ce9e32876011194e
--- 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)
  
  PACKAGE="apt"
--PACKAGE_VERSION="0.9.7.2"
++PACKAGE_VERSION="0.9.7.3"
  PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --cc debian/changelog
index a9ef6a967d47463db5a57d5ffbf3854628d6cbd2,eb3c39e3e19511c663b1431c0d7f422003445da9..035d3378a0608ef6e33a3e8dce19c5e38f7f6abc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
--apt (0.9.7.3) UNRELEASED; urgency=low
++apt (0.9.7.3) unstable; urgency=low
  
    [ Manpages translation updates ]
    * Spanish; (Omar Campagne). Closes: #681566
@@@ -6,7 -6,22 +6,22 @@@
    [ Program translation updates ]
    * Czech (Miroslav Kure). Closes: #680758
  
-  -- Christian Perrier <bubulle@debian.org>  Sat, 14 Jul 2012 09:47:02 -0600
+   [ David Kalnischkies ]
+   * apt-pkg/cacheset.cc:
+     - handle :all and :native correctly as architectures again
+       in the commandline parsing (regression in 0.9.7)
+   * apt-pkg/packagemanager.cc:
+     - do not segfault if nothing can be configured to statisfy
+       a pre-depends (e.g. in a pre-depends loop) (Closes: #681958)
+   * apt-pkg/contrib/mmap.cc:
+     - trigger the usage of the fallback code for kfreebsd also in the
+       second (filebased) constructor of DynamicMMap (Closes: #677704)
+     - refer to APT::Cache-Start in case the growing failed as if -Limit is
+       really the offender it will be noted in a previous error message.
+     - for filesystems not supporting mmap'ing a file we need to use a
+       SyncToFd dummy just as we did for compressed files in 0.9.5
+ 
 - -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 18 Jul 2012 11:45:57 +0200
++ -- Michael Vogt <mvo@debian.org>  Fri, 27 Jul 2012 17:53:41 +0200
  
  apt (0.9.7.2) unstable; urgency=low
  

diff --cc doc/apt-verbatim.ent
index 0cc24a254d68dffb35ae3d4fbeb5cf9aedbd600e,0cc24a254d68dffb35ae3d4fbeb5cf9aedbd600e..5184cd339be65cad9571a89b58dcde219ce7d4ee
--- 1/doc/apt-verbatim.ent
--- 2/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@@ -213,7 -213,7 +213,7 @@@
  ">
  
  <!-- this will be updated by 'prepare-release' -->
--<!ENTITY apt-product-version "0.9.7.2">
++<!ENTITY apt-product-version "0.9.7.3">
  
  <!-- Codenames for debian releases -->
  <!ENTITY oldstable-codename "lenny">