From 45df0ad2aab7d019cec855ba2cfe7ecdd0f8c7c8 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 26 Nov 2009 22:23:08 +0100
Subject: [BREAK] add possibility to download and use multiply Translation
 files, configurable with Acquire::Languages accessable with
 APT::Configuration::getLanguages() and as always with documentation in
 apt.conf. The commit also includes a very very simple testapp.

---
 apt-pkg/deb/debrecords.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'apt-pkg/deb/debrecords.cc')

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 8ed0bb7eb..5b8538a46 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -11,6 +11,7 @@
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/aptconfiguration.h>
 #include <langinfo.h>
 									/*}}}*/
 
@@ -109,13 +110,18 @@ string debRecordParser::ShortDesc()
 string debRecordParser::LongDesc()
 {
   string orig, dest;
-  char *codeset = nl_langinfo(CODESET);
 
   if (!Section.FindS("Description").empty())
      orig = Section.FindS("Description").c_str();
-  else 
-     orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str();
+  else
+  {
+     vector<string> const lang = APT::Configuration::getLanguages();
+     for (vector<string>::const_iterator l = lang.begin();
+	  orig.empty() && l != lang.end(); l++)
+	orig = Section.FindS(string("Description-").append(*l).c_str());
+  }
 
+  char const * const codeset = nl_langinfo(CODESET);
   if (strcmp(codeset,"UTF-8") != 0) {
      UTF8ToCodeset(codeset, orig, &dest);
      orig = dest;
-- 
cgit v1.2.3


From 63b528a4585d10926a9972663435bc0abc815345 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 5 May 2010 09:54:49 +0200
Subject: * apt-pkg/deb/debrecords.cc:   - fix max tag buffer size (LP:
 #545336, closes: #578959)

---
 apt-pkg/deb/debrecords.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'apt-pkg/deb/debrecords.cc')

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 8ed0bb7eb..57d30dc62 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -19,7 +19,8 @@
 /* */
 debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : 
                   File(FileName,FileFd::ReadOnly), 
-                  Tags(&File,Cache.Head().MaxVerFileSize + 200)
+                  Tags(&File, std::max(Cache.Head().MaxVerFileSize, 
+				       Cache.Head().MaxDescFileSize) + 200)
 {
 }
 									/*}}}*/
-- 
cgit v1.2.3


From c4fc2fd7fa0fc63fd8cd6bc9b73492e6baf0222a Mon Sep 17 00:00:00 2001
From: "martin@piware.de" <>
Date: Thu, 24 Jun 2010 21:27:27 +0200
Subject: Switch FileFd to not transparently gunzip, since that breaks code
 which expects the compressed contents to stay (such as the copy backend, or
 when using file:// repositories. Instead, introduce a new ReadOnlyGzip mode
 and use that where needed

---
 apt-pkg/deb/debrecords.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-pkg/deb/debrecords.cc')

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 34ef0d8f2..ec9e395ef 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -19,7 +19,7 @@
 // ---------------------------------------------------------------------
 /* */
 debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : 
-                  File(FileName,FileFd::ReadOnly), 
+                  File(FileName,FileFd::ReadOnlyGzip), 
                   Tags(&File, std::max(Cache.Head().MaxVerFileSize, 
 				       Cache.Head().MaxDescFileSize) + 200)
 {
-- 
cgit v1.2.3