From: Michael Vogt <egon@bottom>
Date: Fri, 1 Dec 2006 13:36:26 +0000 (+0100)
Subject: * merged from main
X-Git-Tag: 0.7.21~293
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6cc61a167355711ef3494ce807d5ab24c63eae3f?hp=ec759a799176881468b85f14c37d3964e199effb

* merged from main
---

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 17645a5ac..e1c6427e8 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -36,7 +36,7 @@ const char **debSrcRecordParser::Binaries()
    if (Bins.empty() == true || Bins.length() >= 102400)
       return 0;
    
-   if (Bins.length() > BufSize)
+   if (Bins.length() >= BufSize)
    {
       delete [] Buffer;
       // allocate new size based on buffer (but never smaller than 4000)
diff --git a/debian/changelog b/debian/changelog
index 1236aa5af..c83d5e350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,11 @@ apt (0.6.46.4) unstable; urgency=low
     - added "Dpkg::StopOnError" variable that controls if apt
       will abort on errors from dpkg
   * apt-pkg/deb/debsrcrecords.{cc,h}:
-    - make the Buffer dynmaic
+    - make the Buffer grow dynmaically (closes: #400874)
+  * Merged from Christian Perrier bzr branch:
+    - uk.po: New Ukrainian translation: 483t28f3u
+    - el.po: Update to 503t9f2u
+    - de.po: Updates and corrections.
 
  --