* [BREAK] merged lp:~mvo/apt/history

[apt.git] / apt-pkg / deb / debrecords.cc

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 2aa47e3436ed9346f331d97609e8bfa387544f01..5b8538a4676676ec1c950bece01578809d7b29af 100644 (file)
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -8,12 +8,10 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/debrecords.h"
-#endif

 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>

+#include <apt-pkg/aptconfiguration.h>

 #include <langinfo.h>
                                                                        /*}}}*/
 
 #include <langinfo.h>
                                                                        /*}}}*/
 


@@ -54,6 +52,14 @@ string debRecordParser::Name()
    return Section.FindS("Package");
 }
                                                                        /*}}}*/
    return Section.FindS("Package");
 }
                                                                        /*}}}*/

+// RecordParser::Homepage - Return the package homepage                        /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::Homepage()
+{
+   return Section.FindS("Homepage");
+}
+                                                                       /*}}}*/

 // RecordParser::MD5Hash - Return the archive hash                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RecordParser::MD5Hash - Return the archive hash                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -70,6 +76,14 @@ string debRecordParser::SHA1Hash()
    return Section.FindS("SHA1");
 }
                                                                        /*}}}*/
    return Section.FindS("SHA1");
 }
                                                                        /*}}}*/

+// RecordParser::SHA1Hash - Return the archive hash                    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SHA256Hash()
+{
+   return Section.FindS("SHA256");
+}
+                                                                       /*}}}*/

 // RecordParser::Maintainer - Return the maintainer email              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RecordParser::Maintainer - Return the maintainer email              /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -96,13 +110,18 @@ string debRecordParser::ShortDesc()
 string debRecordParser::LongDesc()
 {
   string orig, dest;
 string debRecordParser::LongDesc()
 {
   string orig, dest;

-  char *codeset = nl_langinfo(CODESET);

 
   if (!Section.FindS("Description").empty())
      orig = Section.FindS("Description").c_str();
 
   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;
   if (strcmp(codeset,"UTF-8") != 0) {
      UTF8ToCodeset(codeset, orig, &dest);
      orig = dest;