From: Michael Vogt <egon@debian-devbox>
Date: Fri, 27 Jul 2012 17:18:59 +0000 (+0200)
Subject: merged from david
X-Git-Tag: 0.9.7.3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b9c917bd62e7b1eb227d4f3a7321559ddb96e494

merged from david
---

b9c917bd62e7b1eb227d4f3a7321559ddb96e494
diff --cc configure.in
index e7ef002cc,e7ef002cc..2a768d3d7
--- a/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 a9ef6a967,eb3c39e3e..035d3378a
--- a/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 0cc24a254,0cc24a254..5184cd339
--- a/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">