diff options
Diffstat (limited to 'apt-pkg/deb/debrecords.cc')
| -rw-r--r-- | apt-pkg/deb/debrecords.cc | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 518988bb6..6652a6ad9 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -12,9 +12,7 @@ #pragma implementation "apt-pkg/debrecords.h" #endif #include <apt-pkg/debrecords.h> -#include <apt-pkg/strutl.h> #include <apt-pkg/error.h> -#include <langinfo.h> /*}}}*/ // RecordParser::debRecordParser - Constructor /*{{{*/ @@ -33,10 +31,6 @@ bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver) { return Tags.Jump(Section,Ver->Offset); } -bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc) -{ - return Tags.Jump(Section,Desc->Offset); -} /*}}}*/ // RecordParser::FileName - Return the archive filename on the site /*{{{*/ // --------------------------------------------------------------------- @@ -83,7 +77,7 @@ string debRecordParser::Maintainer() /* */ string debRecordParser::ShortDesc() { - string Res = LongDesc(); + string Res = Section.FindS("Description"); string::size_type Pos = Res.find('\n'); if (Pos == string::npos) return Res; @@ -95,20 +89,7 @@ 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(); - - if (strcmp(codeset,"UTF-8") != 0) { - UTF8ToCodeset(codeset, orig, &dest); - orig = dest; - } - - return orig; + return Section.FindS("Description"); } /*}}}*/ // RecordParser::SourcePkg - Return the source package name if any /*{{{*/ |