From: Michael Vogt <egon@bottom>
Date: Wed, 26 Apr 2006 08:49:28 +0000 (+0200)
Subject: * merged with mainline
X-Git-Tag: 0.7.21~331
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ce95a6f99ffa7bcb225bd9dd28dd73ee77553eb5

* merged with mainline
---

ce95a6f99ffa7bcb225bd9dd28dd73ee77553eb5
diff --cc debian/changelog
index dccf4a99f,fd391c972..9a7ee7213
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,7 +1,12 @@@
  apt (0.6.43.4) unstable; urgency=low
  
    * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
 +  * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 
 +    (thanks to Anthony Towns)
 +  * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations 
 +    (thanks to Anthony Towns)
 +  * apt pdiff support from experimental merged
+   * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
    * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
    	* bg.po: Added, complete to 512t. Closes: #360262