X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/070536e61cb203a9c74013be2a26322b582a9674..e5fefea6ec93746376bf42733ee84a9fafeab764:/apt-pkg/deb/debindexfile.cc

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 37efa05b0..c1c2b726a 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -526,7 +526,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
    if (FileExists(TranslationFile))
    {
      FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension);
-     debListParser TransParser(&Trans);
+     debTranslationsParser TransParser(&Trans);
      if (_error->PendingError() == true)
        return false;
      
@@ -619,7 +619,7 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
    pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
    CFile->Size = Pkg.FileSize();
    CFile->mtime = Pkg.ModificationTime();
-   map_ptrloc const storage = Gen.WriteUniqString("now");
+   map_stringitem_t const storage = Gen.WriteUniqString("now");
    CFile->Archive = storage;
    
    if (Gen.MergeList(Parser) == false)
@@ -692,7 +692,8 @@ bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const
 
    // get the control data out of the deb file vid dpkg -I
    // ... can I haz libdpkg?
-   const char *Args[5] = {"/usr/bin/dpkg",
+   std::string dpkg = _config->Find("Dir::Bin::dpkg","dpkg");
+   const char *Args[5] = {dpkg.c_str(),
                           "-I",
                           DebFile.c_str(),
                           "control",