merged from lp:~mvo/apt/mvo

diff --cc debian/changelog
index 1eeb57ae76ebc833bd5bbbfee9cdd37afd7831df,0f8035a78a7a14c079e2ccc78298b2caafe19b0d..6c2d2175425f7d80e3c7cbe5899d48f7839e21f1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,62 -1,15 +1,70 @@@
- apt (0.8.15.4) unstable; urgency=low
 -apt (0.8.15.2) unstable; urgency=high
++apt (0.8.15.4) UNRELEASEDunstable; urgency=low
  
 -  * fix from David Kalnischkies for the InRelease gpg verification 
 -    code (LP: #784473)
 -  * cmdline/apt-get.cc:
 -    - fix missing download progress in apt-get download
 +  [ David Miller ]
 +  * apt-pkg/contrib/sha1.cc:
 +    - fix illegally casts of on-stack buffer to a type requiring more
 +      alignment than it has resulting in segfaults on sparc (Closes: #634696)
 +
-  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 26 Jul 2011 08:26:53 +0200
++  [ Michael Vogt ]
+   * apt-pkg/contrib/cdromutl.cc:
+     - fix escape problem when looking for the mounted devices
+   * apt-pkg/contrib/strutl.{h,cc}, test/libapt/strutil_test.cc:
+     - add new DeEscapeString() similar to DeQuoteString but
+       unescape character escapes like \0XX and \xXX (plus added
+       test)
++  
++ -- Michael Vogt <mvo@debian.org>  Tue, 26 Jul 2011 11:58:27 +0200
 +
 +apt (0.8.15.3) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - improve error message for a expired Release file
 +  * apt-pkg/algorithms.cc:
 +    - Hold back packages that would enter "policy-broken" state on upgrade
 +      when doing a "apt-get upgrade"
 +  * cmdline/apt-get.cc:
 +    - fix missing download progress in apt-get download
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcachegen.cc:
 +    - fallback to memory if file is not writeable even if access()
 +      told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
 +  * doc/sources.list.5.xml:
 +    - document available [options] for sources.list entries (Closes: 632441)
 +  * doc/apt.conf.5.xml:
 +    - document APT::Architectures list (Closes: #612102)
 +  * cmdline/apt-get.cc:
 +    - restore all important dependencies for garbage packages (LP: #806274)
 +    - do not require unused partial dirs in 'source' (Closes: #633510)
 +    - buildconflicts effect all architectures
 +    - implement MultiarchCross for build-dep and source (Closes: #632221)
 +  * apt-pkg/init.cc:
 +    - use CndSet in pkgInitConfig (Closes: #629617)
 +  * apt-pkg/depcache.cc:
 +    - change default of APT::AutoRemove::SuggestsImportant to true
 +  * cmdline/apt-key:
 +    - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596)
 +  * debian/apt.postinst:
 +    - remove /etc/apt/secring.gpg if it is an empty file
 +  * doc/apt-cache.8.xml:
 +    - apply madison typofix from John Feuerstein, thanks! (Closes: #633455)
 +  * apt-pkg/policy.cc:
 +    - emit an error on unknown APT::Default-Release value (Closes: #407511)
 +  * apt-pkg/aptconfiguration.cc:
 +    - ensure that native architecture is if not specified otherwise the
 +      first architecture in the Architectures vector
 +  * apt-pkg/deb/deblistparser.cc:
 +    - Strip only :any and :native if MultiArch should be stripped as it is
 +      save to ignore them in non-MultiArch contexts but if the dependency
 +      is a specific architecture (and not the native) do not strip
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 25 Jul 2011 15:04:43 +0200
 +
 +apt (0.8.15.2) unstable; urgency=high
 +
 +  * fix from David Kalnischkies for the InRelease gpg verification 
 +    code (LP: #784473)
  
   -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200