From: Michael Vogt <egon@bottom>
Date: Sun, 2 Apr 2006 14:42:36 +0000 (+0200)
Subject: * merged with mainline
X-Git-Tag: 0.7.21~332
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2dafadd9d8b28dbe3d4a489764c67db90e70a29d

* merged with mainline
---

2dafadd9d8b28dbe3d4a489764c67db90e70a29d
diff --cc debian/changelog
index 89322ae31,8e8fda71c..dccf4a99f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,15 @@@
  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
+   * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+   	* bg.po: Added, complete to 512t. Closes: #360262
  
-  -- Michael Vogt <mvo@debian.org>  Sun,  2 Apr 2006 13:05:24 +0200
 -
 - --
++ -- Michael Vogt <mvo@debian.org>  Sun,  2 Apr 2006 16:41:54 +0200
  
  apt (0.6.43.3) unstable; urgency=low