merged lp:~mvo/apt/hash-order

diff --combined debian/changelog
index ff4988d63e8b40ef0144dfcc591493dbcfb6e530,ef50ea4231569d3b5746fca0c01d78b9a2c4406b..b22712a4f3c0d72fbf0513062a39382ae49e2135
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,8 +1,20 @@@
 -apt (0.9.7.8) UNRELEASED; urgency=low
 +apt (0.9.7.8~exp2) UNRELEASEDexperimental; urgency=low
 +
 +  * include two missing patches to really fix bug #696225, thanks to
 +    Guillem Jover 
++  * ensure sha512 is really used when available, thanks to Tyler Hicks
++   (LP: #1098752)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Mar 2013 18:50:17 +0100
 +
 +apt (0.9.7.8~exp1) experimental; urgency=low
  
    [ Manpages translation updates ]
    * Italian (Beatrice Torracca). Closes: #696601
    
 +  [ Programs translation updates ]
 +  * Japanese (Kenshi Muto). Closes: #699783
 +  
    [ Michael Vogt ]
    * fix pkgProblemResolver::Scores, thanks to Paul Wise. 
      Closes: #697577
@@@ -36,17 -26,9 +38,17 @@@
        (potentially) used for non deb,dsc content that may contain
        spaces, thanks to Daniel Hartwig and Thomas Bushnell 
        (LP: #1086997)
 -  * use sha512 when available (LP: #1098752)
 +    - quote plus in filenames to work around a bug in the S3 server
 +      (LP: #1003633)
 +  * apt-pkg/indexrecords.cc:
 +    - support '\r' in the Release file
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - prefer to install packages which have an already installed M-A:same
 +      sibling while choosing providers (LP: #1130419)
  
 - -- Christian Perrier <bubulle@debian.org>  Mon, 24 Dec 2012 07:01:20 +0100
 + -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 14:16:42 +0100
  
  apt (0.9.7.7) unstable; urgency=low