* [BREAK] add possibility to download and use multiply

  Translation files, configurable with Acquire::Translation
  (Closes: #444222, #448216, #550564)
* Ignore :qualifiers after package name in build dependencies
  for now as long we don't understand them (Closes: #558103)
* apt-pkg/contrib/mmap.{cc,h}:
  - extend it to have a growable flag - unused now but maybe...
* apt-pkg/pkgcache.h:
  - use long instead of short for {Ver,Desc}File size,
    patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
* apt-pkg/acquire-item.cc:
  - allow also to skip the last patch if target is reached,
    thanks Bernhard R. Link! (Closes: #545699)
* ftparchive/writer.{cc,h}:
  - add APT::FTPArchive::AlwaysStat to disable the too aggressive
    caching if versions are build multiply times (not recommend)
    Patch by Christoph Goehre, thanks! (Closes: #463260)

1 files changed, 18 insertions, 9 deletions

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 4a0f3ee58..038bd7ec4 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -22,11 +22,12 @@
 // Include Files							/*{{{*/
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/policy.h>
-#include <apt-pkg/indexfile.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/macros.h>
 
 #include <apti18n.h>
     
@@ -673,14 +674,22 @@ string pkgCache::PkgFileIterator::RelStr()
  */
 pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
 {
-   pkgCache::DescIterator DescDefault = DescriptionList();
-   pkgCache::DescIterator Desc = DescDefault;
-   for (; Desc.end() == false; Desc++)
-      if (pkgIndexFile::LanguageCode() == Desc.LanguageCode())
-	 break;
-   if (Desc.end() == true) 
-      Desc = DescDefault;
-   return Desc;
+   std::vector<string> const lang = APT::Configuration::getLanguages();
+   for (std::vector<string>::const_iterator l = lang.begin();
+	l != lang.end(); l++)
+   {
+      pkgCache::DescIterator DescDefault = DescriptionList();
+      pkgCache::DescIterator Desc = DescDefault;
+
+      for (; Desc.end() == false; Desc++)
+	 if (*l == Desc.LanguageCode())
+	    break;
+      if (Desc.end() == true) 
+	 Desc = DescDefault;
+      return Desc;
+   }
+
+   return DescriptionList();
 };
 
 									/*}}}*/