From: Michael Vogt <egon@bottom>
Date: Wed, 26 Apr 2006 10:55:06 +0000 (+0200)
Subject: * merged with mainline
X-Git-Tag: 0.7.21~330
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2268ad65d9f36433f2b3d46e05e8782285641ee3

* merged with mainline
---

2268ad65d9f36433f2b3d46e05e8782285641ee3
diff --cc debian/changelog
index 9a7ee7213,c439f0df5..65dc1e862
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,18 @@@
- apt (0.6.43.4) unstable; urgency=low
+ apt (0.6.44) 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)
+   * apt-pkg/deb/dpkgpm.cc: 
+     - wording fixes (thanks to Matt Zimmerman)
 -    - fix error in dpkg interaction (closes: #364513, 
 -      thanks to Martin Dickopp)
++    - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp)
+   * apt-pkg/tagfile.{cc,h}:
+     - use MMap to read the entries (thanks to Zephaniah E. Hull for the
+       patch) Closes: #350025
    * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
    	* bg.po: Added, complete to 512t. Closes: #360262