merged from lp:~mvo/apt/mvo

diff --cc debian/changelog
index 8797117a7209dc27bfaaa862af4fc902d208b43a,e17b1abd01b37e6c770c52b3083b2f39b054c06a..75ac0832821f6b91474bf9a58d90ee28c86943c7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,19 +1,20 @@@
 -apt (0.8.15.6) unstable; urgency=low
++apt (0.8.15.5.6) UNRELEASED; urgency=low
+ 
+   * apt-pkg/contrib/fileutl.{cc,h}:
+     - add GetModificationTime() helper
+   * apt-pkg/pkgcachegen.cc:
+     - regenerate the cache if the sources.list changes to ensure
+       that changes in the ordering there will be honored by apt
+   * apt-pkg/sourcelist.{cc,h}:
+     - add pkgSourceList::GetLastModifiedTime() helper
+   * apt-pkg/pkgcachegen.{cc,h}:
+     - use ref-to-ptr semantic in NewDepends() to ensure that the   
+       libapt does not segfault if the cache is remapped in between
+       (LP: #812862)
++    - fix crash when P.Arch() was used but the cache got remapped
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
+ 
  apt (0.8.15.5) unstable; urgency=low
  
    [ David Kalnischkies ]