From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Jun 2011 11:45:30 +0000 (+0100)
Subject: merge lp:~mvo/apt/abi-break
X-Git-Tag: 0.9.0~91
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/9abccf4a63b6c887b213678d940fe912233f04c3?hp=-c

merge lp:~mvo/apt/abi-break
---

9abccf4a63b6c887b213678d940fe912233f04c3
diff --combined apt-inst/makefile
index 785dc62ba,785dc62ba..32d231240
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@@ -14,7 -14,7 +14,7 @@@ include ../buildlib/libversion.ma
  
  # The library name
  LIBRARY=apt-inst
--MAJOR=1.2
++MAJOR=1.3
  MINOR=0
  SLIBS=$(PTHREADLIB) -lapt-pkg
  APT_DOMAIN:=libapt-inst$(MAJOR)
diff --combined apt-pkg/acquire-item.cc
index c3817f6ee,36abe0ac3..d790bd898
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@@ -271,14 -271,6 +271,14 @@@ void pkgAcqSubIndex::Done(string Messag
  
     string FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(Desc.URI);
  
 +   /* Downloaded invalid transindex => Error (LP: #346386) (Closes: #627642) */
 +   indexRecords SubIndexParser;
 +   if (FileExists(DestFile) == true && !SubIndexParser.Load(DestFile)) {
 +      Status = StatError;
 +      ErrorText = SubIndexParser.ErrorText;
 +      return;
 +   }
 +
     // sucess in downloading the index
     // rename the index
     if(Debug)
@@@ -902,30 -894,6 +902,30 @@@ void pkgAcqIndex::Done(string Message,u
  	 ReportMirrorFailure("HashChecksumFailure");
           return;
        }
 +
 +      /* Verify the index file for correctness (all indexes must
 +       * have a Package field) (LP: #346386) (Closes: #627642) */
 +      {
 +	 FileFd fd(DestFile, FileFd::ReadOnly);
 +	 pkgTagSection sec;
 +	 pkgTagFile tag(&fd);
 +
 +         // Only test for correctness if the file is not empty (empty is ok)
 +         if (fd.Size() > 0) {
 +            if (_error->PendingError() || !tag.Step(sec)) {
 +               Status = StatError;
 +               _error->DumpErrors();
 +               Rename(DestFile,DestFile + ".FAILED");
 +               return;
 +            } else if (!sec.Exists("Package")) {
 +               Status = StatError;
 +               ErrorText = ("Encountered a section with no Package: header");
 +               Rename(DestFile,DestFile + ".FAILED");
 +               return;
 +            }
 +         }
 +      }
 +       
        // Done, move it into position
        string FinalFile = _config->FindDir("Dir::State::lists");
        FinalFile += URItoFileName(RealURI);
@@@ -1362,16 -1330,6 +1362,16 @@@ void pkgAcqMetaIndex::AuthDone(string M
  									/*}}}*/
  void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
  {
 +#if 0
 +   /* Reject invalid, existing Release files (LP: #346386) (Closes: #627642)
 +    * FIXME: Disabled; it breaks unsigned repositories without hashes */
 +   if (!verify && FileExists(DestFile) && !MetaIndexParser->Load(DestFile))
 +   {
 +      Status = StatError;
 +      ErrorText = MetaIndexParser->ErrorText;
 +      return;
 +   }
 +#endif
     for (vector <struct IndexTarget*>::const_iterator Target = IndexTargets->begin();
          Target != IndexTargets->end();
          Target++)
@@@ -1535,12 -1493,6 +1535,12 @@@ void pkgAcqMetaIndex::Failed(string Mes
  			 LookupTag(Message,"Message").c_str());
  	 RunScripts("APT::Update::Auth-Failure");
  	 return;
 +      } else if (LookupTag(Message,"Message").find("NODATA") != string::npos) {
 +	 /* Invalid signature file, reject (LP: #346386) (Closes: #627642) */
 +	 _error->Error(_("GPG error: %s: %s"),
 +			 Desc.Description.c_str(),
 +			 LookupTag(Message,"Message").c_str());
 +	 return;
        } else {
  	 _error->Warning(_("GPG error: %s: %s"),
  			 Desc.Description.c_str(),
@@@ -1730,6 -1682,8 +1730,8 @@@ bool pkgAcqArchive::QueueNext(
        string PkgFile = Parse.FileName();
        if (ForceHash.empty() == false)
        {
+ 	 if(stringcasecmp(ForceHash, "sha512") == 0)
+ 	    ExpectedHash = HashString("SHA512", Parse.SHA512Hash());
  	 if(stringcasecmp(ForceHash, "sha256") == 0)
  	    ExpectedHash = HashString("SHA256", Parse.SHA256Hash());
  	 else if (stringcasecmp(ForceHash, "sha1") == 0)
@@@ -1740,7 -1694,9 +1742,9 @@@
        else
        {
  	 string Hash;
- 	 if ((Hash = Parse.SHA256Hash()).empty() == false)
+ 	 if ((Hash = Parse.SHA512Hash()).empty() == false)
+ 	    ExpectedHash = HashString("SHA512", Hash);
+ 	 else if ((Hash = Parse.SHA256Hash()).empty() == false)
  	    ExpectedHash = HashString("SHA256", Hash);
  	 else if ((Hash = Parse.SHA1Hash()).empty() == false)
  	    ExpectedHash = HashString("SHA1", Hash);
diff --combined apt-pkg/deb/deblistparser.cc
index 9ae1065a4,a94b79f05..b708296d3
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@@ -128,12 -128,7 +128,7 @@@ bool debListParser::NewVersion(pkgCache
     }
  
     if (ArchitectureAll() == true)
-       switch (Ver->MultiArch)
-       {
- 	 case pkgCache::Version::Foreign: Ver->MultiArch = pkgCache::Version::AllForeign; break;
- 	 case pkgCache::Version::Allowed: Ver->MultiArch = pkgCache::Version::AllAllowed; break;
- 	 default: Ver->MultiArch = pkgCache::Version::All;
-       }
+       Ver->MultiArch |= pkgCache::Version::All;
  
     // Archive Size
     Ver->Size = Section.FindULL("Size");
@@@ -201,7 -196,7 +196,7 @@@ string debListParser::DescriptionLangua
     if (Section.FindS("Description").empty() == false)
        return "";
  
 -   std::vector<string> const lang = APT::Configuration::getLanguages();
 +   std::vector<string> const lang = APT::Configuration::getLanguages(true);
     for (std::vector<string>::const_iterator l = lang.begin();
  	l != lang.end(); l++)
        if (Section.FindS(string("Description-").append(*l).c_str()).empty() == false)
@@@ -687,12 -682,12 +682,12 @@@ bool debListParser::ParseProvides(pkgCa
  
     if (MultiArchEnabled == false)
        return true;
-    else if (Ver->MultiArch == pkgCache::Version::Allowed || Ver->MultiArch == pkgCache::Version::AllAllowed)
+    else if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
     {
        string const Package = string(Ver.ParentPkg().Name()).append(":").append("any");
        return NewProvidesAllArch(Ver, Package, Ver.VerStr());
     }
-    else if (Ver->MultiArch == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::AllForeign)
+    else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
        return NewProvidesAllArch(Ver, Ver.ParentPkg().Name(), Ver.VerStr());
  
     return true;
diff --combined apt-pkg/deb/dpkgpm.cc
index 5fbd1801a,cd7c4e5d5..019b72bb8
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -14,8 -14,8 +14,8 @@@
  #include <apt-pkg/depcache.h>
  #include <apt-pkg/pkgrecords.h>
  #include <apt-pkg/strutl.h>
 -#include <apti18n.h>
  #include <apt-pkg/fileutl.h>
 +#include <apt-pkg/cachefile.h>
  
  #include <unistd.h>
  #include <stdlib.h>
@@@ -32,8 -32,6 +32,8 @@@
  #include <algorithm>
  #include <sstream>
  #include <map>
 +#include <pwd.h>
 +#include <grp.h>
  
  #include <termios.h>
  #include <unistd.h>
@@@ -46,6 -44,21 +46,21 @@@
  
  using namespace std;
  
+ class pkgDPkgPMPrivate 
+ {
+ public:
+    pkgDPkgPMPrivate() : dpkgbuf_pos(0), term_out(NULL), history_out(NULL)
+    {
+    }
+    bool stdin_is_dev_null;
+    // the buffer we use for the dpkg status-fd reading
+    char dpkgbuf[1024];
+    int dpkgbuf_pos;
+    FILE *term_out;
+    FILE *history_out;
+    string dpkg_error;
+ };
+ 
  namespace
  {
    // Maps the dpkg "processing" info to human readable names.  Entry 0
@@@ -110,9 -123,9 +125,9 @@@ ionice(int PID
  // ---------------------------------------------------------------------
  /* */
  pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
-    : pkgPackageManager(Cache), dpkgbuf_pos(0),
-      term_out(NULL), history_out(NULL), PackagesDone(0), PackagesTotal(0)
+    : pkgPackageManager(Cache), PackagesDone(0), PackagesTotal(0)
  {
+    d = new pkgDPkgPMPrivate();
  }
  									/*}}}*/
  // DPkgPM::pkgDPkgPM - Destructor					/*{{{*/
@@@ -120,6 -133,7 +135,7 @@@
  /* */
  pkgDPkgPM::~pkgDPkgPM()
  {
+    delete d;
  }
  									/*}}}*/
  // DPkgPM::Install - Install a package					/*{{{*/
@@@ -376,7 -390,7 +392,7 @@@ void pkgDPkgPM::DoStdin(int master
     if (len)
        write(master, input_buf, len);
     else
-       stdin_is_dev_null = true;
+       d->stdin_is_dev_null = true;
  }
  									/*}}}*/
  // DPkgPM::DoTerminalPty - Read the terminal pty and write log		/*{{{*/
@@@ -401,8 -415,8 +417,8 @@@ void pkgDPkgPM::DoTerminalPty(int maste
     if(len <= 0) 
        return;
     write(1, term_buf, len);
-    if(term_out)
-       fwrite(term_buf, len, sizeof(char), term_out);
+    if(d->term_out)
+       fwrite(term_buf, len, sizeof(char), d->term_out);
  }
  									/*}}}*/
  // DPkgPM::ProcessDpkgStatusBuf                                        	/*{{{*/
@@@ -606,14 -620,14 +622,14 @@@ void pkgDPkgPM::DoDpkgStatusFd(int stat
     char *p, *q;
     int len;
  
-    len=read(statusfd, &dpkgbuf[dpkgbuf_pos], sizeof(dpkgbuf)-dpkgbuf_pos);
-    dpkgbuf_pos += len;
+    len=read(statusfd, &d->dpkgbuf[d->dpkgbuf_pos], sizeof(d->dpkgbuf)-d->dpkgbuf_pos);
+    d->dpkgbuf_pos += len;
     if(len <= 0)
        return;
  
     // process line by line if we have a buffer
-    p = q = dpkgbuf;
-    while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL)
+    p = q = d->dpkgbuf;
+    while((q=(char*)memchr(p, '\n', d->dpkgbuf+d->dpkgbuf_pos-p)) != NULL)
     {
        *q = 0;
        ProcessDpkgStatusLine(OutStatusFd, p);
@@@ -621,8 -635,8 +637,8 @@@
     }
  
     // now move the unprocessed bits (after the final \n that is now a 0x0) 
-    // to the start and update dpkgbuf_pos
-    p = (char*)memrchr(dpkgbuf, 0, dpkgbuf_pos);
+    // to the start and update d->dpkgbuf_pos
+    p = (char*)memrchr(d->dpkgbuf, 0, d->dpkgbuf_pos);
     if(p == NULL)
        return;
  
@@@ -630,8 -644,8 +646,8 @@@
     p++;
  
     // move the unprocessed tail to the start and update pos
-    memmove(dpkgbuf, p, p-dpkgbuf);
-    dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p;
+    memmove(d->dpkgbuf, p, p-d->dpkgbuf);
+    d->dpkgbuf_pos = d->dpkgbuf+d->dpkgbuf_pos-p;
  }
  									/*}}}*/
  // DPkgPM::WriteHistoryTag						/*{{{*/
@@@ -643,7 -657,7 +659,7 @@@ void pkgDPkgPM::WriteHistoryTag(string 
     // poor mans rstrip(", ")
     if (value[length-2] == ',' && value[length-1] == ' ')
        value.erase(length - 2, 2);
-    fprintf(history_out, "%s: %s\n", tag.c_str(), value.c_str());
+    fprintf(d->history_out, "%s: %s\n", tag.c_str(), value.c_str());
  }									/*}}}*/
  // DPkgPM::OpenLog							/*{{{*/
  bool pkgDPkgPM::OpenLog()
@@@ -664,19 -678,13 +680,19 @@@
  				   _config->Find("Dir::Log::Terminal"));
     if (!logfile_name.empty())
     {
-       term_out = fopen(logfile_name.c_str(),"a");
-       if (term_out == NULL)
+       d->term_out = fopen(logfile_name.c_str(),"a");
+       if (d->term_out == NULL)
  	 return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
-       setvbuf(term_out, NULL, _IONBF, 0);
-       SetCloseExec(fileno(term_out), true);
+       setvbuf(d->term_out, NULL, _IONBF, 0);
+       SetCloseExec(fileno(d->term_out), true);
 -      chmod(logfile_name.c_str(), 0600);
 +      struct passwd *pw;
 +      struct group *gr;
 +      pw = getpwnam("root");
 +      gr = getgrnam("adm");
 +      if (pw != NULL && gr != NULL)
 +	  chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid);
 +      chmod(logfile_name.c_str(), 0644);
-       fprintf(term_out, "\nLog started: %s\n", timestr);
+       fprintf(d->term_out, "\nLog started: %s\n", timestr);
     }
  
     // write your history
@@@ -684,52 -692,41 +700,52 @@@
  				   _config->Find("Dir::Log::History"));
     if (!history_name.empty())
     {
-       history_out = fopen(history_name.c_str(),"a");
-       if (history_out == NULL)
+       d->history_out = fopen(history_name.c_str(),"a");
+       if (d->history_out == NULL)
  	 return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
        chmod(history_name.c_str(), 0644);
-       fprintf(history_out, "\nStart-Date: %s\n", timestr);
+       fprintf(d->history_out, "\nStart-Date: %s\n", timestr);
 -      string remove, purge, install, upgrade, downgrade;
 +      string remove, purge, install, reinstall, upgrade, downgrade;
        for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
        {
 -	 if (Cache[I].NewInstall())
 -	 {
 -	    install += I.FullName(false) + string(" (") + Cache[I].CandVersion;
 -	    if (Cache[I].Flags & pkgCache::Flag::Auto)
 -	       install+= ", automatic";
 -	    install += string("), ");
 -	 }
 -	 else if (Cache[I].Upgrade())
 -	    upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
 -	 else if (Cache[I].Downgrade())
 -	    downgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
 -	 else if (Cache[I].Delete())
 -	 {
 -	    if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge)
 -	       purge += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), ");	    
 -	    else
 -	       remove += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), ");	    
 +	 enum { CANDIDATE, CANDIDATE_AUTO, CURRENT_CANDIDATE, CURRENT } infostring;
 +	 string *line = NULL;
 +	 #define HISTORYINFO(X, Y) { line = &X; infostring = Y; }
 +	 if (Cache[I].NewInstall() == true)
 +	    HISTORYINFO(install, CANDIDATE_AUTO)
 +	 else if (Cache[I].ReInstall() == true)
 +	    HISTORYINFO(reinstall, CANDIDATE)
 +	 else if (Cache[I].Upgrade() == true)
 +	    HISTORYINFO(upgrade, CURRENT_CANDIDATE)
 +	 else if (Cache[I].Downgrade() == true)
 +	    HISTORYINFO(downgrade, CURRENT_CANDIDATE)
 +	 else if (Cache[I].Delete() == true)
 +	    HISTORYINFO((Cache[I].Purge() ? purge : remove), CURRENT)
 +	 else
 +	    continue;
 +	 #undef HISTORYINFO
 +	 line->append(I.FullName(false)).append(" (");
 +	 switch (infostring) {
 +	 case CANDIDATE: line->append(Cache[I].CandVersion); break;
 +	 case CANDIDATE_AUTO:
 +	    line->append(Cache[I].CandVersion);
 +	    if ((Cache[I].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto)
 +	       line->append(", automatic");
 +	    break;
 +	 case CURRENT_CANDIDATE: line->append(Cache[I].CurVersion).append(", ").append(Cache[I].CandVersion); break;
 +	 case CURRENT: line->append(Cache[I].CurVersion); break;
  	 }
 +	 line->append("), ");
        }
        if (_config->Exists("Commandline::AsString") == true)
  	 WriteHistoryTag("Commandline", _config->Find("Commandline::AsString"));
        WriteHistoryTag("Install", install);
 +      WriteHistoryTag("Reinstall", reinstall);
        WriteHistoryTag("Upgrade", upgrade);
        WriteHistoryTag("Downgrade",downgrade);
        WriteHistoryTag("Remove",remove);
        WriteHistoryTag("Purge",purge);
-       fflush(history_out);
+       fflush(d->history_out);
     }
     
     return true;
@@@ -743,16 -740,16 +759,16 @@@ bool pkgDPkgPM::CloseLog(
     struct tm *tmp = localtime(&t);
     strftime(timestr, sizeof(timestr), "%F  %T", tmp);
  
-    if(term_out)
+    if(d->term_out)
     {
-       fprintf(term_out, "Log ended: ");
-       fprintf(term_out, "%s", timestr);
-       fprintf(term_out, "\n");
-       fclose(term_out);
+       fprintf(d->term_out, "Log ended: ");
+       fprintf(d->term_out, "%s", timestr);
+       fprintf(d->term_out, "\n");
+       fclose(d->term_out);
     }
-    term_out = NULL;
+    d->term_out = NULL;
  
-    if(history_out)
+    if(d->history_out)
     {
        if (disappearedPkgs.empty() == false)
        {
@@@ -769,12 -766,12 +785,12 @@@
  	 }
  	 WriteHistoryTag("Disappeared", disappear);
        }
-       if (dpkg_error.empty() == false)
- 	 fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
-       fprintf(history_out, "End-Date: %s\n", timestr);
-       fclose(history_out);
+       if (d->dpkg_error.empty() == false)
+ 	 fprintf(d->history_out, "Error: %s\n", d->dpkg_error.c_str());
+       fprintf(d->history_out, "End-Date: %s\n", timestr);
+       fclose(d->history_out);
     }
-    history_out = NULL;
+    d->history_out = NULL;
  
     return true;
  }
@@@ -882,7 -879,7 +898,7 @@@ bool pkgDPkgPM::Go(int OutStatusFd
        }
     }
  
-    stdin_is_dev_null = false;
+    d->stdin_is_dev_null = false;
  
     // create log
     OpenLog();
@@@ -1082,8 -1079,8 +1098,8 @@@
  	    const char *s = _("Can not write log, openpty() "
  	                      "failed (/dev/pts not mounted?)\n");
  	    fprintf(stderr, "%s",s);
-             if(term_out)
-               fprintf(term_out, "%s",s);
+             if(d->term_out)
+               fprintf(d->term_out, "%s",s);
  	    master = slave = -1;
  	 }  else {
  	    struct termios rtt;
@@@ -1213,7 -1210,7 +1229,7 @@@
  
  	 // wait for input or output here
  	 FD_ZERO(&rfds);
- 	 if (master >= 0 && !stdin_is_dev_null)
+ 	 if (master >= 0 && !d->stdin_is_dev_null)
  	    FD_SET(0, &rfds); 
  	 FD_SET(_dpkgin, &rfds);
  	 if(master >= 0)
@@@ -1267,14 -1264,14 +1283,14 @@@
  	    RunScripts("DPkg::Post-Invoke");
  
  	 if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
- 	    strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
+ 	    strprintf(d->dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
  	 else if (WIFEXITED(Status) != 0)
- 	    strprintf(dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
+ 	    strprintf(d->dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
  	 else 
- 	    strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
+ 	    strprintf(d->dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
  
- 	 if(dpkg_error.size() > 0)
- 	    _error->Error("%s", dpkg_error.c_str());
+ 	 if(d->dpkg_error.size() > 0)
+ 	    _error->Error("%s", d->dpkg_error.c_str());
  
  	 if(stopOnError) 
  	 {
@@@ -1288,23 -1285,6 +1304,23 @@@
     if (RunScripts("DPkg::Post-Invoke") == false)
        return false;
  
 +   if (_config->FindB("Debug::pkgDPkgPM",false) == false)
 +   {
 +      std::string const oldpkgcache = _config->FindFile("Dir::cache::pkgcache");
 +      if (oldpkgcache.empty() == false && RealFileExists(oldpkgcache) == true &&
 +	  unlink(oldpkgcache.c_str()) == 0)
 +      {
 +	 std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache");
 +	 if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true)
 +	 {
 +	    _error->PushToStack();
 +	    pkgCacheFile CacheFile;
 +	    CacheFile.BuildCaches(NULL, true);
 +	    _error->RevertToStack();
 +	 }
 +      }
 +   }
 +
     Cache.writeStateFile(NULL);
     return true;
  }
@@@ -1438,8 -1418,8 +1454,8 @@@ void pkgDPkgPM::WriteApportReport(cons
     fprintf(report, "ErrorMessage:\n %s\n", errormsg);
  
     // ensure that the log is flushed
-    if(term_out)
-       fflush(term_out);
+    if(d->term_out)
+       fflush(d->term_out);
  
     // attach terminal log it if we have it
     string logfile_name = _config->FindFile("Dir::Log::Terminal");
diff --combined apt-pkg/depcache.h
index 9efe110f5,2942558b0..adc010c28
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@@ -231,8 -231,8 +231,9 @@@ class pkgDepCache : protected pkgCache:
        // Various test members for the current status of the package
        inline bool NewInstall() const {return Status == 2 && Mode == ModeInstall;};
        inline bool Delete() const {return Mode == ModeDelete;};
 +      inline bool Purge() const {return Delete() == true && (iFlags & pkgDepCache::Purge) == pkgDepCache::Purge; };
        inline bool Keep() const {return Mode == ModeKeep;};
+       inline bool Protect() const {return (iFlags & Protected) == Protected;};
        inline bool Upgrade() const {return Status > 0 && Mode == ModeInstall;};
        inline bool Upgradable() const {return Status >= 1;};
        inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;};
@@@ -242,7 -242,6 +243,7 @@@
        inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;};
        inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;};
        inline bool Install() const {return Mode == ModeInstall;};
 +      inline bool ReInstall() const {return Delete() == false && (iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall;};
        inline VerIterator InstVerIter(pkgCache &Cache)
                  {return VerIterator(Cache,InstallVer);};
        inline VerIterator CandidateVerIter(pkgCache &Cache)
@@@ -260,7 -259,9 +261,9 @@@
        
        virtual VerIterator GetCandidateVer(PkgIterator const &Pkg);
        virtual bool IsImportantDep(DepIterator const &Dep);
-       
+       virtual signed short GetPriority(PkgIterator const &Pkg);
+       virtual signed short GetPriority(PkgFileIterator const &File);
+ 
        virtual ~Policy() {};
     };
  
@@@ -315,11 -316,10 +318,10 @@@
     void Update(PkgIterator const &P);
     
     // Count manipulators
-    void AddSizes(const PkgIterator &Pkg, bool const &Invert = false);
+    void AddSizes(const PkgIterator &Pkg, bool const Invert = false);
     inline void RemoveSizes(const PkgIterator &Pkg) {AddSizes(Pkg, true);};
-    void AddSizes(const PkgIterator &Pkg,signed long Mult) __deprecated;
-    void AddStates(const PkgIterator &Pkg,int Add = 1);
-    inline void RemoveStates(const PkgIterator &Pkg) {AddStates(Pkg,-1);};
+    void AddStates(const PkgIterator &Pkg, bool const Invert = false);
+    inline void RemoveStates(const PkgIterator &Pkg) {AddStates(Pkg,true);};
     
     public:
  
@@@ -388,18 -388,17 +390,17 @@@
     /** \name State Manipulators
      */
     // @{
-    void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
+    bool MarkKeep(PkgIterator const &Pkg, bool Soft = false,
  		 bool FromUser = true, unsigned long Depth = 0);
-    void MarkDelete(PkgIterator const &Pkg, bool Purge = false,
+    bool MarkDelete(PkgIterator const &Pkg, bool Purge = false,
                     unsigned long Depth = 0, bool FromUser = true);
-    void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
+    bool MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
  		    unsigned long Depth = 0, bool FromUser = true,
  		    bool ForceImportantDeps = false);
     void MarkProtected(PkgIterator const &Pkg) { PkgState[Pkg->ID].iFlags |= Protected; };
  
     void SetReInstall(PkgIterator const &Pkg,bool To);
-    // FIXME: Remove the unused boolean parameter on abi break
-    void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = true);
+    void SetCandidateVersion(VerIterator TargetVer);
     bool SetCandidateRelease(pkgCache::VerIterator TargetVer,
  				std::string const &TargetRel);
     /** Set the candidate version for dependencies too if needed.
@@@ -484,13 -483,6 +485,6 @@@
     virtual ~pkgDepCache();
  
     private:
-    // Helper for Update(OpProgress) to remove pseudoinstalled arch all packages
-    // FIXME: they are private so shouldn't affect abi, but just in case…
-    __deprecated bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<unsigned long> &recheck) { return true; };
-    __deprecated bool ReInstallPseudoForGroup(unsigned long const &Grp, std::set<unsigned long> &recheck) { return true; };
-    __deprecated bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P, std::set<unsigned long> &recheck) { return true; };
- 
- 
     bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
  			unsigned long const Depth, bool const FromUser);
  };
diff --combined apt-pkg/init.cc
index 31b2d9ccd,aff585e3b..66b0119e6
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -72,7 -72,9 +72,9 @@@ bool pkgInitConfig(Configuration &Cnf
     Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
     Cnf.Set("Dir::Etc::trusted", "trusted.gpg");
     Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d");
+ 
     Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
+    Cnf.Set("Dir::Bin::solvers::","/usr/lib/apt/solvers");
     Cnf.Set("Dir::Media::MountPath","/media/apt");
  
     // State   
@@@ -85,6 -87,9 +87,6 @@@
     Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
     Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
  
 -   // Translation
 -   Cnf.Set("APT::Acquire::Translation", "environment");
 -
     // Default cdrom mount point
     Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/");
  
diff --combined apt-pkg/init.h
index 15a1165b9,15a1165b9..6b92dd200
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@@ -22,8 -22,8 +22,8 @@@
  // Non-ABI-Breaks should only increase RELEASE number.
  // See also buildlib/libversion.mak
  #define APT_PKG_MAJOR 4
--#define APT_PKG_MINOR 10
--#define APT_PKG_RELEASE 1
++#define APT_PKG_MINOR 11
++#define APT_PKG_RELEASE 0
      
  extern const char *pkgVersion;
  extern const char *pkgLibVersion;
diff --combined debian/changelog
index a62003a0e,999417bff..701f03252
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,222 -1,111 +1,331 @@@
 -apt (0.8.15) UNRELEASED; urgency=low
++apt (0.8.16~exp2) UNRELEASEDexperimental; urgency=low
+ 
+   [ David Kalnischkies ]
+   * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
+     use the internal resolver can now be used also with external
+     ones as the usage is hidden in between the old API
+   * provide two edsp solvers in apt-utils:
+     - 'dump' to quickly output a complete scenario and
+     - 'apt' to use the internal as an external resolver
+   * apt-pkg/pkgcache.h:
+     - clean up mess with the "all" handling in MultiArch to
+       fix LP: #733741 cleanly for everyone now
+   * apt-pkg/depcache.cc:
+     - use a boolean instead of an int for Add/Remove in AddStates
+       similar to how it works with AddSizes
+     - let the Mark methods return if their marking was successful
+     - if a Breaks can't be upgraded, remove it. If it or a Conflict
+       can't be removed the installation of the breaker fails.
+   * cmdline/apt-get.cc:
+     - do not discard the error messages from the resolver and instead
+       only show the general 'Broken packages' message if nothing else
+ 
+   [ Stefano Zacchiroli ]
+   * doc/external-dependency-solver-protocol.txt:
+     - describe EDSP and the configuration interface around it
+   
+   [ Michael Vogt ]
+   * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
+   * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
+     without breaking the ABI
++  * increase ABI version and update package names
+ 
 - -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 17 May 2011 18:43:21 +0200
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 29 Jun 2011 12:26:54 +0100
++
 +apt (0.8.16~exp1) experimental; urgency=low
 +
 +  * merged with the debian/unstable upload
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
 +
 +apt (0.8.15) unstable; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/depcache.cc:
 +    - Really release action groups only once (Closes: #622744)
 +    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
 +  * apt-pkg/acquire-item.cc:
 +    - Reject files known to be invalid (LP: #346386) (Closes: #627642)
 +  * debian/apt.cron.daily:
 +    - Check power after wait, patch by manuel-soto (LP: #705269)
 +  * debian/control:
 +    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
 +      unpacked if a library is too old and thus break upgrades
 +  * doc/apt-key.8.xml:
 +    - Document apt-key net-update (LP: #192810)
 +
 +  [ Christian Perrier ]
 +  * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
 +  * Italian translation update (Milo Casagrande). Closes: #627834
 +  * German documentation translation update (Chris Leick). Closes: #629949
 +  * Catalan translation update (Jordi Mallach). Closes: #630657
 +
 +  [ David Kalnischkies ]
 +  * fix a bunch of cppcheck warnings/errors based on a patch by
 +    Niels Thykier, thanks! (Closes: #622805)
 +  * apt-pkg/depcache.cc:
 +    - really include 'rc' packages in the delete count by fixing a
 +      typo which exists since 1999 in the source… (LP: #761175)
 +    - if critical or-group can't be satisfied, exit directly.
 +  * apt-pkg/acquire-method.cc:
 +    - write directly to stdout instead of creating the message in
 +      memory first before writing to avoid hitting limits
 +    - fix order of CurrentURI and UsedMirror in Status() and Log()
 +  * apt-pkg/orderlist.cc:
 +    - let VisitRProvides report if the calls were successful
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - replace obsolete usleep with nanosleep
 +    - remove invalid pkgcache.bin and rebuild it if possible
 +    - log reinstall commands in history.log
 +  * debian/apt{,-utils}.symbols:
 +    - update both experimental symbol-files to reflect 0.8.14 state
 +  * debian/rules:
 +    - remove unused embedded jquery by doxygen from libapt-pkg-doc
 +  * cmdline/apt-mark.cc:
 +    - reimplement apt-mark in c++
 +    - provide a 'showmanual' command (Closes: #582791)
 +    - provide a 'dpkg --set-selections' wrapper to set/release holds
 +  * cmdline/apt-get.cc:
 +    - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
 +  * cmdline/apt-cache.cc:
 +    - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
 +  * apt-pkg/pkgcache.cc:
 +    - really ignore :arch in FindPkg() in non-multiarch environment
 +  * doc/po/de.po:
 +    - undo the translation of the command 'dump' in manpage of apt-config
 +      as report by Burghard Grossmann on debian-l10n-german, thanks!
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - do not download TranslationIndex if no Translation-* will be
 +      downloaded later on anyway (Closes: #624218)
 +  * test/versions.lst:
 +    - disable obscure version number tests with versions dpkg doesn't
 +      allow any more as they don't start with a number
 +  * apt-pkg/acquire-worker.cc:
 +    - print filename in the unmatching size warning (Closes: #623137)
 +  * apt-pkg/acquire-item.cc:
 +    - apply fix for poorly worded 'locate file' error message from
 +      Ben Finney, thanks! (Closes: #623171)
 +  * methods/http.cc:
 +    - add config option to ignore a closed stdin to be able to easily
 +      use the method as a simple standalone downloader
 +    - Location header in redirects should be absolute URI, but some
 +      servers just send an absolute path so still deal with it properly
 +    - dequote URL taken from Location in redirects as we will otherwise
 +      quote an already quoted string in the request later (Closes: #602412)
 +  * apt-pkg/contrib/netrc.cc:
 +    - replace non-posix gnu-extension strdupa with strdup
 +  * apt-pkg/packagemanager.cc:
 +    - ensure for Multi-Arch:same packages that they are unpacked in
 +      lock step even in immediate configuration (Closes: #618288)
 +  * apt-pkg/init.cc:
 +    - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer!
 +  * cmdline/apt-config.cc:
 +    - show Acquire::Languages and APT::Architectures settings
 +      in 'dump' (Closes: 626739)
 +  * apt-pkg/orderlist.cc:
 +    - ensure that an old version of a package with a provides can
 +      never satisfy a dependency of a newer version of this package
 +
 +  [ Michael Vogt ]
 +  * methods/mirror.cc:
 +    - ignore lines starting with "#" in the mirror file
 +    - ignore non http urls in the mirrors
 +    - append the dist (e.g. sid, wheezy) as a query string when
 +      asking for a suitable mirror 
 +  * apt-pkg/deb/deblistparser.cc:
 +    - include all known languages when building the apt cache
 +      (LP: #794907)
 +  * apt-pkg/deb/debindexfile.cc:
 +    - remove some no longer valid checks for "TranslationsAvailable()"
 +
 +  [ Kenneth Solbø Andersen ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - set permissions of term.log to root.adm and 644 (LP: #404724)
 +  
 +  [ Chris Leick ]
 +  * various typo and syntax corrections in doc/*.xml
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 18:00:48 +0200
 +
 +apt (0.8.15~exp3) experimental; urgency=low
 +
 +  * debian/control:
 +    - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and 
 +     libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214)
 +    - use depends for the ${shlibs:Depends} to make the breaks work
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 17 Jun 2011 21:51:41 +0200
 +
 +apt (0.8.15~exp2) experimental; urgency=low
 +
 +  * debian/control:
 +    - fix incorrect Replaces (closes: #630204) for libapt-inst1.2
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 15 Jun 2011 16:51:14 +0200
 +
 +apt (0.8.15~exp1) experimental; urgency=low
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/depcache.cc:
 +    - Really release action groups only once (Closes: #622744)
 +    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
 +  * apt-pkg/acquire-item.cc:
 +    - Reject files known to be invalid (LP: #346386) (Closes: #627642)
 +  * debian/apt.cron.daily:
 +    - Check power after wait, patch by manuel-soto (LP: #705269)
 +  * debian/control:
 +    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
 +      unpacked if a library is too old and thus break upgrades
 +  * doc/apt-key.8.xml:
 +    - Document apt-key net-update (LP: #192810)
 +
 +  [ Christian Perrier ]
 +  * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
 +  * Italian translation update (Milo Casagrande). Closes: #627834
 +  * German documentation translation update (Chris Leick). Closes: #629949
 +
 +  [ David Kalnischkies ]
 +  * fix a bunch of cppcheck warnings/errors based on a patch by
 +    Niels Thykier, thanks! (Closes: #622805)
 +  * apt-pkg/depcache.cc:
 +    - really include 'rc' packages in the delete count by fixing a
 +      typo which exists since 1999 in the source… (LP: #761175)
 +    - if critical or-group can't be satisfied, exit directly.
 +  * apt-pkg/acquire-method.cc:
 +    - write directly to stdout instead of creating the message in
 +      memory first before writing to avoid hitting limits
 +    - fix order of CurrentURI and UsedMirror in Status() and Log()
 +  * apt-pkg/orderlist.cc:
 +    - let VisitRProvides report if the calls were successful
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - replace obsolete usleep with nanosleep
 +  * debian/apt{,-utils}.symbols:
 +    - update both experimental symbol-files to reflect 0.8.14 state
 +  * debian/rules:
 +    - remove unused embedded jquery by doxygen from libapt-pkg-doc
 +  * cmdline/apt-mark.cc:
 +    - reimplement apt-mark in c++
 +    - provide a 'showmanual' command (Closes: #582791)
 +    - provide a 'dpkg --set-selections' wrapper to set/release holds
 +  * cmdline/apt-get.cc:
 +    - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
 +  * cmdline/apt-cache.cc:
 +    - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
 +  * apt-pkg/pkgcache.cc:
 +    - really ignore :arch in FindPkg() in non-multiarch environment
 +  * doc/po/de.po:
 +    - undo the translation of the command 'dump' in manpage of apt-config
 +      as report by Burghard Grossmann on debian-l10n-german, thanks!
 +  * apt-pkg/deb/debmetaindex.cc:
 +    - do not download TranslationIndex if no Translation-* will be
 +      downloaded later on anyway (Closes: #624218)
 +  * test/versions.lst:
 +    - disable obscure version number tests with versions dpkg doesn't
 +      allow any more as they don't start with a number
 +  * apt-pkg/acquire-worker.cc:
 +    - print filename in the unmatching size warning (Closes: #623137)
 +  * apt-pkg/acquire-item.cc:
 +    - apply fix for poorly worded 'locate file' error message from
 +      Ben Finney, thanks! (Closes: #623171)
 +  * methods/http.cc:
 +    - add config option to ignore a closed stdin to be able to easily
 +      use the method as a simple standalone downloader
 +    - Location header in redirects should be absolute URI, but some
 +      servers just send an absolute path so still deal with it properly
 +    - dequote URL taken from Location in redirects as we will otherwise
 +      quote an already quoted string in the request later (Closes: #602412)
 +  * apt-pkg/contrib/netrc.cc:
 +    - replace non-posix gnu-extension strdupa with strdup
 +  * apt-pkg/packagemanager.cc:
 +    - ensure for Multi-Arch:same packages that they are unpacked in
 +      lock step even in immediate configuration (Closes: #618288)
 +
 +  [ Michael Vogt ]
 +  * methods/mirror.cc:
 +    - ignore lines starting with "#" in the mirror file
 +    - ignore non http urls in the mirrors
 +    - append the dist (e.g. sid, wheezy) as a query string when
 +      asking for a suitable mirror 
 +  * debian/control:
 +    - add libapt-pkg4.10 and libapt-inst1.2 library packages
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 10 Jun 2011 15:32:07 +0200
  
+ apt (0.8.14.2) UNRELEASED; urgency=low
+ 
+   [ Julian Andres Klode ]
+   * apt-pkg/depcache.cc:
+     - Really release action groups only once (Closes: #622744)
+     - Make purge work again for config-files (LP: #244598) (Closes: #150831)
+   * debian/apt.cron.daily:
+     - Check power after wait, patch by manuel-soto (LP: #705269)
+   * debian/control:
+     - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
+       unpacked if a library is too old and thus break upgrades
+   * doc/apt-key.8.xml:
+     - Document apt-key net-update (LP: #192810)
+ 
+   [ Christian Perrier ]
+   * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
+ 
+   [ David Kalnischkies ]
+   * fix a bunch of cppcheck warnings/errors based on a patch by
+     Niels Thykier, thanks! (Closes: #622805)
+   * apt-pkg/depcache.cc:
+     - really include 'rc' packages in the delete count by fixing a
+       typo which exists since 1999 in the source… (LP: #761175)
+     - if critical or-group can't be satisfied, exit directly.
+   * apt-pkg/acquire-method.cc:
+     - write directly to stdout instead of creating the message in
+       memory first before writing to avoid hitting limits
+     - fix order of CurrentURI and UsedMirror in Status() and Log()
+   * apt-pkg/orderlist.cc:
+     - let VisitRProvides report if the calls were successful
+   * apt-pkg/deb/dpkgpm.cc:
+     - replace obsolete usleep with nanosleep
+   * debian/apt{,-utils}.symbols:
+     - update both experimental symbol-files to reflect 0.8.14 state
+   * debian/rules:
+     - remove unused embedded jquery by doxygen from libapt-pkg-doc
+   * cmdline/apt-mark.cc:
+     - reimplement apt-mark in c++
+     - provide a 'showmanual' command (Closes: #582791)
+     - provide a 'dpkg --set-selections' wrapper to set/release holds
+   * cmdline/apt-get.cc:
+     - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
+   * cmdline/apt-cache.cc:
+     - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
+   * apt-pkg/pkgcache.cc:
+     - really ignore :arch in FindPkg() in non-multiarch environment
+   * doc/po/de.po:
+     - undo the translation of the command 'dump' in manpage of apt-config
+       as report by Burghard Grossmann on debian-l10n-german, thanks!
+   * apt-pkg/deb/debmetaindex.cc:
+     - do not download TranslationIndex if no Translation-* will be
+       downloaded later on anyway (Closes: #624218)
+   * test/versions.lst:
+     - disable obscure version number tests with versions dpkg doesn't
+       allow any more as they don't start with a number
+   * apt-pkg/acquire-worker.cc:
+     - print filename in the unmatching size warning (Closes: #623137)
+   * apt-pkg/acquire-item.cc:
+     - apply fix for poorly worded 'locate file' error message from
+       Ben Finney, thanks! (Closes: #623171)
+   * methods/http.cc:
+     - add config option to ignore a closed stdin to be able to easily
+       use the method as a simple standalone downloader
+     - Location header in redirects should be absolute URI, but some
+       servers just send an absolute path so still deal with it properly
+     - dequote URL taken from Location in redirects as we will otherwise
+       quote an already quoted string in the request later (Closes: #602412)
+   * apt-pkg/contrib/netrc.cc:
+     - replace non-posix gnu-extension strdupa with strdup
+   * apt-pkg/packagemanager.cc:
+     - ensure for Multi-Arch:same packages that they are unpacked in
+       lock step even in immediate configuration (Closes: #618288)
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
+ 
  apt (0.8.14.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc:
diff --combined debian/control
index 512a132f6,6d0f16b70..8d85b48e8
--- a/debian/control
+++ b/debian/control
@@@ -6,65 -6,26 +6,63 @@@ Uploaders: Michael Vogt <mvo@debian.org
   Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
   Julian Andres Klode <jak@debian.org>
  Standards-Version: 3.9.2
 -Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
 +Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev,
 + gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), 
 + zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, 
 + po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
  Build-Conflicts: autoconf2.13, automake1.4
  Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
  Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
  
  Package: apt
  Architecture: any
 -Pre-Depends: ${shlibs:Depends}
 -Depends: debian-archive-keyring, ${misc:Depends}, gnupg
 +Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
  Replaces: manpages-pl (<< 20060617-3~)
 -Provides: ${libapt-pkg:provides}
  Conflicts: python-apt (<< 0.7.93.2~)
  Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
 -Description: Advanced front-end for dpkg
 - This is Debian's next generation front-end for the dpkg package manager.
 - It provides the apt-get utility and APT dselect method that provides a 
 - simpler, safer way to install and upgrade packages.
 +Description: APT's commandline package manager
 + This package provides commandline tools for searching and
 + managing as well as querying information about packages
 + as a low-level access to all features of the libapt-pkg library.
   .
 - APT features complete installation ordering, multiple source capability
 - and several other unique features, see the Users Guide in apt-doc.
 + These include:
 +  * apt-get for retrieval of packages and information about them
 +    from authenticated sources and for installation, upgrade and
 +    removal of packages together with their dependencies
 +  * apt-cache for querying available information about installed
 +    as well as installable packages
 +  * apt-cdrom to use removable media as a source for packages
 +  * apt-config as an interface to the configuration settings
 +  * apt-key as an interface to manage authentication keys
 +
- Package: libapt-pkg4.10
++Package: libapt-pkg4.11
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Replaces: apt (<< 0.8.15)
- Breaks:  apt (<< 0.8.15)
 +Description: APT's package managment runtime library
 + This library provides the common functionality for searching and
 + managing packages as well as information about packages.
 + Higher-level package managers can depend upon this library.
 + .
 + This includes:
 +  * retrieval of information about packages from multiple sources
 +  * retrieval of packages and all dependent packages
 +    needed to satisfy a request either through an internal
 +    solver or by interfacing with an external one
 +  * authenticating the sources and validating the retrieved data
 +  * installation and removal of packages in the system
 +  * providing different transports to retrieve data over cdrom, ftp,
 +    http, rsh as well as an interface to add more transports like
 +    https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
 +
- Package: libapt-inst1.2
++Package: libapt-inst1.3
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15)
- Breaks:  apt (<< 0.8.15), apt-utils (<< 0.8.15)
 +Description: APT's deb package format runtime library
 + This library provides methods to query and extract information 
 + from deb packages. This includes the control data and the package
 + file content.
  
  Package: apt-doc
  Architecture: all
@@@ -72,13 -33,13 +70,13 @@@ Priority: optiona
  Depends: ${misc:Depends}
  Section: doc
  Description: Documentation for APT
 - This package contains the user guide and offline guide, for APT, an
 - Advanced Package Tool.
 + This package contains the user guide and offline guide for various
 + APT tools which are provided in a html and a text-only version.
  
  Package: libapt-pkg-dev
  Architecture: any
  Priority: optional
 -Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev
 +Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev
  Section: libdevel
  Description: Development files for APT's libapt-pkg and libapt-inst
   This package contains the header files and libraries for
@@@ -100,25 -61,19 +98,25 @@@ Description: Documentation for APT deve
  Package: apt-utils
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
 -Provides: ${libapt-inst:provides}
  Description: APT utility programs
 - This package contains some APT utility programs such as apt-ftparchive,
 - apt-sortpkgs and apt-extracttemplates.
 + This package contains some less used commandline utilities related
 + to package managment with APT.
   .
 - apt-extracttemplates is used by debconf to prompt for configuration 
 - questions before installation. apt-ftparchive is used to create Package
 - and other index files. apt-sortpkgs is a Package/Source file normalizer.
 +  * apt-extracttemplates is used by debconf to prompt for configuration
 +    questions before installation.
 +  * apt-ftparchive is used to create Packages and other index files
 +    needed to publish an archive of debian packages
 +  * apt-sortpkgs is a Packages/Sources file normalizer.
  
  Package: apt-transport-https
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Priority: optional
 -Description: APT https transport
 - This package contains a APT https transport. It makes it possible to
 - use 'deb https://foo distro main' lines in the sources.list.
 +Description: https download transport for APT
 + This package enables the usage of 'deb https://foo distro main' lines
 + in the /etc/apt/sources.list so that all package managers using the
 + libapt-pkg library can access metadata and packages available in sources
 + accessable over https (Hypertext Transfer Protocol Secure).
 + .
 + This transport supports server as well as client authenification
 + with certificates.
diff --combined debian/libapt-inst1.3.install
index 000000000,000000000..b7b63be81
new file mode 100644
--- /dev/null
+++ b/debian/libapt-inst1.3.install
@@@ -1,0 -1,0 +1,2 @@@
++bin/libapt-inst*.so.* usr/lib/
++usr/share/locale/*/*/libapt-inst*.mo
diff --combined debian/libapt-inst1.3.symbols
index 000000000,000000000..d9ea55b3d
new file mode 100644
--- /dev/null
+++ b/debian/libapt-inst1.3.symbols
@@@ -1,0 -1,0 +1,122 @@@
++libapt-inst.so.1.2 libapt-inst1.2 #MINVER#
++* Build-Depends-Package: libapt-pkg-dev
++ (c++)"ExtractTar::Done(bool)@Base" 0.8.0
++ (c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0
++ (c++)"ExtractTar::StartGzip()@Base" 0.8.0
++ (c++)"ExtractTar::ExtractTar(FileFd&, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"ExtractTar::~ExtractTar()@Base" 0.8.0
++ (c++)"debDebFile::GotoMember(char const*)@Base" 0.8.0
++ (c++)"debDebFile::CheckMember(char const*)@Base" 0.8.0
++ (c++)"debDebFile::MergeControl(pkgDataBase&)@Base" 0.8.0
++ (c++)"debDebFile::ControlExtract::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0
++ (c++)"debDebFile::ControlExtract::~ControlExtract()@Base" 0.8.0
++ (c++)"debDebFile::ExtractArchive(pkgDirStream&)@Base" 0.8.0
++ (c++)"debDebFile::ExtractControl(pkgDataBase&)@Base" 0.8.0
++ (c++)"debDebFile::MemControlExtract::TakeControl(void const*, unsigned long)@Base" 0.8.0
++ (c++)"debDebFile::MemControlExtract::Read(debDebFile&)@Base" 0.8.0
++ (c++)"debDebFile::MemControlExtract::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0
++ (c++)"debDebFile::MemControlExtract::Process(pkgDirStream::Item&, unsigned char const*, unsigned long, unsigned long)@Base" 0.8.0
++ (c++)"debDebFile::MemControlExtract::~MemControlExtract()@Base" 0.8.0
++ (c++)"debDebFile::debDebFile(FileFd&)@Base" 0.8.0
++ (c++)"pkgExtract::FinishedFile(pkgDirStream::Item&, int)@Base" 0.8.0
++ (c++)"pkgExtract::CheckDirReplace(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int)@Base" 0.8.0
++ (c++)"pkgExtract::HandleOverwrites(pkgFLCache::NodeIterator, bool)@Base" 0.8.0
++ (c++)"pkgExtract::Fail(pkgDirStream::Item&, int)@Base" 0.8.0
++ (c++)"pkgExtract::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0
++ (c++)"pkgExtract::Aborted()@Base" 0.8.0
++ (c++)"pkgExtract::Finished()@Base" 0.8.0
++ (c++)"pkgExtract::pkgExtract(pkgFLCache&, pkgCache::VerIterator)@Base" 0.8.0
++ (c++)"pkgExtract::~pkgExtract()@Base" 0.8.0
++ (c++)"pkgFLCache::TreeLookup(unsigned int*, char const*, char const*, unsigned long, unsigned int*, bool)@Base" 0.8.0
++ (c++)"pkgFLCache::AddConfFile(char const*, char const*, pkgFLCache::PkgIterator const&, unsigned char const*)@Base" 0.8.0
++ (c++)"pkgFLCache::AddDiversion(pkgFLCache::PkgIterator const&, char const*, char const*)@Base" 0.8.0
++ (c++)"pkgFLCache::BeginDiverLoad()@Base" 0.8.0
++ (c++)"pkgFLCache::FinishDiverLoad()@Base" 0.8.0
++ (c++)"pkgFLCache::GetPkg(char const*, char const*, bool)@Base" 0.8.0
++ (c++)"pkgFLCache::Header::Header()@Base" 0.8.0
++ (c++)"pkgFLCache::GetNode(char const*, char const*, unsigned int, bool, bool)@Base" 0.8.0
++ (c++)"pkgFLCache::DropNode(unsigned int)@Base" 0.8.0
++ (c++)"pkgFLCache::HashNode(pkgFLCache::NodeIterator const&)@Base" 0.8.0
++ (c++)"pkgFLCache::PrintTree(unsigned int, unsigned long)@Base" 0.8.0
++ (c++)"pkgFLCache::pkgFLCache(DynamicMMap&)@Base" 0.8.0
++ (c++)"pkgDataBase::GetMetaTmp(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
++ (c++)"pkgDataBase::~pkgDataBase()@Base" 0.8.0
++ (c++)"pkgDirStream::FinishedFile(pkgDirStream::Item&, int)@Base" 0.8.0
++ (c++)"pkgDirStream::Fail(pkgDirStream::Item&, int)@Base" 0.8.0
++ (c++)"pkgDirStream::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0
++ (c++)"pkgDirStream::Process(pkgDirStream::Item&, unsigned char const*, unsigned long, unsigned long)@Base" 0.8.0
++ (c++)"pkgDirStream::~pkgDirStream()@Base" 0.8.0
++ (c++|optional)"debListParser::~debListParser()@Base" 0.8.0
++ (c++|optional)"pkgCacheGenerator::ListParser::CollectFileProvides(pkgCache&, pkgCache::VerIterator&)@Base" 0.8.0
++ (c++|optional)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0
++ (c++|optional)"pkgCache::DepIterator::operator++(int)@Base" 0.8.0
++ (c++|optional)"pkgCache::DepIterator::operator++()@Base" 0.8.0
++ (c++|optional)"pkgCache::VerIterator::operator++(int)@Base" 0.8.0
++ (c++|optional)"pkgCache::VerIterator::operator++()@Base" 0.8.0
++ (c++)"ARArchive::LoadHeaders()@Base" 0.8.0
++ (c++)"ARArchive::ARArchive(FileFd&)@Base" 0.8.0
++ (c++)"ARArchive::~ARArchive()@Base" 0.8.0
++ (c++)"debDpkgDB::InitMetaTmp(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
++ (c++)"debDpkgDB::LoadChanges()@Base" 0.8.0
++ (c++)"debDpkgDB::ReadConfFiles()@Base" 0.8.0
++ (c++)"debDpkgDB::ReadyFileList(OpProgress&)@Base" 0.8.0
++ (c++)"debDpkgDB::ReadyPkgCache(OpProgress&)@Base" 0.8.0
++ (c++)"debDpkgDB::ReadDiversions()@Base" 0.8.0
++ (c++)"debDpkgDB::ReadFList(OpProgress&)@Base" 0.8.0
++ (c++)"debDpkgDB::debDpkgDB()@Base" 0.8.0
++ (c++)"debDpkgDB::~debDpkgDB()@Base" 0.8.0
++ (c++)"pkgFLCache::NodeIterator::RealPackage() const@Base" 0.8.0
++ (c++)"pkgFLCache::Header::CheckSizes(pkgFLCache::Header&) const@Base" 0.8.0
++ (c++|optional)"pkgCache::DepIterator::OwnerPointer() const@Base" 0.8.0
++ (c++|optional)"pkgCache::VerIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"ARArchive::FindMember(char const*) const@Base" 0.8.0
++ (c++)"typeinfo for ExtractTar@Base" 0.8.0
++ (c++)"typeinfo for pkgExtract@Base" 0.8.0
++ (c++)"typeinfo for pkgDataBase@Base" 0.8.0
++ (c++)"typeinfo for pkgDirStream@Base" 0.8.0
++ (c++)"typeinfo for debDpkgDB@Base" 0.8.0
++ (c++)"typeinfo for debDebFile::ControlExtract@Base" 0.8.0
++ (c++)"typeinfo for debDebFile::MemControlExtract@Base" 0.8.0
++ (c++|optional)"typeinfo for pkgCacheGenerator::ListParser@Base" 0.8.0
++ (c++|optional)"typeinfo for pkgCache::DepIterator@Base" 0.8.0
++ (c++|optional)"typeinfo for pkgCache::VerIterator@Base" 0.8.0
++ (c++|optional)"typeinfo for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
++ (c++|optional)"typeinfo for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
++ (c++|optional)"typeinfo for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
++ (c++)"typeinfo name for ExtractTar@Base" 0.8.0
++ (c++)"typeinfo name for pkgExtract@Base" 0.8.0
++ (c++)"typeinfo name for pkgDataBase@Base" 0.8.0
++ (c++)"typeinfo name for pkgDirStream@Base" 0.8.0
++ (c++)"typeinfo name for debDpkgDB@Base" 0.8.0
++ (c++)"typeinfo name for debDebFile::ControlExtract@Base" 0.8.0
++ (c++)"typeinfo name for debDebFile::MemControlExtract@Base" 0.8.0
++ (c++|optional)"typeinfo name for pkgCacheGenerator::ListParser@Base" 0.8.0
++ (c++|optional)"typeinfo name for pkgCache::DepIterator@Base" 0.8.0
++ (c++|optional)"typeinfo name for pkgCache::VerIterator@Base" 0.8.0
++ (c++|optional)"typeinfo name for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
++ (c++|optional)"typeinfo name for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
++ (c++|optional)"typeinfo name for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
++ (c++)"vtable for ExtractTar@Base" 0.8.0
++ (c++)"vtable for pkgExtract@Base" 0.8.0
++ (c++)"vtable for pkgDataBase@Base" 0.8.0
++ (c++)"vtable for pkgDirStream@Base" 0.8.0
++ (c++)"vtable for debDpkgDB@Base" 0.8.0
++ (c++)"vtable for debDebFile::ControlExtract@Base" 0.8.0
++ (c++)"vtable for debDebFile::MemControlExtract@Base" 0.8.0
++ (c++|optional)"vtable for pkgCacheGenerator::ListParser@Base" 0.8.0
++ (c++|optional)"vtable for pkgCache::DepIterator@Base" 0.8.0
++ (c++|optional)"vtable for pkgCache::VerIterator@Base" 0.8.0
++ (c++|optional)"vtable for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
++ (c++|optional)"vtable for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
++ (c++|optional)"vtable for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
++### gcc-4.4 specific
++# (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0
++# (c++|optional=std)"std::basic_string<char, std::char_traits<char>, std::allocator<char> >& std::basic_string<char, std::char_traits<char>, std::allocator<char> >::append<unsigned char*>(unsigned char*, unsigned char*)@Base" 0.8.0
++### gcc-4.6 specific
++ (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@Base" 0.8.12
++ (c++|optional=std)"std::basic_string<char, std::char_traits<char>, std::allocator<char> >& std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_replace_dispatch<unsigned char*>(__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, unsigned char*, unsigned char*, std::__false_type)@Base" 0.8.0
++### try to ignore std:: template instances
++ (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0
++ (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0
++ (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0
++###
diff --combined debian/libapt-pkg4.11.install
index 000000000,000000000..91b39a31b
new file mode 100644
--- /dev/null
+++ b/debian/libapt-pkg4.11.install
@@@ -1,0 -1,0 +1,2 @@@
++bin/libapt-pkg*.so.* usr/lib/
++usr/share/locale/*/*/libapt-pkg*.mo
diff --combined debian/libapt-pkg4.11.symbols
index 000000000,000000000..16b630214
new file mode 100644
--- /dev/null
+++ b/debian/libapt-pkg4.11.symbols
@@@ -1,0 -1,0 +1,1322 @@@
++libapt-pkg.so.4.10 libapt-pkg4.10 #MINVER#
++* Build-Depends-Package: libapt-pkg-dev
++ TFRewritePackageOrder@Base 0.8.0
++ TFRewriteSourceOrder@Base 0.8.0
++ (c++)"FileExists(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"IdentCdrom(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int)@Base" 0.8.0
++ (c++)"ListUpdate(pkgAcquireStatus&, pkgSourceList&, int)@Base" 0.8.0
++ (c++)"MountCdrom(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"ParseCWord(char const*&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
++ (c++)"ReadPinDir(pkgPolicy&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"RunScripts(char const*)@Base" 0.8.0
++ (c++)"SafeGetCWD()@Base" 0.8.0
++ (c++)"parsenetrc(char*, char*, char*, char*)@Base" 0.8.0
++ (c++)"QuoteString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@Base" 0.8.0
++ (c++)"ReadPinFile(pkgPolicy&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"RegexChoice(RxChoiceList*, char const**, char const**)@Base" 0.8.0
++ (c++)"SetNonBlock(int, bool)@Base" 0.8.0
++ (c++)"TimeRFC1123(long)@Base" 0.8.0
++ (c++)"flExtension(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"Base64Encode(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"ReadMessages(int, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&)@Base" 0.8.0
++ (c++)"SetCloseExec(int, bool)@Base" 0.8.0
++ (c++)"StringToBool(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0.8.0
++ (c++)"UnmountCdrom(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"_GetErrorObj()@Base" 0.8.0
++ (c++)"pkgFixBroken(pkgDepCache&)@Base" 0.8.0
++ (c++)"DeQuoteString(__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)@Base" 0.8.0
++ (c++)"DeQuoteString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"OutputInDepth(unsigned long, char const*)@Base" 0.8.0
++ (c++)"ReadConfigDir(Configuration&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, unsigned int const&)@Base" 0.8.0
++ (c++)"URItoFileName(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"UTF8ToCodeset(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >*)@Base" 0.8.0
++ (c++)"pkgAllUpgrade(pkgDepCache&)@Base" 0.8.0
++ (c++)"pkgInitConfig(Configuration&)@Base" 0.8.0
++ (c++)"pkgInitSystem(Configuration&, pkgSystem*&)@Base" 0.8.0
++ (c++)"safe_snprintf(char*, char*, char const*, ...)@Base" 0.8.0
++ (c++)"stringcasecmp(__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, char const*, char const*)@Base" 0.8.0
++ (c++)"stringcasecmp(__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >)@Base" 0.8.0
++ (c++)"stringcasecmp(char const*, char const*, char const*, char const*)@Base" 0.8.0
++ (c++)"tolower_ascii(int)@Base" 0.8.0
++ (c++)"ParseQuoteWord(char const*&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
++ (c++)"ReadConfigFile(Configuration&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, unsigned int const&)@Base" 0.8.0
++ (c++)"TokSplitString(char, char*, char**, unsigned long)@Base" 0.8.0
++ (c++)"maybe_add_auth(URI&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgApplyStatus(pkgDepCache&)@Base" 0.8.0
++ (c++)"pkgDistUpgrade(pkgDepCache&)@Base" 0.8.0
++ (c++)"CheckDomainList(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"CreateDirectory(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"DirectoryExists(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"VectorizeString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const&)@Base" 0.8.0
++ (c++)"pkgPrioSortList(pkgCache&, pkgCache::Version**)@Base" 0.8.0
++ (c++)"FTPMDTMStrToTime(char const*, long&)@Base" 0.8.0
++ (c++)"RFC1123StrToTime(char const*, long&)@Base" 0.8.0
++ (c++)"pkgMakeStatusCache(pkgSourceList&, OpProgress&, MMap**, bool)@Base" 0.8.0
++ (c++)"pkgMinimizeUpgrade(pkgDepCache&)@Base" 0.8.0
++ (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, bool const&)@Base" 0.8.0
++ (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, bool const&)@Base" 0.8.0
++ (c++)"pkgMakeStatusCacheMem(pkgSourceList&, OpProgress&)@Base" 0.8.0
++ (c++)"pkgMakeOnlyStatusCache(OpProgress&, DynamicMMap**)@Base" 0.8.0
++ (c++)"WaitFd(int, bool, unsigned long)@Base" 0.8.0
++ (c++)"GetLock(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.8.0
++ (c++)"Hex2Num(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned char*, unsigned int)@Base" 0.8.0
++ (c++)"AddCRC16(unsigned short, void const*, unsigned long)@Base" 0.8.0
++ (c++)"CopyFile(FileFd&, FileFd&)@Base" 0.8.0
++ (c++)"ExecFork()@Base" 0.8.0
++ (c++)"ExecWait(int, char const*, bool)@Base" 0.8.0
++ (c++)"StrToNum(char const*, unsigned long&, unsigned int, unsigned int)@Base" 0.8.0
++ (c++)"SubstVar(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"SubstVar(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, SubstVar const*)@Base" 0.8.0
++ (c++)"flNoLink(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"flNotDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"ioprintf(std::basic_ostream<char, std::char_traits<char> >&, char const*, ...)@Base" 0.8.0
++ (c++)"IsMounted(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
++ (c++)"LookupTag(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*, char const*)@Base" 0.8.0
++ (c++)"SizeToStr(double)@Base" 0.8.0
++ (c++)"StrToTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, long&)@Base" 0.8.0
++ (c++)"TFRewrite(_IO_FILE*, pkgTagSection const&, char const**, TFRewriteData*)@Base" 0.8.0
++ (c++)"TimeToStr(unsigned long)@Base" 0.8.0
++ (c++)"_strstrip(char*)@Base" 0.8.0
++ (c++)"flCombine(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"flNotFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"stringcmp(__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, char const*, char const*)@Base" 0.8.0
++ (c++)"stringcmp(__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >)@Base" 0.8.0
++ (c++)"stringcmp(char const*, char const*, char const*, char const*)@Base" 0.8.0
++ (c++)"strprintf(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, char const*, ...)@Base" 0.8.0
++ (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::DepIterator>::toReMap@Base" 0.8.0
++ (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::GrpIterator>::toReMap@Base" 0.8.0
++ (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::PkgIterator>::toReMap@Base" 0.8.0
++ (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::PrvIterator>::toReMap@Base" 0.8.0
++ (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::VerIterator>::toReMap@Base" 0.8.0
++ (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::DescIterator>::toReMap@Base" 0.8.0
++ (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator>::toReMap@Base" 0.8.0
++ (c++)"HashString::SupportedHashes()@Base" 0.8.0
++ (c++)"HashString::_SupportedHashes@Base" 0.8.0
++ (c++)"HashString::HashString(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"HashString::HashString(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"HashString::HashString()@Base" 0.8.0
++ (c++)"HashString::~HashString()@Base" 0.8.0
++ (c++)"OpProgress::CheckChange(float)@Base" 0.8.0
++ (c++)"OpProgress::SubProgress(unsigned long)@Base" 0.8.0
++ (c++)"OpProgress::SubProgress(unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"OpProgress::OverallProgress(unsigned long, unsigned long, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"OpProgress::Done()@Base" 0.8.0
++ (c++)"OpProgress::Update()@Base" 0.8.0
++ (c++)"OpProgress::Progress(unsigned long)@Base" 0.8.0
++ (c++)"OpProgress::OpProgress()@Base" 0.8.0
++ (c++)"OpProgress::~OpProgress()@Base" 0.8.0
++ (c++)"SourceCopy::GetFileName()@Base" 0.8.0
++ (c++)"SourceCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"SourceCopy::Type()@Base" 0.8.0
++ (c++)"SourceCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
++ (c++)"SourceCopy::~SourceCopy()@Base" 0.8.0
++ (c++)"pkgAcqFile::Custom600Headers()@Base" 0.8.0
++ (c++)"pkgAcqFile::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqFile::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqFile::DescURI()@Base" 0.8.0
++ (c++)"pkgAcqFile::HashSum()@Base" 0.8.0
++ (c++)"pkgAcqFile::pkgAcqFile(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.0
++ (c++)"pkgAcqFile::~pkgAcqFile()@Base" 0.8.0
++ (c++)"pkgAcquire::WorkerStep(pkgAcquire::Worker*)@Base" 0.8.0
++ (c++)"pkgAcquire::FetchNeeded()@Base" 0.8.0
++ (c++)"pkgAcquire::TotalNeeded()@Base" 0.8.0
++ (c++)"pkgAcquire::MethodConfig::MethodConfig()@Base" 0.8.0
++ (c++)"pkgAcquire::PartialPresent()@Base" 0.8.0
++ (c++)"pkgAcquire::Add(pkgAcquire::Item*)@Base" 0.8.0
++ (c++)"pkgAcquire::Add(pkgAcquire::Worker*)@Base" 0.8.0
++ (c++)"pkgAcquire::Run(int)@Base" 0.8.0
++ (c++)"pkgAcquire::Bump()@Base" 0.8.0
++ (c++)"pkgAcquire::Item::Custom600Headers()@Base" 0.8.0
++ (c++)"pkgAcquire::Item::ReportMirrorFailure(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcquire::Item::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcquire::Item::Start(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long)@Base" 0.8.0
++ (c++)"pkgAcquire::Item::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcquire::Item::Rename(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcquire::Item::HashSum()@Base" 0.8.0
++ (c++)"pkgAcquire::Item::Finished()@Base" 0.8.0
++ (c++)"pkgAcquire::Item::IsTrusted()@Base" 0.8.0
++ (c++)"pkgAcquire::Item::ShortDesc()@Base" 0.8.0
++ (c++)"pkgAcquire::Item::Item(pkgAcquire*)@Base" 0.8.0
++ (c++)"pkgAcquire::Item::~Item()@Base" 0.8.0
++ (c++)"pkgAcquire::Clean(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::Bump()@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::Cycle()@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::Dequeue(pkgAcquire::Item*)@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::Enqueue(pkgAcquire::ItemDesc&)@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::Startup()@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::FindItem(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::Worker*)@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::ItemDone(pkgAcquire::Queue::QItem*)@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::Shutdown(bool)@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::Queue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire*)@Base" 0.8.0
++ (c++)"pkgAcquire::Queue::~Queue()@Base" 0.8.0
++ (c++)"pkgAcquire::Setup(pkgAcquireStatus*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgAcquire::Remove(pkgAcquire::Item*)@Base" 0.8.0
++ (c++)"pkgAcquire::Remove(pkgAcquire::Worker*)@Base" 0.8.0
++ (c++)"pkgAcquire::RunFds(fd_set*, fd_set*)@Base" 0.8.0
++ (c++)"pkgAcquire::SetFds(int&, fd_set*, fd_set*)@Base" 0.8.0
++ (c++)"pkgAcquire::UriEnd()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::OutFdReady()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::MediaChange(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::RunMessages()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::Capabilities(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::ReadMessages()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::MethodFailure()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::SendConfiguration()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::Pulse()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::Start()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::ItemDone()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::Construct()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::InFdReady()@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem*)@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::Worker(pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::Worker(pkgAcquire::Queue*, pkgAcquire::MethodConfig*, pkgAcquireStatus*)@Base" 0.8.0
++ (c++)"pkgAcquire::Worker::~Worker()@Base" 0.8.0
++ (c++)"pkgAcquire::Dequeue(pkgAcquire::Item*)@Base" 0.8.0
++ (c++)"pkgAcquire::Enqueue(pkgAcquire::ItemDesc&)@Base" 0.8.0
++ (c++)"pkgAcquire::ItemDesc::~ItemDesc()@Base" 0.8.0
++ (c++)"pkgAcquire::Shutdown()@Base" 0.8.0
++ (c++)"pkgAcquire::UriBegin()@Base" 0.8.0
++ (c++)"pkgAcquire::GetConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcquire::QueueName(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig const*&)@Base" 0.8.0
++ (c++)"pkgAcquire::pkgAcquire(pkgAcquireStatus*)@Base" 0.8.0
++ (c++)"pkgAcquire::pkgAcquire()@Base" 0.8.0
++ (c++)"pkgAcquire::~pkgAcquire()@Base" 0.8.0
++ (c++)"pkgRecords::Lookup(pkgCache::VerFileIterator const&)@Base" 0.8.0
++ (c++)"pkgRecords::Lookup(pkgCache::DescFileIterator const&)@Base" 0.8.0
++ (c++)"pkgRecords::Parser::Maintainer()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::SHA256Hash()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::Name()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::GetRec(char const*&, char const*&)@Base" 0.8.0
++ (c++)"pkgRecords::Parser::MD5Hash()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::FileName()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::Homepage()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::LongDesc()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::SHA1Hash()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::ShortDesc()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::SourcePkg()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::SourceVer()@Base" 0.8.0
++ (c++)"pkgRecords::Parser::~Parser()@Base" 0.8.0
++ (c++)"pkgRecords::pkgRecords(pkgCache&)@Base" 0.8.0
++ (c++)"pkgRecords::~pkgRecords()@Base" 0.8.0
++ (c++)"pkgTagFile::Fill()@Base" 0.8.0
++ (c++)"pkgTagFile::Jump(pkgTagSection&, unsigned long)@Base" 0.8.0
++ (c++)"pkgTagFile::Step(pkgTagSection&)@Base" 0.8.0
++ (c++)"pkgTagFile::Resize()@Base" 0.8.0
++ (c++)"pkgTagFile::pkgTagFile(FileFd*, unsigned long)@Base" 0.8.0
++ (c++)"pkgTagFile::~pkgTagFile()@Base" 0.8.0
++ (c++)"CdromDevice::~CdromDevice()@Base" 0.8.0
++ (c++)"CommandLine::DispatchArg(CommandLine::Dispatch*, bool)@Base" 0.8.0
++ (c++)"CommandLine::SaveInConfig(unsigned int const&, char const* const*)@Base" 0.8.0
++ (c++)"CommandLine::Parse(int, char const**)@Base" 0.8.0
++ (c++)"CommandLine::HandleOpt(int&, int, char const**, char const*&, CommandLine::Args*, bool)@Base" 0.8.0
++ (c++)"CommandLine::CommandLine(CommandLine::Args*, Configuration*)@Base" 0.8.0
++ (c++)"CommandLine::~CommandLine()@Base" 0.8.0
++ (c++)"DynamicMMap::RawAllocate(unsigned long, unsigned long)@Base" 0.8.0
++ (c++)"DynamicMMap::WriteString(char const*, unsigned long)@Base" 0.8.0
++ (c++)"DynamicMMap::Grow()@Base" 0.8.0
++ (c++)"DynamicMMap::Allocate(unsigned long)@Base" 0.8.0
++ (c++)"DynamicMMap::DynamicMMap(FileFd&, unsigned long, unsigned long const&, unsigned long const&, unsigned long const&)@Base" 0.8.0
++ (c++)"DynamicMMap::DynamicMMap(unsigned long, unsigned long const&, unsigned long const&, unsigned long const&)@Base" 0.8.0
++ (c++)"DynamicMMap::~DynamicMMap()@Base" 0.8.0
++ (c++)"GlobalError::DumpErrors(std::basic_ostream<char, std::char_traits<char> >&, GlobalError::MsgType const&, bool const&)@Base" 0.8.0
++ (c++)"GlobalError::PopMessage(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
++ (c++)"GlobalError::InsertErrno(GlobalError::MsgType const&, char const*, char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::PushToStack()@Base" 0.8.0
++ (c++)"GlobalError::RevertToStack()@Base" 0.8.0
++ (c++)"GlobalError::MergeWithStack()@Base" 0.8.0
++ (c++)"GlobalError::Debug(char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::Errno(char const*, char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::Error(char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::Fatal(char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::DebugE(char const*, char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::FatalE(char const*, char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::Insert(GlobalError::MsgType const&, char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::Notice(char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::Discard()@Base" 0.8.0
++ (c++)"GlobalError::NoticeE(char const*, char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::Warning(char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::WarningE(char const*, char const*, ...)@Base" 0.8.0
++ (c++)"GlobalError::GlobalError()@Base" 0.8.0
++ (c++)"MD5SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"MD5SumValue::MD5SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"MD5SumValue::MD5SumValue()@Base" 0.8.0
++ (c++)"PackageCopy::GetFileName()@Base" 0.8.0
++ (c++)"PackageCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"PackageCopy::Type()@Base" 0.8.0
++ (c++)"PackageCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
++ (c++)"PackageCopy::~PackageCopy()@Base" 0.8.0
++ (c++)"pkgAcqIndex::Custom600Headers()@Base" 0.8.0
++ (c++)"pkgAcqIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqIndex::DescURI()@Base" 0.8.0
++ (c++)"pkgAcqIndex::HashSum()@Base" 0.8.0
++ (c++)"pkgAcqIndex::pkgAcqIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashString, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcqIndex::~pkgAcqIndex()@Base" 0.8.0
++ (c++)"pkgDepCache::IsDeleteOk(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.8.0
++ (c++)"pkgDepCache::MarkDelete(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.8.0
++ (c++)"pkgDepCache::StateCache::StripEpoch(char const*)@Base" 0.8.0
++ (c++)"pkgDepCache::StateCache::Update(pkgCache::PkgIterator, pkgCache&)@Base" 0.8.0
++ (c++)"pkgDepCache::ActionGroup::release()@Base" 0.8.0
++ (c++)"pkgDepCache::ActionGroup::ActionGroup(pkgDepCache&)@Base" 0.8.0
++ (c++)"pkgDepCache::ActionGroup::~ActionGroup()@Base" 0.8.0
++ (c++)"pkgDepCache::IsInstallOk(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.8.0
++ (c++)"pkgDepCache::MarkInstall(pkgCache::PkgIterator const&, bool, unsigned long, bool, bool)@Base" 0.8.0
++ (c++)"pkgDepCache::MarkPackage(pkgCache::PkgIterator const&, pkgCache::VerIterator const&, bool const&, bool const&)@Base" 0.8.0
++ (c++)"pkgDepCache::MarkRequired(pkgDepCache::InRootSetFunc&)@Base" 0.8.0
++ (c++)"pkgDepCache::SetReInstall(pkgCache::PkgIterator const&, bool)@Base" 0.8.0
++ (c++)"pkgDepCache::VersionState(pkgCache::DepIterator, unsigned char, unsigned char, unsigned char)@Base" 0.8.0
++ (c++)"pkgDepCache::BuildGroupOrs(pkgCache::VerIterator const&)@Base" 0.8.0
++ (c++)"pkgDepCache::InRootSetFunc::InRootSet(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"pkgDepCache::InRootSetFunc::~InRootSetFunc()@Base" 0.8.0
++ (c++)"pkgDepCache::readStateFile(OpProgress*)@Base" 0.8.0
++ (c++)"pkgDepCache::GetRootSetFunc()@Base" 0.8.0
++ (c++)"pkgDepCache::UpdateVerState(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgDepCache::writeStateFile(OpProgress*, bool)@Base" 0.8.0
++ (c++)"pkgDepCache::DependencyState(pkgCache::DepIterator&)@Base" 0.8.0
++ (c++)"pkgDepCache::DefaultRootSetFunc::InRootSet(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()@Base" 0.8.0
++ (c++)"pkgDepCache::MarkFollowsSuggests()@Base" 0.8.0
++ (c++)"pkgDepCache::MarkFollowsRecommends()@Base" 0.8.0
++ (c++)"pkgDepCache::Init(OpProgress*)@Base" 0.8.0
++ (c++)"pkgDepCache::Sweep()@Base" 0.8.0
++ (c++)"pkgDepCache::Policy::IsImportantDep(pkgCache::DepIterator const&)@Base" 0.8.0
++ (c++)"pkgDepCache::Policy::GetCandidateVer(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"pkgDepCache::Policy::~Policy()@Base" 0.8.0
++ (c++)"pkgDepCache::Update(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgDepCache::Update(OpProgress*)@Base" 0.8.0
++ (c++)"pkgDepCache::Update(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, bool const&)@Base" 0.8.0
++ (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, long)@Base" 0.8.0
++ (c++)"pkgDepCache::CheckDep(pkgCache::DepIterator, int, pkgCache::PkgIterator&)@Base" 0.8.0
++ (c++)"pkgDepCache::MarkAuto(pkgCache::PkgIterator const&, bool)@Base" 0.8.0
++ (c++)"pkgDepCache::MarkKeep(pkgCache::PkgIterator const&, bool, bool, unsigned long)@Base" 0.8.0
++ (c++)"pkgDepCache::AddStates(pkgCache::PkgIterator const&, int)@Base" 0.8.0
++ (c++)"pkgDepCache::pkgDepCache(pkgCache*, pkgDepCache::Policy*)@Base" 0.8.0
++ (c++)"pkgDepCache::~pkgDepCache()@Base" 0.8.0
++ (c++)"pkgSimulate::ShortBreaks()@Base" 0.8.0
++ (c++)"pkgSimulate::Policy::GetCandidateVer(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"pkgSimulate::Policy::~Policy()@Base" 0.8.0
++ (c++)"pkgSimulate::Remove(pkgCache::PkgIterator, bool)@Base" 0.8.0
++ (c++)"pkgSimulate::Install(pkgCache::PkgIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgSimulate::Describe(pkgCache::PkgIterator, std::basic_ostream<char, std::char_traits<char> >&, bool, bool)@Base" 0.8.0
++ (c++)"pkgSimulate::Configure(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgSimulate::pkgSimulate(pkgDepCache*)@Base" 0.8.0
++ (c++)"pkgSimulate::~pkgSimulate()@Base" 0.8.0
++ (c++)"MD5Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
++ (c++)"MD5Summation::AddFD(int, unsigned long)@Base" 0.8.0
++ (c++)"MD5Summation::Result()@Base" 0.8.0
++ (c++)"MD5Summation::MD5Summation()@Base" 0.8.0
++ (c++)"SHA1SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"SHA1SumValue::SHA1SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"SHA1SumValue::SHA1SumValue()@Base" 0.8.0
++ (c++)"debIFTypePkg::~debIFTypePkg()@Base" 0.8.0
++ (c++)"debIFTypeSrc::~debIFTypeSrc()@Base" 0.8.0
++ (c++)"debSLTypeDeb::~debSLTypeDeb()@Base" 0.8.0
++ (c++)"indexRecords::Load(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"indexRecords::Lookup(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"indexRecords::MetaKeys()@Base" 0.8.0
++ (c++)"indexRecords::indexRecords(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"indexRecords::indexRecords()@Base" 0.8.0
++ (c++)"indexRecords::~indexRecords()@Base" 0.8.0
++ (c++)"pkgAcqMethod::FetchResult::TakeHashes(Hashes&)@Base" 0.8.0
++ (c++)"pkgAcqMethod::FetchResult::FetchResult()@Base" 0.8.0
++ (c++)"pkgAcqMethod::Configuration(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcqMethod::Log(char const*, ...)@Base" 0.8.0
++ (c++)"pkgAcqMethod::Run(bool)@Base" 0.8.0
++ (c++)"pkgAcqMethod::Exit()@Base" 0.8.0
++ (c++)"pkgAcqMethod::Fail(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.8.0
++ (c++)"pkgAcqMethod::Fail(bool)@Base" 0.8.0
++ (c++)"pkgAcqMethod::Fetch(pkgAcqMethod::FetchItem*)@Base" 0.8.0
++ (c++)"pkgAcqMethod::Status(char const*, ...)@Base" 0.8.0
++ (c++)"pkgAcqMethod::URIDone(pkgAcqMethod::FetchResult&, pkgAcqMethod::FetchResult*)@Base" 0.8.0
++ (c++)"pkgAcqMethod::Redirect(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgAcqMethod::URIStart(pkgAcqMethod::FetchResult&)@Base" 0.8.0
++ (c++)"pkgAcqMethod::MediaFail(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcqMethod::pkgAcqMethod(char const*, unsigned long)@Base" 0.8.0
++ (c++)"pkgAcqMethod::~pkgAcqMethod()@Base" 0.8.0
++ (c++)"pkgCacheFile::BuildCaches(OpProgress*, bool)@Base" 0.8.0
++ (c++)"pkgCacheFile::BuildPolicy(OpProgress*)@Base" 0.8.0
++ (c++)"pkgCacheFile::BuildDepCache(OpProgress*)@Base" 0.8.0
++ (c++)"pkgCacheFile::BuildSourceList(OpProgress*)@Base" 0.8.0
++ (c++)"pkgCacheFile::Open(OpProgress*, bool)@Base" 0.8.0
++ (c++)"pkgCacheFile::Close()@Base" 0.8.0
++ (c++)"pkgCacheFile::pkgCacheFile()@Base" 0.8.0
++ (c++)"pkgCacheFile::~pkgCacheFile()@Base" 0.8.0
++ (c++)"pkgIndexFile::LanguageCode()@Base" 0.8.0
++ (c++)"pkgIndexFile::CheckLanguageCode(char const*)@Base" 0.8.0
++ (c++)"pkgIndexFile::TranslationsAvailable()@Base" 0.8.0
++ (c++)"pkgIndexFile::Type::GlobalList@Base" 0.8.0
++ (c++)"pkgIndexFile::Type::GlobalListLen@Base" 0.8.0
++ (c++)"pkgIndexFile::Type::GetType(char const*)@Base" 0.8.0
++ (c++)"pkgIndexFile::Type::Type()@Base" 0.8.0
++ (c++)"pkgIndexFile::Type::~Type()@Base" 0.8.0
++ (c++)"pkgIndexFile::~pkgIndexFile()@Base" 0.8.0
++ (c++)"pkgOrderList::VisitRDeps(bool (pkgOrderList::*)(pkgCache::DepIterator), pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::OrderUnpack(std::basic_string<char, std::char_traits<char>, std::allocator<char> >*)@Base" 0.8.0
++ (c++)"pkgOrderList::DepConfigure(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::DepUnPackDep(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::DepUnPackPre(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::DepUnPackCrit(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::DepUnPackPreD(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::OrderCompareA(void const*, void const*)@Base" 0.8.0
++ (c++)"pkgOrderList::OrderCompareB(void const*, void const*)@Base" 0.8.0
++ (c++)"pkgOrderList::OrderCritical()@Base" 0.8.0
++ (c++)"pkgOrderList::VisitProvides(pkgCache::DepIterator, bool)@Base" 0.8.0
++ (c++)"pkgOrderList::OrderConfigure()@Base" 0.8.0
++ (c++)"pkgOrderList::VisitRProvides(bool (pkgOrderList::*)(pkgCache::DepIterator), pkgCache::VerIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::Me@Base" 0.8.0
++ (c++)"pkgOrderList::DoRun()@Base" 0.8.0
++ (c++)"pkgOrderList::Score(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::AddLoop(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::FileCmp(pkgCache::PkgIterator, pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::CheckDep(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::DepRemove(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::IsMissing(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::VisitDeps(bool (pkgOrderList::*)(pkgCache::DepIterator), pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::VisitNode(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgOrderList::WipeFlags(unsigned long)@Base" 0.8.0
++ (c++)"pkgOrderList::pkgOrderList(pkgDepCache*)@Base" 0.8.0
++ (c++)"pkgOrderList::~pkgOrderList()@Base" 0.8.0
++ (c++)"Configuration::MatchAgainstConfig::MatchAgainstConfig(char const*)@Base" 0.8.0
++ (c++)"Configuration::MatchAgainstConfig::~MatchAgainstConfig()@Base" 0.8.0
++ (c++)"Configuration::Set(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"Configuration::Set(char const*, int const&)@Base" 0.8.0
++ (c++)"Configuration::Dump(std::basic_ostream<char, std::char_traits<char> >&)@Base" 0.8.0
++ (c++)"Configuration::Clear(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"Configuration::Clear(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int const&)@Base" 0.8.0
++ (c++)"Configuration::Clear(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"Configuration::CndSet(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"Configuration::Lookup(char const*, bool const&)@Base" 0.8.0
++ (c++)"Configuration::Lookup(Configuration::Item*, char const*, unsigned long const&, bool const&)@Base" 0.8.0
++ (c++)"Configuration::Configuration(Configuration::Item const*)@Base" 0.8.0
++ (c++)"Configuration::Configuration()@Base" 0.8.0
++ (c++)"Configuration::~Configuration()@Base" 0.8.0
++ (c++)"SHA1Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
++ (c++)"SHA1Summation::AddFD(int, unsigned long)@Base" 0.8.0
++ (c++)"SHA1Summation::Result()@Base" 0.8.0
++ (c++)"SHA1Summation::SHA1Summation()@Base" 0.8.0
++ (c++)"WeakPointable::~WeakPointable()@Base" 0.8.0
++ (c++)"debListParser::NewVersion(pkgCache::VerIterator&)@Base" 0.8.0
++ (c++)"debListParser::UsePackage(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.0
++ (c++)"debListParser::Description()@Base" 0.8.0
++ (c++)"debListParser::ParseStatus(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.0
++ (c++)"debListParser::VersionHash()@Base" 0.8.0
++ (c++)"debListParser::Architecture()@Base" 0.8.0
++ (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&)@Base" 0.8.0
++ (c++)"debListParser::ParseDepends(pkgCache::VerIterator&, char const*, unsigned int)@Base" 0.8.0
++ (c++)"debListParser::ParseProvides(pkgCache::VerIterator&)@Base" 0.8.0
++ (c++)"debListParser::ArchitectureAll()@Base" 0.8.0
++ (c++)"debListParser::ConvertRelation(char const*, unsigned int&)@Base" 0.8.0
++ (c++)"debListParser::Description_md5()@Base" 0.8.0
++ (c++)"debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator&, FileFd&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"debListParser::UniqFindTagWrite(char const*)@Base" 0.8.0
++ (c++)"debListParser::DescriptionLanguage()@Base" 0.8.0
++ (c++)"debListParser::Size()@Base" 0.8.0
++ (c++)"debListParser::Step()@Base" 0.8.0
++ (c++)"debListParser::Offset()@Base" 0.8.0
++ (c++)"debListParser::GetPrio(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"debListParser::Package()@Base" 0.8.0
++ (c++)"debListParser::Version()@Base" 0.8.0
++ (c++)"debListParser::GrabWord(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, debListParser::WordList*, unsigned char&)@Base" 0.8.0
++ (c++)"debListParser::debListParser(FileFd*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"debListParser::~debListParser()@Base" 0.8.0
++ (c++)"pkgAcqArchive::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqArchive::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqArchive::DescURI()@Base" 0.8.0
++ (c++)"pkgAcqArchive::HashSum()@Base" 0.8.0
++ (c++)"pkgAcqArchive::Finished()@Base" 0.8.0
++ (c++)"pkgAcqArchive::IsTrusted()@Base" 0.8.0
++ (c++)"pkgAcqArchive::QueueNext()@Base" 0.8.0
++ (c++)"pkgAcqArchive::ShortDesc()@Base" 0.8.0
++ (c++)"pkgAcqArchive::pkgAcqArchive(pkgAcquire*, pkgSourceList*, pkgRecords*, pkgCache::VerIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
++ (c++)"pkgAcqArchive::~pkgAcqArchive()@Base" 0.8.0
++ (c++)"pkgAcqMetaSig::Custom600Headers()@Base" 0.8.0
++ (c++)"pkgAcqMetaSig::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqMetaSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqMetaSig::DescURI()@Base" 0.8.0
++ (c++)"pkgAcqMetaSig::~pkgAcqMetaSig()@Base" 0.8.0
++ (c++)"pkgSourceList::ReadAppend(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgSourceList::ReadMainList()@Base" 0.8.0
++ (c++)"pkgSourceList::ReadSourceDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgSourceList::Read(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgSourceList::Type::GlobalList@Base" 0.8.0
++ (c++)"pkgSourceList::Type::GlobalListLen@Base" 0.8.0
++ (c++)"pkgSourceList::Type::GetType(char const*)@Base" 0.8.0
++ (c++)"pkgSourceList::Type::Type()@Base" 0.8.0
++ (c++)"pkgSourceList::Type::~Type()@Base" 0.8.0
++ (c++)"pkgSourceList::Reset()@Base" 0.8.0
++ (c++)"pkgSourceList::pkgSourceList(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgSourceList::pkgSourceList()@Base" 0.8.0
++ (c++)"pkgSourceList::~pkgSourceList()@Base" 0.8.0
++ (c++)"pkgSrcRecords::File::~File()@Base" 0.8.0
++ (c++)"pkgSrcRecords::Find(char const*, bool const&)@Base" 0.8.0
++ (c++)"pkgSrcRecords::Parser::BuildDepRec::~BuildDepRec()@Base" 0.8.0
++ (c++)"pkgSrcRecords::Parser::BuildDepType(unsigned char const&)@Base" 0.8.0
++ (c++)"pkgSrcRecords::Parser::~Parser()@Base" 0.8.0
++ (c++)"pkgSrcRecords::Restart()@Base" 0.8.0
++ (c++)"pkgSrcRecords::pkgSrcRecords(pkgSourceList&)@Base" 0.8.0
++ (c++)"pkgSrcRecords::~pkgSrcRecords()@Base" 0.8.0
++ (c++)"pkgTagSection::TrimRecord(bool, char const*&)@Base" 0.8.0
++ (c++)"pkgTagSection::Scan(char const*, unsigned long)@Base" 0.8.0
++ (c++)"pkgTagSection::Trim()@Base" 0.8.0
++ (c++)"pkgVendorList::CreateList(Configuration&)@Base" 0.8.0
++ (c++)"pkgVendorList::FindVendor(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >)@Base" 0.8.0
++ (c++)"pkgVendorList::ReadMainList()@Base" 0.8.0
++ (c++)"pkgVendorList::LookupFingerprint(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgVendorList::Read(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgVendorList::~pkgVendorList()@Base" 0.8.0
++ (c++)"OpTextProgress::Done()@Base" 0.8.0
++ (c++)"OpTextProgress::Write(char const*)@Base" 0.8.0
++ (c++)"OpTextProgress::Update()@Base" 0.8.0
++ (c++)"OpTextProgress::OpTextProgress(Configuration&)@Base" 0.8.0
++ (c++)"OpTextProgress::~OpTextProgress()@Base" 0.8.0
++ (c++)"SHA256SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"SHA256SumValue::SHA256SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"SHA256SumValue::SHA256SumValue()@Base" 0.8.0
++ (c++)"debIFTypeTrans::~debIFTypeTrans()@Base" 0.8.0
++ (c++)"debStatusIndex::debStatusIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"debStatusIndex::~debStatusIndex()@Base" 0.8.0
++ (c++)"SHA256Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
++ (c++)"SHA256Summation::AddFD(int, unsigned long)@Base" 0.8.0
++ (c++)"SHA256Summation::Result()@Base" 0.8.0
++ (c++)"SHA256Summation::SHA256Summation()@Base" 0.8.0
++ (c++)"debIFTypeStatus::~debIFTypeStatus()@Base" 0.8.0
++ (c++)"debRecordParser::Maintainer()@Base" 0.8.0
++ (c++)"debRecordParser::SHA256Hash()@Base" 0.8.0
++ (c++)"debRecordParser::Jump(pkgCache::VerFileIterator const&)@Base" 0.8.0
++ (c++)"debRecordParser::Jump(pkgCache::DescFileIterator const&)@Base" 0.8.0
++ (c++)"debRecordParser::Name()@Base" 0.8.0
++ (c++)"debRecordParser::GetRec(char const*&, char const*&)@Base" 0.8.0
++ (c++)"debRecordParser::MD5Hash()@Base" 0.8.0
++ (c++)"debRecordParser::FileName()@Base" 0.8.0
++ (c++)"debRecordParser::Homepage()@Base" 0.8.0
++ (c++)"debRecordParser::LongDesc()@Base" 0.8.0
++ (c++)"debRecordParser::SHA1Hash()@Base" 0.8.0
++ (c++)"debRecordParser::ShortDesc()@Base" 0.8.0
++ (c++)"debRecordParser::SourcePkg()@Base" 0.8.0
++ (c++)"debRecordParser::SourceVer()@Base" 0.8.0
++ (c++)"debRecordParser::debRecordParser(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgCache&)@Base" 0.8.0
++ (c++)"debRecordParser::~debRecordParser()@Base" 0.8.0
++ (c++)"debReleaseIndex::GetIndexFiles()@Base" 0.8.0
++ (c++)"debReleaseIndex::debSectionEntry::debSectionEntry(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&)@Base" 0.8.0
++ (c++)"debReleaseIndex::PushSectionEntry(debReleaseIndex::debSectionEntry const*)@Base" 0.8.0
++ (c++)"debReleaseIndex::PushSectionEntry(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, debReleaseIndex::debSectionEntry const*)@Base" 0.8.0
++ (c++)"debReleaseIndex::PushSectionEntry(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, debReleaseIndex::debSectionEntry const*)@Base" 0.8.0
++ (c++)"debReleaseIndex::debReleaseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"debReleaseIndex::~debReleaseIndex()@Base" 0.8.0
++ (c++)"debSLTypeDebSrc::~debSLTypeDebSrc()@Base" 0.8.0
++ (c++)"debSLTypeDebian::~debSLTypeDebian()@Base" 0.8.0
++ (c++)"debSourcesIndex::debSourcesIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.8.0
++ (c++)"debSourcesIndex::~debSourcesIndex()@Base" 0.8.0
++ (c++)"pkgAcqDiffIndex::ParseDiffIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcqDiffIndex::Custom600Headers()@Base" 0.8.0
++ (c++)"pkgAcqDiffIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqDiffIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqDiffIndex::DescURI()@Base" 0.8.0
++ (c++)"pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashString)@Base" 0.8.0
++ (c++)"pkgAcqDiffIndex::~pkgAcqDiffIndex()@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::QueueIndexes(bool)@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::VerifyVendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::RetrievalDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::Custom600Headers()@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::DescURI()@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::AuthDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0
++ (c++)"pkgAcqMetaIndex::~pkgAcqMetaIndex()@Base" 0.8.0
++ (c++)"pkgVersionMatch::ExpressionMatches(char const*, char const*)@Base" 0.8.0
++ (c++)"pkgVersionMatch::ExpressionMatches(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@Base" 0.8.0
++ (c++)"pkgVersionMatch::Find(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgVersionMatch::MatchVer(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.8.0
++ (c++)"pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator)@Base" 0.8.0
++ (c++)"pkgVersionMatch::pkgVersionMatch(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgVersionMatch::MatchType)@Base" 0.8.0
++ (c++)"pkgVersionMatch::~pkgVersionMatch()@Base" 0.8.0
++ (c++)"TranslationsCopy::CopyTranslations(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, pkgCdromStatus*)@Base" 0.8.0
++ (c++)"debPackagesIndex::debPackagesIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"debPackagesIndex::~debPackagesIndex()@Base" 0.8.0
++ (c++)"pkgAcqIndexDiffs::QueueNextDiff()@Base" 0.8.0
++ (c++)"pkgAcqIndexDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqIndexDiffs::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqIndexDiffs::Finish(bool)@Base" 0.8.0
++ (c++)"pkgAcqIndexDiffs::DescURI()@Base" 0.8.0
++ (c++)"pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashString, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<DiffInfo, std::allocator<DiffInfo> >)@Base" 0.8.0
++ (c++)"pkgAcqIndexDiffs::~pkgAcqIndexDiffs()@Base" 0.8.0
++ (c++)"pkgAcqIndexTrans::Custom600Headers()@Base" 0.8.0
++ (c++)"pkgAcqIndexTrans::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
++ (c++)"pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgAcqIndexTrans::~pkgAcqIndexTrans()@Base" 0.8.0
++ (c++)"pkgAcquireStatus::Done(pkgAcquire::ItemDesc&)@Base" 0.8.0
++ (c++)"pkgAcquireStatus::Fail(pkgAcquire::ItemDesc&)@Base" 0.8.0
++ (c++)"pkgAcquireStatus::Stop()@Base" 0.8.0
++ (c++)"pkgAcquireStatus::Fetch(pkgAcquire::ItemDesc&)@Base" 0.8.0
++ (c++)"pkgAcquireStatus::Pulse(pkgAcquire*)@Base" 0.8.0
++ (c++)"pkgAcquireStatus::Start()@Base" 0.8.0
++ (c++)"pkgAcquireStatus::IMSHit(pkgAcquire::ItemDesc&)@Base" 0.8.0
++ (c++)"pkgAcquireStatus::Fetched(unsigned long, unsigned long)@Base" 0.8.0
++ (c++)"pkgAcquireStatus::pkgAcquireStatus()@Base" 0.8.0
++ (c++)"pkgAcquireStatus::~pkgAcquireStatus()@Base" 0.8.0
++ (c++)"PreferenceSection::TrimRecord(bool, char const*&)@Base" 0.8.0
++ (c++)"pkgArchiveCleaner::Go(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgCache&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int, unsigned int)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::ListParser::CollectFileProvides(pkgCache&, pkgCache::VerIterator&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0
++ (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int const&, unsigned int const&, unsigned int*)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::NewFileVer(pkgCache::VerIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::NewPackage(pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned long)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::SelectFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgIndexFile const&, unsigned long)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::AllocateInMap(unsigned long const&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::NewDescription(pkgCache::DescIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, MD5SumValue const&, unsigned int)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::MakeStatusCache(pkgSourceList&, OpProgress*, MMap**, bool)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::WriteUniqString(char const*, unsigned int)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::WriteStringInMap(char const*)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::WriteStringInMap(char const*, unsigned long const&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::CreateDynamicMMap(FileFd*, unsigned long)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::MergeFileProvides(pkgCacheGenerator::ListParser&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::MakeOnlyStatusCache(OpProgress*, DynamicMMap**)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::ReMap(void const*, void const*)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::Dynamic<pkgCache::DepIterator>::toReMap@Base" 0.8.0
++ (c++)"pkgCacheGenerator::Dynamic<pkgCache::GrpIterator>::toReMap@Base" 0.8.0
++ (c++)"pkgCacheGenerator::Dynamic<pkgCache::PkgIterator>::toReMap@Base" 0.8.0
++ (c++)"pkgCacheGenerator::Dynamic<pkgCache::PrvIterator>::toReMap@Base" 0.8.0
++ (c++)"pkgCacheGenerator::Dynamic<pkgCache::VerIterator>::toReMap@Base" 0.8.0
++ (c++)"pkgCacheGenerator::Dynamic<pkgCache::DescIterator>::toReMap@Base" 0.8.0
++ (c++)"pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator>::toReMap@Base" 0.8.0
++ (c++)"pkgCacheGenerator::NewGroup(pkgCache::GrpIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::MergeList(pkgCacheGenerator::ListParser&, pkgCache::VerIterator*)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::pkgCacheGenerator(DynamicMMap*, OpProgress*)@Base" 0.8.0
++ (c++)"pkgCacheGenerator::~pkgCacheGenerator()@Base" 0.8.0
++ (c++)"pkgPackageManager::FixMissing()@Base" 0.8.0
++ (c++)"pkgPackageManager::EarlyRemove(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgPackageManager::GetArchives(pkgAcquire*, pkgSourceList*, pkgRecords*)@Base" 0.8.0
++ (c++)"pkgPackageManager::SmartRemove(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgPackageManager::ConfigureAll()@Base" 0.8.0
++ (c++)"pkgPackageManager::ImmediateAdd(pkgCache::PkgIterator, bool, unsigned int const&)@Base" 0.8.0
++ (c++)"pkgPackageManager::OrderInstall()@Base" 0.8.0
++ (c++)"pkgPackageManager::DepAlwaysTrue(pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgPackageManager::CheckRConflicts(pkgCache::PkgIterator, pkgCache::DepIterator, char const*)@Base" 0.8.0
++ (c++)"pkgPackageManager::CreateOrderList()@Base" 0.8.0
++ (c++)"pkgPackageManager::DoInstallPostFork(int)@Base" 0.8.0
++ (c++)"pkgPackageManager::Go(int)@Base" 0.8.0
++ (c++)"pkgPackageManager::Reset()@Base" 0.8.0
++ (c++)"pkgPackageManager::DepAdd(pkgOrderList&, pkgCache::PkgIterator, int)@Base" 0.8.0
++ (c++)"pkgPackageManager::Remove(pkgCache::PkgIterator, bool)@Base" 0.8.0
++ (c++)"pkgPackageManager::Install(pkgCache::PkgIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgPackageManager::Configure(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgPackageManager::DoInstall(int)@Base" 0.8.0
++ (c++)"pkgPackageManager::pkgPackageManager(pkgDepCache*)@Base" 0.8.0
++ (c++)"pkgPackageManager::~pkgPackageManager()@Base" 0.8.0
++ (c++)"debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDepRec, std::allocator<pkgSrcRecords::Parser::BuildDepRec> >&, bool const&, bool const&)@Base" 0.8.0
++ (c++)"debSrcRecordParser::Jump(unsigned long const&)@Base" 0.8.0
++ (c++)"debSrcRecordParser::Step()@Base" 0.8.0
++ (c++)"debSrcRecordParser::AsStr()@Base" 0.8.0
++ (c++)"debSrcRecordParser::Files(std::vector<pkgSrcRecords::File, std::allocator<pkgSrcRecords::File> >&)@Base" 0.8.0
++ (c++)"debSrcRecordParser::Offset()@Base" 0.8.0
++ (c++)"debSrcRecordParser::Restart()@Base" 0.8.0
++ (c++)"debSrcRecordParser::Binaries()@Base" 0.8.0
++ (c++)"debSrcRecordParser::~debSrcRecordParser()@Base" 0.8.0
++ (c++)"pkgProblemResolver::MakeScores()@Base" 0.8.0
++ (c++)"pkgProblemResolver::ResolveByKeep()@Base" 0.8.0
++ (c++)"pkgProblemResolver::InstallProtect()@Base" 0.8.0
++ (c++)"pkgProblemResolver::This@Base" 0.8.0
++ (c++)"pkgProblemResolver::Resolve(bool)@Base" 0.8.0
++ (c++)"pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgProblemResolver::ScoreSort(void const*, void const*)@Base" 0.8.0
++ (c++)"pkgProblemResolver::pkgProblemResolver(pkgDepCache*)@Base" 0.8.0
++ (c++)"pkgProblemResolver::~pkgProblemResolver()@Base" 0.8.0
++ (c++)"debVersioningSystem::CmpFragment(char const*, char const*, char const*, char const*)@Base" 0.8.0
++ (c++)"debVersioningSystem::DoCmpVersion(char const*, char const*, char const*, char const*)@Base" 0.8.0
++ (c++)"debVersioningSystem::DoCmpReleaseVer(char const*, char const*, char const*, char const*)@Base" 0.8.0
++ (c++)"debVersioningSystem::UpstreamVersion(char const*)@Base" 0.8.0
++ (c++)"debVersioningSystem::CheckDep(char const*, int, char const*)@Base" 0.8.0
++ (c++)"debVersioningSystem::debVersioningSystem()@Base" 0.8.0
++ (c++)"debVersioningSystem::~debVersioningSystem()@Base" 0.8.0
++ (c++)"pkgUdevCdromDevices::Scan()@Base" 0.8.0
++ (c++)"pkgUdevCdromDevices::Dlopen()@Base" 0.8.0
++ (c++)"pkgUdevCdromDevices::pkgUdevCdromDevices()@Base" 0.8.0
++ (c++)"pkgUdevCdromDevices::~pkgUdevCdromDevices()@Base" 0.8.0
++ (c++)"pkgVersioningSystem::GlobalList@Base" 0.8.0
++ (c++)"pkgVersioningSystem::GlobalListLen@Base" 0.8.0
++ (c++)"pkgVersioningSystem::TestCompatibility(pkgVersioningSystem const&)@Base" 0.8.0
++ (c++)"pkgVersioningSystem::GetVS(char const*)@Base" 0.8.0
++ (c++)"pkgVersioningSystem::pkgVersioningSystem()@Base" 0.8.0
++ (c++)"pkgVersioningSystem::~pkgVersioningSystem()@Base" 0.8.0
++ (c++)"debTranslationsIndex::debTranslationsIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, char const*)@Base" 0.8.0
++ (c++)"debTranslationsIndex::~debTranslationsIndex()@Base" 0.8.0
++ (c++)"APT::PackageSet::FromString(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::PackageSet::FromCommandLine(pkgCacheFile&, char const**, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::PackageSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list<APT::PackageSet::Modifier, std::allocator<APT::PackageSet::Modifier> > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::PackageSet::FromName(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::PackageSet::FromTask(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::PackageSet::FromRegEx(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::PackageSet::~PackageSet()@Base" 0.8.0
++ (c++)"APT::VersionSet::FromString(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::VersionSet::Version const&, APT::CacheSetHelper&, bool const&)@Base" 0.8.0
++ (c++)"APT::VersionSet::FromPackage(pkgCacheFile&, pkgCache::PkgIterator const&, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::VersionSet::FromCommandLine(pkgCacheFile&, char const**, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::VersionSet::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::VersionSet::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::VersionSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list<APT::VersionSet::Modifier, std::allocator<APT::VersionSet::Modifier> > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0
++ (c++)"APT::VersionSet::~VersionSet()@Base" 0.8.0
++ (c++)"APT::CacheFilter::PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"APT::CacheFilter::PackageNameMatchesRegEx::~PackageNameMatchesRegEx()@Base" 0.8.0
++ (c++)"APT::CacheFilter::PackageNameMatchesRegEx::operator()(pkgCache::GrpIterator const&)@Base" 0.8.0
++ (c++)"APT::CacheFilter::PackageNameMatchesRegEx::operator()(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"APT::Configuration::getLanguages(bool const&, bool const&, char const**)@Base" 0.8.0
++ (c++)"APT::Configuration::getArchitectures(bool const&)@Base" 0.8.0
++ (c++)"APT::Configuration::checkArchitecture(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"APT::Configuration::getCompressionTypes(bool const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindTask(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindRegEx(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindAllVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindPackage(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindPkgName(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::showTaskSelection(APT::PackageSet const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::showRegExSelection(APT::PackageSet const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindNewestVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const&, pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindCandInstVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindInstCandVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::canNotFindInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"APT::CacheSetHelper::~CacheSetHelper()@Base" 0.8.0
++ (c++)"URI::NoUserPassword(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"URI::CopyFrom(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"URI::SiteOnly(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"URI::~URI()@Base" 0.8.0
++ (c++)"URI::operator std::basic_string<char, std::char_traits<char>, std::allocator<char> >()@Base" 0.8.0
++ (c++)"MMap::Map(FileFd&)@Base" 0.8.0
++ (c++)"MMap::Sync(unsigned long, unsigned long)@Base" 0.8.0
++ (c++)"MMap::Sync()@Base" 0.8.0
++ (c++)"MMap::Close(bool)@Base" 0.8.0
++ (c++)"MMap::MMap(FileFd&, unsigned long)@Base" 0.8.0
++ (c++)"MMap::MMap(unsigned long)@Base" 0.8.0
++ (c++)"MMap::~MMap()@Base" 0.8.0
++ (c++)"FileFd::OpenDescriptor(int, FileFd::OpenMode, bool)@Base" 0.8.0
++ (c++)"FileFd::Open(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, FileFd::OpenMode, unsigned long)@Base" 0.8.0
++ (c++)"FileFd::Read(void*, unsigned long, unsigned long*)@Base" 0.8.0
++ (c++)"FileFd::Seek(unsigned long)@Base" 0.8.0
++ (c++)"FileFd::Size()@Base" 0.8.0
++ (c++)"FileFd::Skip(unsigned long)@Base" 0.8.0
++ (c++)"FileFd::Sync()@Base" 0.8.0
++ (c++)"FileFd::Tell()@Base" 0.8.0
++ (c++)"FileFd::Close()@Base" 0.8.0
++ (c++)"FileFd::Write(void const*, unsigned long)@Base" 0.8.0
++ (c++)"FileFd::Truncate(unsigned long)@Base" 0.8.0
++ (c++)"FileFd::~FileFd()@Base" 0.8.0
++ (c++)"Hashes::AddFD(int, unsigned long)@Base" 0.8.0
++ (c++)"Vendor::CheckDist(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"Vendor::Vendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<Vendor::Fingerprint*, std::allocator<Vendor::Fingerprint*> >*)@Base" 0.8.0
++ (c++)"Vendor::~Vendor()@Base" 0.8.0
++ (c++)"DiffInfo::~DiffInfo()@Base" 0.8.0
++ (c++)"pkgCache::CompTypeDeb(unsigned char)@Base" 0.8.0
++ (c++)"pkgCache::DepIterator::GlobOr(pkgCache::DepIterator&, pkgCache::DepIterator&)@Base" 0.8.0
++ (c++)"pkgCache::DepIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::DepIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::GrpIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::GrpIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::PkgIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::PkgIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::PrvIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::PrvIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::DescIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::DescIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::PkgFileIterator::IsOk()@Base" 0.8.0
++ (c++)"pkgCache::PkgFileIterator::RelStr()@Base" 0.8.0
++ (c++)"pkgCache::PkgFileIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::PkgFileIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::VerFileIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::VerFileIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::DescFileIterator::operator++(int)@Base" 0.8.0
++ (c++)"pkgCache::DescFileIterator::operator++()@Base" 0.8.0
++ (c++)"pkgCache::SingleArchFindPkg(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgCache::ReMap(bool const&)@Base" 0.8.0
++ (c++)"pkgCache::Header::Header()@Base" 0.8.0
++ (c++)"pkgCache::DepType(unsigned char)@Base" 0.8.0
++ (c++)"pkgCache::FindGrp(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgCache::FindPkg(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgCache::FindPkg(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgCache::CompType(unsigned char)@Base" 0.8.0
++ (c++)"pkgCache::Priority(unsigned char)@Base" 0.8.0
++ (c++)"pkgCache::pkgCache(MMap*, bool)@Base" 0.8.0
++ (c++)"pkgCache::~pkgCache()@Base" 0.8.0
++ (c++)"pkgCdrom::DropRepeats(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, char const*)@Base" 0.8.0
++ (c++)"pkgCdrom::FindPackages(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, pkgCdromStatus*, unsigned int)@Base" 0.8.0
++ (c++)"pkgCdrom::WriteDatabase(Configuration&)@Base" 0.8.0
++ (c++)"pkgCdrom::DropBinaryArch(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&)@Base" 0.8.0
++ (c++)"pkgCdrom::WriteSourceList(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, bool)@Base" 0.8.0
++ (c++)"pkgCdrom::ReduceSourcelist(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&)@Base" 0.8.0
++ (c++)"pkgCdrom::Add(pkgCdromStatus*)@Base" 0.8.0
++ (c++)"pkgCdrom::Ident(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, pkgCdromStatus*)@Base" 0.8.0
++ (c++)"pkgCdrom::Score(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"IndexCopy::CopyPackages(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, pkgCdromStatus*)@Base" 0.8.0
++ (c++)"IndexCopy::ReconstructChop(unsigned long&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"IndexCopy::ReconstructPrefix(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"IndexCopy::ConvertToSourceList(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
++ (c++)"IndexCopy::ChopDirs(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int)@Base" 0.8.0
++ (c++)"IndexCopy::GrabFirst(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int)@Base" 0.8.0
++ (c++)"IndexCopy::~IndexCopy()@Base" 0.8.0
++ (c++)"SigVerify::CopyAndVerify(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >)@Base" 0.8.0
++ (c++)"SigVerify::CopyMetaIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"SigVerify::Verify(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, indexRecords*)@Base" 0.8.0
++ (c++)"SigVerify::RunGPGV(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int const&, int*)@Base" 0.8.0
++ (c++)"debSystem::Initialize(Configuration&)@Base" 0.8.0
++ (c++)"debSystem::CheckUpdates()@Base" 0.8.0
++ (c++)"debSystem::AddStatusFiles(std::vector<pkgIndexFile*, std::allocator<pkgIndexFile*> >&)@Base" 0.8.0
++ (c++)"debSystem::ArchiveSupported(char const*)@Base" 0.8.0
++ (c++)"debSystem::Lock()@Base" 0.8.0
++ (c++)"debSystem::Score(Configuration const&)@Base" 0.8.0
++ (c++)"debSystem::UnLock(bool)@Base" 0.8.0
++ (c++)"debSystem::debSystem()@Base" 0.8.0
++ (c++)"debSystem::~debSystem()@Base" 0.8.0
++ (c++)"metaIndex::~metaIndex()@Base" 0.8.0
++ (c++)"pkgDPkgPM::SendV2Pkgs(_IO_FILE*)@Base" 0.8.0
++ (c++)"pkgDPkgPM::DoTerminalPty(int)@Base" 0.8.0
++ (c++)"pkgDPkgPM::DoDpkgStatusFd(int, int)@Base" 0.8.0
++ (c++)"pkgDPkgPM::WriteHistoryTag(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgDPkgPM::WriteApportReport(char const*, char const*)@Base" 0.8.0
++ (c++)"pkgDPkgPM::RunScriptsWithPkgs(char const*)@Base" 0.8.0
++ (c++)"pkgDPkgPM::ProcessDpkgStatusLine(int, char*)@Base" 0.8.0
++ (c++)"pkgDPkgPM::handleDisappearAction(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
++ (c++)"pkgDPkgPM::Go(int)@Base" 0.8.0
++ (c++)"pkgDPkgPM::Reset()@Base" 0.8.0
++ (c++)"pkgDPkgPM::Remove(pkgCache::PkgIterator, bool)@Base" 0.8.0
++ (c++)"pkgDPkgPM::DoStdin(int)@Base" 0.8.0
++ (c++)"pkgDPkgPM::Install(pkgCache::PkgIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
++ (c++)"pkgDPkgPM::OpenLog()@Base" 0.8.0
++ (c++)"pkgDPkgPM::CloseLog()@Base" 0.8.0
++ (c++)"pkgDPkgPM::Configure(pkgCache::PkgIterator)@Base" 0.8.0
++ (c++)"pkgDPkgPM::pkgDPkgPM(pkgDepCache*)@Base" 0.8.0
++ (c++)"pkgDPkgPM::~pkgDPkgPM()@Base" 0.8.0
++ (c++)"pkgPolicy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"pkgPolicy::InitDefaults()@Base" 0.8.0
++ (c++)"pkgPolicy::IsImportantDep(pkgCache::DepIterator const&)@Base" 0.8.0
++ (c++)"pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"pkgPolicy::PkgPin::~PkgPin()@Base" 0.8.0
++ (c++)"pkgPolicy::GetMatch(pkgCache::PkgIterator const&)@Base" 0.8.0
++ (c++)"pkgPolicy::CreatePin(pkgVersionMatch::MatchType, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, short)@Base" 0.8.0
++ (c++)"pkgPolicy::pkgPolicy(pkgCache*)@Base" 0.8.0
++ (c++)"pkgPolicy::~pkgPolicy()@Base" 0.8.0
++ (c++)"pkgSystem::GlobalList@Base" 0.8.0
++ (c++)"pkgSystem::Initialize(Configuration&)@Base" 0.8.0
++ (c++)"pkgSystem::GlobalListLen@Base" 0.8.0
++ (c++)"pkgSystem::Score(Configuration const&)@Base" 0.8.0
++ (c++)"pkgSystem::GetSystem(char const*)@Base" 0.8.0
++ (c++)"pkgSystem::pkgSystem()@Base" 0.8.0
++ (c++)"pkgSystem::~pkgSystem()@Base" 0.8.0
++ (c++)"HashString::VerifyFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
++ (c++)"HashString::empty() const@Base" 0.8.0
++ (c++)"HashString::toStr() const@Base" 0.8.0
++ (c++)"CommandLine::FileSize() const@Base" 0.8.0
++ (c++)"GlobalError::empty(GlobalError::MsgType const&) const@Base" 0.8.0
++ (c++)"MD5SumValue::Value() const@Base" 0.8.0
++ (c++)"MD5SumValue::operator==(MD5SumValue const&) const@Base" 0.8.0
++ (c++)"SHA1SumValue::Value() const@Base" 0.8.0
++ (c++)"SHA1SumValue::operator==(SHA1SumValue const&) const@Base" 0.8.0
++ (c++)"debIFTypePkg::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
++ (c++)"debSLTypeDeb::CreateItem(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 0.8.0
++ (c++)"indexRecords::GetValidUntil() const@Base" 0.8.0
++ (c++)"indexRecords::GetExpectedDist() const@Base" 0.8.0
++ (c++)"indexRecords::Exists(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"indexRecords::GetDist() const@Base" 0.8.0
++ (c++)"indexRecords::CheckDist(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
++ (c++)"pkgIndexFile::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
++ (c++)"pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const&, pkgSrcRecords::File const&) const@Base" 0.8.0
++ (c++)"pkgIndexFile::ArchiveInfo(pkgCache::VerIterator) const@Base" 0.8.0
++ (c++)"pkgIndexFile::FindInCache(pkgCache&) const@Base" 0.8.0
++ (c++)"pkgIndexFile::CreateSrcParser() const@Base" 0.8.0
++ (c++)"pkgIndexFile::MergeFileProvides(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
++ (c++)"pkgIndexFile::MergeFileProvides(pkgCacheGenerator&, OpProgress&) const@Base" 0.8.0
++ (c++)"pkgIndexFile::Type::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
++ (c++)"pkgIndexFile::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
++ (c++)"pkgIndexFile::Merge(pkgCacheGenerator&, OpProgress&) const@Base" 0.8.0
++ (c++)"Configuration::FindVector(char const*) const@Base" 0.8.0
++ (c++)"Configuration::MatchAgainstConfig::Match(char const*) const@Base" 0.8.0
++ (c++)"Configuration::Find(char const*, char const*) const@Base" 0.8.0
++ (c++)"Configuration::Item::FullTag(Configuration::Item const*) const@Base" 0.8.0
++ (c++)"Configuration::FindB(char const*, bool const&) const@Base" 0.8.0
++ (c++)"Configuration::FindI(char const*, int const&) const@Base" 0.8.0
++ (c++)"Configuration::Exists(char const*) const@Base" 0.8.0
++ (c++)"Configuration::FindAny(char const*, char const*) const@Base" 0.8.0
++ (c++)"Configuration::FindDir(char const*, char const*) const@Base" 0.8.0
++ (c++)"Configuration::FindFile(char const*, char const*) const@Base" 0.8.0
++ (c++)"Configuration::ExistsAny(char const*) const@Base" 0.8.0
++ (c++)"pkgSourceList::GetIndexes(pkgAcquire*, bool) const@Base" 0.8.0
++ (c++)"pkgSourceList::Type::FixupURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&) const@Base" 0.8.0
++ (c++)"pkgSourceList::Type::ParseLine(std::vector<metaIndex*, std::allocator<metaIndex*> >&, char const*, unsigned long const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"pkgSourceList::FindIndex(pkgCache::PkgFileIterator, pkgIndexFile*&) const@Base" 0.8.0
++ (c++)"pkgTagSection::Find(char const*, char const*&, char const*&) const@Base" 0.8.0
++ (c++)"pkgTagSection::Find(char const*, unsigned int&) const@Base" 0.8.0
++ (c++)"pkgTagSection::FindI(char const*, long) const@Base" 0.8.0
++ (c++)"pkgTagSection::FindS(char const*) const@Base" 0.8.0
++ (c++)"pkgTagSection::FindULL(char const*, unsigned long long const&) const@Base" 0.8.0
++ (c++)"pkgTagSection::FindFlag(char const*, unsigned long&, unsigned long) const@Base" 0.8.0
++ (c++)"SHA256SumValue::Value() const@Base" 0.8.0
++ (c++)"SHA256SumValue::operator==(SHA256SumValue const&) const@Base" 0.8.0
++ (c++)"debStatusIndex::FindInCache(pkgCache&) const@Base" 0.8.0
++ (c++)"debStatusIndex::HasPackages() const@Base" 0.8.0
++ (c++)"debStatusIndex::Size() const@Base" 0.8.0
++ (c++)"debStatusIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
++ (c++)"debStatusIndex::Exists() const@Base" 0.8.0
++ (c++)"debStatusIndex::GetType() const@Base" 0.8.0
++ (c++)"debStatusIndex::Describe(bool) const@Base" 0.8.0
++ (c++)"debIFTypeStatus::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
++ (c++)"debReleaseIndex::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"debReleaseIndex::GetIndexes(pkgAcquire*, bool const&) const@Base" 0.8.0
++ (c++)"debReleaseIndex::MetaIndexURI(char const*) const@Base" 0.8.0
++ (c++)"debReleaseIndex::MetaIndexFile(char const*) const@Base" 0.8.0
++ (c++)"debReleaseIndex::MetaIndexInfo(char const*) const@Base" 0.8.0
++ (c++)"debReleaseIndex::IndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"debReleaseIndex::SourceIndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"debReleaseIndex::ComputeIndexTargets() const@Base" 0.8.0
++ (c++)"debReleaseIndex::SourceIndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"debReleaseIndex::Info(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"debReleaseIndex::IndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"debReleaseIndex::IsTrusted() const@Base" 0.8.0
++ (c++)"debSLTypeDebSrc::CreateItem(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 0.8.0
++ (c++)"debSLTypeDebian::CreateItemInternal(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 0.8.0
++ (c++)"debSourcesIndex::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
++ (c++)"debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const&, pkgSrcRecords::File const&) const@Base" 0.8.0
++ (c++)"debSourcesIndex::HasPackages() const@Base" 0.8.0
++ (c++)"debSourcesIndex::CreateSrcParser() const@Base" 0.8.0
++ (c++)"debSourcesIndex::Info(char const*) const@Base" 0.8.0
++ (c++)"debSourcesIndex::Size() const@Base" 0.8.0
++ (c++)"debSourcesIndex::Exists() const@Base" 0.8.0
++ (c++)"debSourcesIndex::GetType() const@Base" 0.8.0
++ (c++)"debSourcesIndex::Describe(bool) const@Base" 0.8.0
++ (c++)"debSourcesIndex::IndexURI(char const*) const@Base" 0.8.0
++ (c++)"debPackagesIndex::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
++ (c++)"debPackagesIndex::ArchiveInfo(pkgCache::VerIterator) const@Base" 0.8.0
++ (c++)"debPackagesIndex::FindInCache(pkgCache&) const@Base" 0.8.0
++ (c++)"debPackagesIndex::HasPackages() const@Base" 0.8.0
++ (c++)"debPackagesIndex::Info(char const*) const@Base" 0.8.0
++ (c++)"debPackagesIndex::Size() const@Base" 0.8.0
++ (c++)"debPackagesIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
++ (c++)"debPackagesIndex::Exists() const@Base" 0.8.0
++ (c++)"debPackagesIndex::GetType() const@Base" 0.8.0
++ (c++)"debPackagesIndex::Describe(bool) const@Base" 0.8.0
++ (c++)"debPackagesIndex::IndexURI(char const*) const@Base" 0.8.0
++ (c++)"debSrcRecordParser::Maintainer() const@Base" 0.8.0
++ (c++)"debSrcRecordParser::Package() const@Base" 0.8.0
++ (c++)"debSrcRecordParser::Section() const@Base" 0.8.0
++ (c++)"debSrcRecordParser::Version() const@Base" 0.8.0
++ (c++)"debTranslationsIndex::GetIndexes(pkgAcquire*) const@Base" 0.8.0
++ (c++)"debTranslationsIndex::FindInCache(pkgCache&) const@Base" 0.8.0
++ (c++)"debTranslationsIndex::HasPackages() const@Base" 0.8.0
++ (c++)"debTranslationsIndex::Info(char const*) const@Base" 0.8.0
++ (c++)"debTranslationsIndex::Size() const@Base" 0.8.0
++ (c++)"debTranslationsIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
++ (c++)"debTranslationsIndex::Exists() const@Base" 0.8.0
++ (c++)"debTranslationsIndex::GetType() const@Base" 0.8.0
++ (c++)"debTranslationsIndex::Describe(bool) const@Base" 0.8.0
++ (c++)"debTranslationsIndex::IndexURI(char const*) const@Base" 0.8.0
++ (c++)"Vendor::GetVendorID() const@Base" 0.8.0
++ (c++)"Vendor::LookupFingerprint(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
++ (c++)"pkgCache::DepIterator::AllTargets() const@Base" 0.8.0
++ (c++)"pkgCache::DepIterator::IsCritical() const@Base" 0.8.0
++ (c++)"pkgCache::DepIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::DepIterator::SmartTargetPkg(pkgCache::PkgIterator&) const@Base" 0.8.0
++ (c++)"pkgCache::GrpIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::GrpIterator::FindPreferredPkg(bool const&) const@Base" 0.8.0
++ (c++)"pkgCache::GrpIterator::FindPkg(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
++ (c++)"pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const&) const@Base" 0.8.0
++ (c++)"pkgCache::PkgIterator::CurVersion() const@Base" 0.8.0
++ (c++)"pkgCache::PkgIterator::CandVersion() const@Base" 0.8.0
++ (c++)"pkgCache::PkgIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::PkgIterator::State() const@Base" 0.8.0
++ (c++)"pkgCache::PkgIterator::FullName(bool const&) const@Base" 0.8.0
++ (c++)"pkgCache::PrvIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::CompareVer(pkgCache::VerIterator const&) const@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::NewestFile() const@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::Downloadable() const@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::TranslatedDescription() const@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::Pseudo() const@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::RelStr() const@Base" 0.8.0
++ (c++)"pkgCache::VerIterator::Automatic() const@Base" 0.8.0
++ (c++)"pkgCache::DescIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::PkgFileIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::VerFileIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::DescFileIterator::OwnerPointer() const@Base" 0.8.0
++ (c++)"pkgCache::sHash(char const*) const@Base" 0.8.0
++ (c++)"pkgCache::sHash(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
++ (c++)"pkgCache::Header::CheckSizes(pkgCache::Header&) const@Base" 0.8.0
++ (c++)"debSystem::CreatePM(pkgDepCache*) const@Base" 0.8.0
++ (c++)"debSystem::FindIndex(pkgCache::PkgFileIterator, pkgIndexFile*&) const@Base" 0.8.0
++ (c++)"metaIndex::GetURI() const@Base" 0.8.0
++ (c++)"metaIndex::GetDist() const@Base" 0.8.0
++ (c++)"metaIndex::GetType() const@Base" 0.8.0
++ (c++)"typeinfo for OpProgress@Base" 0.8.0
++ (c++)"typeinfo for SourceCopy@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqFile@Base" 0.8.0
++ (c++)"typeinfo for pkgAcquire@Base" 0.8.0
++ (c++)"typeinfo for DynamicMMap@Base" 0.8.0
++ (c++)"typeinfo for PackageCopy@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqIndex@Base" 0.8.0
++ (c++)"typeinfo for pkgDepCache@Base" 0.8.0
++ (c++)"typeinfo for pkgSimulate@Base" 0.8.0
++ (c++)"typeinfo for debIFTypePkg@Base" 0.8.0
++ (c++)"typeinfo for debIFTypeSrc@Base" 0.8.0
++ (c++)"typeinfo for debSLTypeDeb@Base" 0.8.0
++ (c++)"typeinfo for indexRecords@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqMethod@Base" 0.8.0
++ (c++)"typeinfo for pkgCacheFile@Base" 0.8.0
++ (c++)"typeinfo for pkgIndexFile@Base" 0.8.0
++ (c++)"typeinfo for WeakPointable@Base" 0.8.0
++ (c++)"typeinfo for debListParser@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqArchive@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqMetaSig@Base" 0.8.0
++ (c++)"typeinfo for pkgTagSection@Base" 0.8.0
++ (c++)"typeinfo for OpTextProgress@Base" 0.8.0
++ (c++)"typeinfo for debIFTypeTrans@Base" 0.8.0
++ (c++)"typeinfo for debStatusIndex@Base" 0.8.0
++ (c++)"typeinfo for debIFTypeStatus@Base" 0.8.0
++ (c++)"typeinfo for debRecordParser@Base" 0.8.0
++ (c++)"typeinfo for debReleaseIndex@Base" 0.8.0
++ (c++)"typeinfo for debSLTypeDebSrc@Base" 0.8.0
++ (c++)"typeinfo for debSLTypeDebian@Base" 0.8.0
++ (c++)"typeinfo for debSourcesIndex@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqDiffIndex@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqMetaIndex@Base" 0.8.0
++ (c++)"typeinfo for debPackagesIndex@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqIndexDiffs@Base" 0.8.0
++ (c++)"typeinfo for pkgAcqIndexTrans@Base" 0.8.0
++ (c++)"typeinfo for pkgAcquireStatus@Base" 0.8.0
++ (c++)"typeinfo for PreferenceSection@Base" 0.8.0
++ (c++)"typeinfo for pkgPackageManager@Base" 0.8.0
++ (c++)"typeinfo for debSrcRecordParser@Base" 0.8.0
++ (c++)"typeinfo for debVersioningSystem@Base" 0.8.0
++ (c++)"typeinfo for pkgUdevCdromDevices@Base" 0.8.0
++ (c++)"typeinfo for pkgVersioningSystem@Base" 0.8.0
++ (c++)"typeinfo for debTranslationsIndex@Base" 0.8.0
++ (c++)"typeinfo for MMap@Base" 0.8.0
++ (c++)"typeinfo for FileFd@Base" 0.8.0
++ (c++)"typeinfo for Vendor@Base" 0.8.0
++ (c++)"typeinfo for pkgCache@Base" 0.8.0
++ (c++)"typeinfo for IndexCopy@Base" 0.8.0
++ (c++)"typeinfo for debSystem@Base" 0.8.0
++ (c++)"typeinfo for metaIndex@Base" 0.8.0
++ (c++)"typeinfo for pkgDPkgPM@Base" 0.8.0
++ (c++)"typeinfo for pkgPolicy@Base" 0.8.0
++ (c++)"typeinfo for pkgSystem@Base" 0.8.0
++ (c++)"typeinfo for pkgAcquire::Item@Base" 0.8.0
++ (c++)"typeinfo for pkgRecords::Parser@Base" 0.8.0
++ (c++)"typeinfo for pkgDepCache::InRootSetFunc@Base" 0.8.0
++ (c++)"typeinfo for pkgDepCache::DefaultRootSetFunc@Base" 0.8.0
++ (c++)"typeinfo for pkgDepCache::Policy@Base" 0.8.0
++ (c++)"typeinfo for pkgSimulate::Policy@Base" 0.8.0
++ (c++)"typeinfo for pkgIndexFile::Type@Base" 0.8.0
++ (c++)"typeinfo for Configuration::MatchAgainstConfig@Base" 0.8.0
++ (c++)"typeinfo for pkgSourceList::Type@Base" 0.8.0
++ (c++)"typeinfo for pkgSrcRecords::Parser@Base" 0.8.0
++ (c++)"typeinfo for pkgCacheGenerator::ListParser@Base" 0.8.0
++ (c++)"typeinfo for APT::CacheSetHelper@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::DepIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::GrpIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::PkgIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::PrvIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::VerIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::DescIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::PkgFileIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::VerFileIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::DescFileIterator@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::Description, pkgCache::DescIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::PackageFile, pkgCache::PkgFileIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::Group, pkgCache::GrpIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::VerFile, pkgCache::VerFileIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::DescFile, pkgCache::DescFileIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Iterator<pkgCache::Provides, pkgCache::PrvIterator>@Base" 0.8.0
++ (c++)"typeinfo for pkgCache::Namespace@Base" 0.8.0
++ (c++)"typeinfo name for OpProgress@Base" 0.8.0
++ (c++)"typeinfo name for SourceCopy@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqFile@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcquire@Base" 0.8.0
++ (c++)"typeinfo name for DynamicMMap@Base" 0.8.0
++ (c++)"typeinfo name for PackageCopy@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqIndex@Base" 0.8.0
++ (c++)"typeinfo name for pkgDepCache@Base" 0.8.0
++ (c++)"typeinfo name for pkgSimulate@Base" 0.8.0
++ (c++)"typeinfo name for debIFTypePkg@Base" 0.8.0
++ (c++)"typeinfo name for debIFTypeSrc@Base" 0.8.0
++ (c++)"typeinfo name for debSLTypeDeb@Base" 0.8.0
++ (c++)"typeinfo name for indexRecords@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqMethod@Base" 0.8.0
++ (c++)"typeinfo name for pkgCacheFile@Base" 0.8.0
++ (c++)"typeinfo name for pkgIndexFile@Base" 0.8.0
++ (c++)"typeinfo name for WeakPointable@Base" 0.8.0
++ (c++)"typeinfo name for debListParser@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqArchive@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqMetaSig@Base" 0.8.0
++ (c++)"typeinfo name for pkgTagSection@Base" 0.8.0
++ (c++)"typeinfo name for OpTextProgress@Base" 0.8.0
++ (c++)"typeinfo name for debIFTypeTrans@Base" 0.8.0
++ (c++)"typeinfo name for debStatusIndex@Base" 0.8.0
++ (c++)"typeinfo name for debIFTypeStatus@Base" 0.8.0
++ (c++)"typeinfo name for debRecordParser@Base" 0.8.0
++ (c++)"typeinfo name for debReleaseIndex@Base" 0.8.0
++ (c++)"typeinfo name for debSLTypeDebSrc@Base" 0.8.0
++ (c++)"typeinfo name for debSLTypeDebian@Base" 0.8.0
++ (c++)"typeinfo name for debSourcesIndex@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqDiffIndex@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqMetaIndex@Base" 0.8.0
++ (c++)"typeinfo name for debPackagesIndex@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqIndexDiffs@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcqIndexTrans@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcquireStatus@Base" 0.8.0
++ (c++)"typeinfo name for PreferenceSection@Base" 0.8.0
++ (c++)"typeinfo name for pkgPackageManager@Base" 0.8.0
++ (c++)"typeinfo name for debSrcRecordParser@Base" 0.8.0
++ (c++)"typeinfo name for debVersioningSystem@Base" 0.8.0
++ (c++)"typeinfo name for pkgUdevCdromDevices@Base" 0.8.0
++ (c++)"typeinfo name for pkgVersioningSystem@Base" 0.8.0
++ (c++)"typeinfo name for debTranslationsIndex@Base" 0.8.0
++ (c++)"typeinfo name for MMap@Base" 0.8.0
++ (c++)"typeinfo name for FileFd@Base" 0.8.0
++ (c++)"typeinfo name for Vendor@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache@Base" 0.8.0
++ (c++)"typeinfo name for IndexCopy@Base" 0.8.0
++ (c++)"typeinfo name for debSystem@Base" 0.8.0
++ (c++)"typeinfo name for metaIndex@Base" 0.8.0
++ (c++)"typeinfo name for pkgDPkgPM@Base" 0.8.0
++ (c++)"typeinfo name for pkgPolicy@Base" 0.8.0
++ (c++)"typeinfo name for pkgSystem@Base" 0.8.0
++ (c++)"typeinfo name for pkgAcquire::Item@Base" 0.8.0
++ (c++)"typeinfo name for pkgRecords::Parser@Base" 0.8.0
++ (c++)"typeinfo name for pkgDepCache::InRootSetFunc@Base" 0.8.0
++ (c++)"typeinfo name for pkgDepCache::DefaultRootSetFunc@Base" 0.8.0
++ (c++)"typeinfo name for pkgDepCache::Policy@Base" 0.8.0
++ (c++)"typeinfo name for pkgSimulate::Policy@Base" 0.8.0
++ (c++)"typeinfo name for pkgIndexFile::Type@Base" 0.8.0
++ (c++)"typeinfo name for Configuration::MatchAgainstConfig@Base" 0.8.0
++ (c++)"typeinfo name for pkgSourceList::Type@Base" 0.8.0
++ (c++)"typeinfo name for pkgSrcRecords::Parser@Base" 0.8.0
++ (c++)"typeinfo name for pkgCacheGenerator::ListParser@Base" 0.8.0
++ (c++)"typeinfo name for APT::CacheSetHelper@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::DepIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::GrpIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::PkgIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::PrvIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::VerIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::DescIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::PkgFileIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::VerFileIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::DescFileIterator@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::Description, pkgCache::DescIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::PackageFile, pkgCache::PkgFileIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::Group, pkgCache::GrpIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::VerFile, pkgCache::VerFileIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::DescFile, pkgCache::DescFileIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Iterator<pkgCache::Provides, pkgCache::PrvIterator>@Base" 0.8.0
++ (c++)"typeinfo name for pkgCache::Namespace@Base" 0.8.0
++ (c++)"vtable for OpProgress@Base" 0.8.0
++ (c++)"vtable for SourceCopy@Base" 0.8.0
++ (c++)"vtable for pkgAcqFile@Base" 0.8.0
++ (c++)"vtable for pkgAcquire@Base" 0.8.0
++ (c++)"vtable for DynamicMMap@Base" 0.8.0
++ (c++)"vtable for PackageCopy@Base" 0.8.0
++ (c++)"vtable for pkgAcqIndex@Base" 0.8.0
++ (c++)"vtable for pkgDepCache@Base" 0.8.0
++ (c++)"vtable for pkgSimulate@Base" 0.8.0
++ (c++)"vtable for debIFTypePkg@Base" 0.8.0
++ (c++)"vtable for debIFTypeSrc@Base" 0.8.0
++ (c++)"vtable for debSLTypeDeb@Base" 0.8.0
++ (c++)"vtable for indexRecords@Base" 0.8.0
++ (c++)"vtable for pkgAcqMethod@Base" 0.8.0
++ (c++)"vtable for pkgCacheFile@Base" 0.8.0
++ (c++)"vtable for pkgIndexFile@Base" 0.8.0
++ (c++)"vtable for debListParser@Base" 0.8.0
++ (c++)"vtable for pkgAcqArchive@Base" 0.8.0
++ (c++)"vtable for pkgAcqMetaSig@Base" 0.8.0
++ (c++)"vtable for pkgTagSection@Base" 0.8.0
++ (c++)"vtable for OpTextProgress@Base" 0.8.0
++ (c++)"vtable for debIFTypeTrans@Base" 0.8.0
++ (c++)"vtable for debStatusIndex@Base" 0.8.0
++ (c++)"vtable for debIFTypeStatus@Base" 0.8.0
++ (c++)"vtable for debRecordParser@Base" 0.8.0
++ (c++)"vtable for debReleaseIndex@Base" 0.8.0
++ (c++)"vtable for debSLTypeDebSrc@Base" 0.8.0
++ (c++)"vtable for debSLTypeDebian@Base" 0.8.0
++ (c++)"vtable for debSourcesIndex@Base" 0.8.0
++ (c++)"vtable for pkgAcqDiffIndex@Base" 0.8.0
++ (c++)"vtable for pkgAcqMetaIndex@Base" 0.8.0
++ (c++)"vtable for debPackagesIndex@Base" 0.8.0
++ (c++)"vtable for pkgAcqIndexDiffs@Base" 0.8.0
++ (c++)"vtable for pkgAcqIndexTrans@Base" 0.8.0
++ (c++)"vtable for pkgAcquireStatus@Base" 0.8.0
++ (c++)"vtable for PreferenceSection@Base" 0.8.0
++ (c++)"vtable for pkgPackageManager@Base" 0.8.0
++ (c++)"vtable for debSrcRecordParser@Base" 0.8.0
++ (c++)"vtable for debVersioningSystem@Base" 0.8.0
++ (c++)"vtable for pkgUdevCdromDevices@Base" 0.8.0
++ (c++)"vtable for pkgVersioningSystem@Base" 0.8.0
++ (c++)"vtable for debTranslationsIndex@Base" 0.8.0
++ (c++)"vtable for MMap@Base" 0.8.0
++ (c++)"vtable for FileFd@Base" 0.8.0
++ (c++)"vtable for Vendor@Base" 0.8.0
++ (c++)"vtable for pkgCache@Base" 0.8.0
++ (c++)"vtable for IndexCopy@Base" 0.8.0
++ (c++)"vtable for debSystem@Base" 0.8.0
++ (c++)"vtable for metaIndex@Base" 0.8.0
++ (c++)"vtable for pkgDPkgPM@Base" 0.8.0
++ (c++)"vtable for pkgPolicy@Base" 0.8.0
++ (c++)"vtable for pkgSystem@Base" 0.8.0
++ (c++)"vtable for pkgAcquire::Item@Base" 0.8.0
++ (c++)"vtable for pkgRecords::Parser@Base" 0.8.0
++ (c++)"vtable for pkgDepCache::InRootSetFunc@Base" 0.8.0
++ (c++)"vtable for pkgDepCache::DefaultRootSetFunc@Base" 0.8.0
++ (c++)"vtable for pkgDepCache::Policy@Base" 0.8.0
++ (c++)"vtable for pkgSimulate::Policy@Base" 0.8.0
++ (c++)"vtable for pkgIndexFile::Type@Base" 0.8.0
++ (c++)"vtable for Configuration::MatchAgainstConfig@Base" 0.8.0
++ (c++)"vtable for pkgSourceList::Type@Base" 0.8.0
++ (c++)"vtable for pkgSrcRecords::Parser@Base" 0.8.0
++ (c++)"vtable for pkgCacheGenerator::ListParser@Base" 0.8.0
++ (c++)"vtable for APT::CacheSetHelper@Base" 0.8.0
++ (c++)"vtable for pkgCache::DepIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::GrpIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::PkgIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::PrvIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::VerIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::DescIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::PkgFileIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::VerFileIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::DescFileIterator@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::Description, pkgCache::DescIterator>@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::PackageFile, pkgCache::PkgFileIterator>@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::Group, pkgCache::GrpIterator>@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::VerFile, pkgCache::VerFileIterator>@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::DescFile, pkgCache::DescFileIterator>@Base" 0.8.0
++ (c++)"vtable for pkgCache::Iterator<pkgCache::Provides, pkgCache::PrvIterator>@Base" 0.8.0
++ (c++)"non-virtual thunk to pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()@Base" 0.8.0
++ (c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, pkgCache::DepIterator)@Base" 0.8.0
++ (c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, pkgCache::PkgIterator)@Base" 0.8.0
++ _apt_DebSrcType@Base 0.8.0
++ _apt_DebType@Base 0.8.0
++ _config@Base 0.8.0
++ _system@Base 0.8.0
++ debSys@Base 0.8.0
++ debVS@Base 0.8.0
++ pkgLibVersion@Base 0.8.0
++ pkgVersion@Base 0.8.0
++### demangle strangeness - buildd report it as MISSING and as new…
++ (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0
++### gcc-4.4 specific
++# (c++|optional=inherent)"APT::PackageSet::PackageSet(APT::PackageSet const&)@Base" 0.8.0
++# (c++|optional=inline)"stringcasecmp(char const*, char const*, char const*)@Base" 0.8.0
++# (arch=armel|c++|optional=inline)"stringcasecmp(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@Base" 0.8.0
++# (c++|optional=inherent)"APT::VersionSet::insert(pkgCache::VerIterator const&)@Base" 0.8.0
++# (c++|optional=inline)"APT::VersionSet::insert(APT::VersionSet const&)@Base" 0.8.0
++# (c++|optional=private)"debTranslationsIndex::IndexFile(char const*) const@Base" 0.8.0
++# (c++|optional=inline)"pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>::end() const@Base" 0.8.0
++# (c++|optional=inherent)"HashString::operator=(HashString const&)@Base" 0.8.0
++# (c++|regex|optional=std)"^std::less<[^ ]+>::operator\(\)\(.+\) const@Base$" 0.8.0
++# (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0
++# (c++|regex|optional=std)"^pkgCache::(Dep|Pkg|Ver|Grp|Prv|Desc|PkgFile)Iterator\*\* std::_.+@Base$" 0.8.0
++### gcc-4.5 specific
++ (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0
++ (c++|optional=inline)"FileFd::FileFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, FileFd::OpenMode, unsigned long)@Base" 0.8.0
++ (c++|regex|optional=template)"^SPtrArray<[^ ]+>::~SPtrArray\(\)@Base$" 0.8.0
++ (c++|optional=template)"SPtrArray<unsigned char>::~SPtrArray()@Base" 0.8.0
++### gcc-4.6 specific
++ (c++|optional=template)"SPtrArray<pkgCache::Version*>::~SPtrArray()@Base" 0.8.0
++ (c++|regex|optional=std)"^std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string<char( const|)\*>\(.+\)@Base$" 0.8.0
++ (c++|regex|optional=std)"^std::vector<DiffInfo, .+@Base$" 0.8.0
++ (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0
++ (c++|optional=strange)"pkgCache::VerIterator::VerIterator(pkgCache&, pkgCache::Version*)@Base" 0.8.0
++### architecture specific: va_list & size_t
++ (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4 1
++ (arch=armel armhf|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4 1
++ (arch=alpha|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4 1
++ (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4 1
++ (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4 1
++ (arch=hppa mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4 1
++ (arch=ia64 sparc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4 1
++ (arch=sh4|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4 1
++ (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4 1
++ (arch=armel armhf|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4 1
++ (arch=alpha|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4 1
++ (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4 1
++ (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4 1
++ (arch=hppa mipsel sparc|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4 1
++ (arch=ia64 sparc64|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@Base" 0.8.11.4 1
++ (arch=sh4|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4 1
++### architecture specific: size_t
++ (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0
++ (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0
++ (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mipsel powerpc powerpcspe sh4 sparc|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&)@Base" 0.8.0
++ (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
++### try to ignore std:: template instances
++ (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0
++ (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0
++ (c++|regex|optional=std)"^(void |DiffInfo\* |)std::_.*@Base$" 0.8.0
++ (c++|regex|optional=std)"^(bool|void) std::(operator|sort_heap|make_heap)[^ ]+<.+ >\(.+\)@Base$" 0.8.0
++ (c++|regex|optional=std)"^std::reverse_iterator<.+ > std::__.+@Base$" 0.8.0
++ (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0
++ (c++|regex|optional=std)"^__gnu_cxx::__[^ ]+<.*@Base$" 0.8.0
++ (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0
++ (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0
++###
++ (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1
++ (c++)"CreateAPTDirectoryIfNeeded(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.2
++ (c++)"FileFd::FileSize()@Base" 0.8.8
++ (c++)"Base256ToNum(char const*, unsigned long&, unsigned int)@Base" 0.8.11
++ (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator>, std::allocator<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > >&)@Base" 0.8.11
++ (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
++ (c++)"RealFileExists(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.11
++ (c++)"StripEpoch(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
++ (c++)"IndexTarget::~IndexTarget()@Base" 0.8.11
++ (c++)"pkgAcqIndex::Init(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
++ (c++)"pkgAcqIndex::pkgAcqIndex(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11
++ (c++)"pkgTagSection::FindFlag(unsigned long&, unsigned long, char const*, char const*)@Base" 0.8.11
++ (c++)"pkgAcqSubIndex::ParseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
++ (c++)"pkgAcqSubIndex::Custom600Headers()@Base" 0.8.11
++ (c++)"pkgAcqSubIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11
++ (c++)"pkgAcqSubIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11
++ (c++)"pkgAcqSubIndex::DescURI()@Base" 0.8.11
++ (c++)"pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&)@Base" 0.8.11
++ (c++)"pkgAcqSubIndex::~pkgAcqSubIndex()@Base" 0.8.11
++ (c++)"pkgAcqMetaClearSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11
++ (c++)"pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.11
++ (c++)"pkgAcqMetaClearSig::~pkgAcqMetaClearSig()@Base" 0.8.11
++ (c++)"pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11
++ (c++)"IndexTarget::IsOptional() const@Base" 0.8.11
++ (c++)"IndexTarget::IsSubIndex() const@Base" 0.8.11
++ (c++)"debReleaseIndex::TranslationIndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11
++ (c++)"debReleaseIndex::TranslationIndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11
++ (c++)"typeinfo for pkgAcqSubIndex@Base" 0.8.11
++ (c++)"typeinfo for pkgAcqMetaClearSig@Base" 0.8.11
++ (c++)"typeinfo name for pkgAcqSubIndex@Base" 0.8.11
++ (c++)"typeinfo name for pkgAcqMetaClearSig@Base" 0.8.11
++ (c++)"vtable for pkgAcqSubIndex@Base" 0.8.11
++ (c++)"vtable for pkgAcqMetaClearSig@Base" 0.8.11
++ (c++)"FindMountPointForDevice(char const*)@Base" 0.8.12
++ (c++)"pkgUdevCdromDevices::ScanForRemovable(bool)@Base" 0.8.12
++ (c++)"APT::Configuration::Compressor::Compressor(char const*, char const*, char const*, char const*, char const*, unsigned short)@Base" 0.8.12
++ (c++)"APT::Configuration::Compressor::~Compressor()@Base" 0.8.12
++ (c++)"APT::Configuration::getCompressors(bool)@Base" 0.8.12
++ (c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12
++ (c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12
++ (c++)"pkgDepCache::SetCandidateVersion(pkgCache::VerIterator, bool const&)@Base" 0.8.12
++ (c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13
++ (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2
++ (c++|optional=private)"PrintMode(char)@Base" 0.8.13.2
++ (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2
++ (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1
++ (c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1
++ (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1
diff --combined debian/rules
index b6f45a38e,6c58d82bb..ef30568d5
--- a/debian/rules
+++ b/debian/rules
@@@ -62,7 -62,7 +62,7 @@@ configure.in
  endif
  
  # APT Programs in apt-utils
- APT_UTILS=ftparchive sortpkgs extracttemplates
+ APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver
  
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
@@@ -70,9 -70,9 +70,9 @@@
  # Find the libapt-pkg major version for use in other control files
  include buildlib/libversion.mak
  
 -# Determine which package we should provide in the control files
 -LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR)
 -LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR)
 +# Determine which library package names to use
 +LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR)
 +LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
  
  # do not fail as we are just experimenting with symbol files for now
  export DPKG_GENSYMBOLS_CHECK_LEVEL=0
@@@ -97,10 -97,6 +97,10 @@@ build/configure-stamp: configur
  build/build-stamp: build/configure-stamp
  	# Add here commands to compile the package.
  	$(MAKE) binary
 +	# compat symlink for the locale split
 +	mkdir -p build/usr/share 
 +	cd build/usr/share && ln -f -s ../../locale .
 +	# done here
  	touch $@
  
  build/build-doc-stamp: build/configure-stamp
@@@ -141,7 -137,7 +141,7 @@@ libapt-pkg-doc: build-do
  	dh_compress -p$@
  	dh_fixperms -p$@
  	dh_installdeb -p$@
 -	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
 +	dh_gencontrol -p$@
  	dh_md5sums -p$@
  	dh_builddeb -p$@
  
@@@ -169,7 -165,7 +169,7 @@@ apt-doc: build-do
  
  # Build architecture-dependent files here.
  
 -binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
 +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
  apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
  apt: build build-doc
  	dh_testdir -p$@
@@@ -189,7 -185,7 +189,7 @@@
  	dh_install -p$@ --sourcedir=$(BLD)
  
  	# Remove the bits that are in apt-utils
- 	rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS))
+ 	rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver)
  
  	# https has its own package
  	rm debian/$@/usr/lib/apt/methods/https
@@@ -209,9 -205,10 +209,9 @@@
  	dh_strip -p$@
  	dh_compress -p$@
  	dh_fixperms -p$@
 -	dh_makeshlibs -p$@
  	dh_installdeb -p$@
 -	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
 -	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
 +	dh_shlibdeps -p$@
 +	dh_gencontrol -p$@
  	dh_md5sums -p$@
  	dh_builddeb -p$@
  
@@@ -230,7 -227,7 +230,7 @@@ libapt-pkg-dev: buil
  	dh_compress -p$@
  	dh_fixperms -p$@
  	dh_installdeb -p$@
 -	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
 +	dh_gencontrol -p$@ -- -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST)
  	dh_md5sums -p$@
  	dh_builddeb -p$@
  
@@@ -242,8 -239,10 +242,10 @@@ apt-utils: buil
  	dh_installdirs -p$@
  
  	cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
+ 	cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
  
  	dh_install -p$@ --sourcedir=$(BLD)
+ 	dh_link -p$@
  	dh_installdocs -p$@
  	dh_installexamples -p$@
  
@@@ -256,46 -255,8 +258,46 @@@
  	dh_fixperms -p$@
  	dh_makeshlibs -p$@
  	dh_installdeb -p$@
 -	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
 -	dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
 +	dh_shlibdeps -p$@
 +	dh_gencontrol -p$@
 +	dh_md5sums -p$@
 +	dh_builddeb -p$@
 +
 +$(LIBAPT_PKG): build
 +	dh_testdir -p$@
 +	dh_testroot -p$@
 +	dh_prep -p$@
 +	dh_installdirs -p$@
 +
 +	dh_install -p$@ --sourcedir=$(BLD)
 +	dh_installdocs -p$@
 +	dh_installchangelogs -p$@
 +	dh_strip -p$@
 +	dh_compress -p$@
 +	dh_fixperms -p$@
 +	dh_makeshlibs -p$@
 +	dh_installdeb -p$@
 +	dh_shlibdeps -p$@ 
 +	dh_gencontrol -p$@
 +	dh_md5sums -p$@
 +	dh_builddeb -p$@
 +
 +$(LIBAPT_INST): build
 +	dh_testdir -p$@
 +	dh_testroot -p$@
 +	dh_prep -p$@
 +	dh_installdirs -p$@
 +
 +	dh_install -p$@ --sourcedir=$(BLD)
 +	dh_installdocs -p$@
 +	dh_installchangelogs -p$@
 +	dh_strip -p$@
 +	dh_compress -p$@
 +	dh_fixperms -p$@
 +	dh_makeshlibs -p$@
 +	dh_installdeb -p$@
 +	dh_shlibdeps -p$@ 
 +	dh_gencontrol -p$@
  	dh_md5sums -p$@
  	dh_builddeb -p$@
  
@@@ -317,7 -278,7 +319,7 @@@ apt-transport-https: build libapt-pkg-d
  	dh_compress -p$@
  	dh_fixperms -p$@
  	dh_installdeb -p$@
 -	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
 +	dh_shlibdeps -p$@ 
  	dh_gencontrol -p$@
  	dh_md5sums -p$@
  	dh_builddeb -p$@
diff --combined doc/po/de.po
index 5cb2b708d,891e69964..a608161d3
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -1,14 -1,14 +1,14 @@@
  # Translation of apt-doc to German
  # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
  # This file is distributed under the same license as the apt-doc package.
 -# Chris Leick <c.leick@vollbio.de>, 2009, 2010.
 +# Chris Leick <c.leick@vollbio.de>, 2009-2011.
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: apt-doc 0.7.25.3\n"
 +"Project-Id-Version: apt-doc 0.8.14-1\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
--"POT-Creation-Date: 2011-02-14 13:42+0100\n"
 -"PO-Revision-Date: 2010-09-16 19:04+0100\n"
++"POT-Creation-Date: 2011-06-08 16:54+0300\n"
 +"PO-Revision-Date: 2011-05-31 21:00+0100\n"
  "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
  "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
  "Language: de\n"
@@@ -656,12 -656,16 +656,12 @@@ msgstr "
  #.  The last update date 
  #. type: Content of: <refentry><refentryinfo>
  #: apt-cache.8.xml:16
 -#, fuzzy
 -#| msgid ""
 -#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
 -#| "<date>14 February 2004</date>"
  msgid ""
  "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
  "February 2011</date>"
  msgstr ""
  "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
 -"<date>14. Februar 2004</date>"
 +"<date>04. Februar 2011</date>"
  
  #. type: Content of: <refentry><refnamediv><refname>
  #: apt-cache.8.xml:25 apt-cache.8.xml:32
@@@ -686,10 -690,33 +686,10 @@@ msgstr "APT
  #. type: Content of: <refentry><refnamediv><refpurpose>
  #: apt-cache.8.xml:33
  msgid "query the APT cache"
 -msgstr ""
 +msgstr "den APT-Zwischenspeicher abfragen"
  
  #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
  #: apt-cache.8.xml:39
 -#, fuzzy
 -#| msgid ""
 -#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
 -#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
 -#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
 -#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
 -#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
 -#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
 -#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
 -#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
 -#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
 -#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
 -#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
 -#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
 -#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
 -#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
 -#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
 -#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
 -#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
 -#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
 -#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
 -#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
 -#| "group>"
  msgid ""
  "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
  "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@@ -714,15 -741,16 +714,15 @@@ msgstr "
  "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
  "o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> "
  "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
 -"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
 -"\"><replaceable>Datei</replaceable></arg></arg> <arg>gencaches</arg> "
 -"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
 -"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
 -"\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
 -"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
 -"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain"
 -"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends "
 -"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
 -"arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
 +"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
 +"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg "
 +"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
 +"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
 +"<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</"
 +"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
 +"\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice="
 +"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
 +"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
  "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
  "\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice="
  "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
@@@ -735,7 -763,7 +735,7 @@@
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
  #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114
--#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43
++#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
  #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
  #: sources.list.5.xml:36
  msgid "Description"
@@@ -1254,7 -1282,7 +1254,7 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
--#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92
++#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126
  #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582
  msgid "options"
  msgstr "Optionen"
@@@ -1282,7 -1310,7 +1282,7 @@@ msgstr "
  "pkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393
++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
  #: apt-sortpkgs.1.xml:61
  msgid "<option>-s</option>"
  msgstr "<option>-s</option>"
@@@ -1310,12 -1338,12 +1310,12 @@@ msgstr "
  "srcpkgcache</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>-q</option>"
  msgstr "<option>-q</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383
++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
  msgid "<option>--quiet</option>"
  msgstr "<option>--quiet</option>"
  
@@@ -1430,7 -1458,7 +1430,7 @@@ msgstr "
  "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580
++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
  msgid "<option>-a</option>"
  msgstr "<option>-a</option>"
  
@@@ -1547,14 -1575,14 +1547,14 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist>
  #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
--#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570
--#: apt-sortpkgs.1.xml:67
++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
++#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
  msgid "&apt-commonoptions;"
  msgstr "&apt-commonoptions;"
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125
--#: apt.conf.5.xml:1093 apt_preferences.5.xml:649
++#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144
++#: apt.conf.5.xml:1093 apt_preferences.5.xml:697
  msgid "Files"
  msgstr "Dateien"
  
@@@ -1565,9 -1593,9 +1565,9 @@@ msgstr "&file-sourceslist; &file-statel
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
--#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585
--#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185
--#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656
++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
++#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
++#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
  #: sources.list.5.xml:234
  msgid "See Also"
  msgstr "Siehe auch"
@@@ -1579,8 -1607,8 +1579,8 @@@ msgstr "&apt-conf;, &sources-list;, &ap
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
--#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591
--#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
++#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
  msgid "Diagnostics"
  msgstr "Diagnose"
  
@@@ -1709,12 -1737,12 +1709,12 @@@ msgstr "
  "<placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-cdrom.8.xml:94 apt-key.8.xml:142
++#: apt-cdrom.8.xml:94 apt-key.8.xml:158
  msgid "Options"
  msgstr "Optionen"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345
++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
  msgid "<option>-d</option>"
  msgstr "<option>-d</option>"
  
@@@ -1884,7 -1912,7 +1884,7 @@@ msgstr "
  "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-"
  "o=<replaceable>Konfigurationszeichenkette</replaceable></option></"
  "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group "
 -"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
 +"choice=\"req\"> <arg>shell</arg> <arg>Abbild</arg> </group>"
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-config.8.xml:51
@@@ -1968,7 -1996,7 +1968,7 @@@ msgid "Just show the contents of the co
  msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625
++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
  #: apt-sortpkgs.1.xml:73
  msgid "&apt-conf;"
  msgstr "&apt-conf;"
@@@ -2281,18 -2309,6 +2281,18 @@@ msgid "
  "literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
  "and SHA256 digest for each file."
  msgstr ""
 +"Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem "
 +"Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene "
 +"Verzeichnis nach nicht komprimierten <filename>Packages</filename>- und "
 +"<filename>Sources</filename>-Dateien und denen, die mit <command>gzip</"
 +"command>, <command>bzip2</command> oder <command>lzma</command> komprimiert "
 +"wurden, ebenso wie <filename>Release</filename>- und <filename>md5sum.txt</"
 +"filename>-Dateien (<literal>APT::FTPArchive::Release::Default-Patterns</"
 +"literal>). Zusätzliche Muster für Dateinamen können hinzugefügt werden, "
 +"indem sie in <literal>APT::FTPArchive::Release::Patterns</literal> "
 +"aufgeführt werden. Dann schreibt er eine Release-Datei auf die "
 +"Standardausgabe, die für jede Datei eine MD5-, SHA1- und SHA256-Prüfsumme "
 +"enthält."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:125
@@@ -3128,27 -3144,27 +3128,43 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-ftparchive.1.xml:529
--msgid "<option>--md5</option>"
--msgstr "<option>--md5</option>"
++msgid ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
++msgstr ""
++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
  
++# FIXME <literal>Checksum</literal> im letzten Abschnitt <replaceable>?
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-ftparchive.1.xml:531
  msgid ""
--"Generate MD5 sums. This defaults to on, when turned off the generated index "
--"files will not have MD5Sum fields where possible.  Configuration Item: "
--"<literal>APT::FTPArchive::MD5</literal>"
--msgstr ""
--"Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet ist, "
--"haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies möglich "
--"ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>"
--
--#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:536
++"Generate the given checksum. These options default to on, when turned off "
++"the generated index files will not have the checksum fields where possible.  "
++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
++"replaceable>::<replaceable>Checksum</replaceable></literal> where "
++"<literal>Index</literal> can be <literal>Packages</literal>, "
++"<literal>Sources</literal> or <literal>Release</literal> and "
++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
++"literal> or <literal>SHA256</literal>."
++msgstr ""
++"erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
++"aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach "
++"Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: "
++"<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> und "
++"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::"
++"<replaceable>Prüfsumme</replaceable></literal>, wobei <literal>Index</"
++"literal> <literal>Packages</literal>, <literal>Sources</literal> oder "
++"<literal>Release</literal> sein kann und <literal>Checksum</literal> "
++"<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</"
++"literal> sein kann."
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
++#: apt-ftparchive.1.xml:539
  msgid "<option>--db</option>"
  msgstr "<option>--db</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:538
++#: apt-ftparchive.1.xml:541
  msgid ""
  "Use a binary caching DB. This has no effect on the generate command.  "
  "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@@ -3158,7 -3174,7 +3174,7 @@@ msgstr "
  "DB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:544
++#: apt-ftparchive.1.xml:547
  msgid ""
  "Quiet; produces output suitable for logging, omitting progress indicators.  "
  "More q's will produce more quiet up to a maximum of 2. You can also use "
@@@ -3172,12 -3188,12 +3188,12 @@@ msgstr "
  "Konfigurationselement: <literal>quiet</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:550
++#: apt-ftparchive.1.xml:553
  msgid "<option>--delink</option>"
  msgstr "<option>--delink</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:552
++#: apt-ftparchive.1.xml:555
  msgid ""
  "Perform Delinking. If the <literal>External-Links</literal> setting is used "
  "then this option actually enables delinking of the files. It defaults to on "
@@@ -3191,12 -3207,12 +3207,12 @@@ msgstr "
  "DeLinkAct</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:558
++#: apt-ftparchive.1.xml:561
  msgid "<option>--contents</option>"
  msgstr "<option>--contents</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:560
++#: apt-ftparchive.1.xml:563
  msgid ""
  "Perform contents generation. When this option is set and package indexes are "
  "being generated with a cache DB then the file listing will also be extracted "
@@@ -3212,12 -3228,12 +3228,12 @@@ msgstr "
  "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:568
++#: apt-ftparchive.1.xml:571
  msgid "<option>--source-override</option>"
  msgstr "<option>--source-override</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:570
++#: apt-ftparchive.1.xml:573
  msgid ""
  "Select the source override file to use with the <literal>sources</literal> "
  "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@@ -3228,12 -3244,12 +3244,12 @@@ msgstr "
  "SourceOverride</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:574
++#: apt-ftparchive.1.xml:577
  msgid "<option>--readonly</option>"
  msgstr "<option>--readonly</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:576
++#: apt-ftparchive.1.xml:579
  msgid ""
  "Make the caching databases read only.  Configuration Item: <literal>APT::"
  "FTPArchive::ReadOnlyDB</literal>."
@@@ -3242,12 -3258,12 +3258,12 @@@ msgstr "
  "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:580
++#: apt-ftparchive.1.xml:583
  msgid "<option>--arch</option>"
  msgstr "<option>--arch</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:581
++#: apt-ftparchive.1.xml:584
  msgid ""
  "Accept in the <literal>packages</literal> and <literal>contents</literal> "
  "commands only package files matching <literal>*_arch.deb</literal> or "
@@@ -3261,12 -3277,12 +3277,12 @@@ msgstr "
  "Architecture</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:587
++#: apt-ftparchive.1.xml:590
  msgid "<option>APT::FTPArchive::AlwaysStat</option>"
  msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:589
++#: apt-ftparchive.1.xml:592
  msgid ""
  "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
  "packages are recompiled and/or republished with the same version again, this "
@@@ -3290,12 -3306,12 +3306,12 @@@ msgstr "
  "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-ftparchive.1.xml:599
++#: apt-ftparchive.1.xml:602
  msgid "<option>APT::FTPArchive::LongDescription</option>"
  msgstr "<option>APT::FTPArchive::LongDescription</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-ftparchive.1.xml:601
++#: apt-ftparchive.1.xml:604
  msgid ""
  "This configuration option defaults to \"<literal>true</literal>\" and should "
  "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@@ -3311,19 -3327,19 +3327,19 @@@ msgstr "
  "werden kann."
  
  #. type: Content of: <refentry><refsect1><title>
--#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496
++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
  #: sources.list.5.xml:198
  msgid "Examples"
  msgstr "Beispiele"
  
  #. type: Content of: <refentry><refsect1><para><programlisting>
--#: apt-ftparchive.1.xml:619
++#: apt-ftparchive.1.xml:622
  #, no-wrap
  msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
  msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:615
++#: apt-ftparchive.1.xml:618
  msgid ""
  "To create a compressed Packages file for a directory containing binary "
  "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@@ -3333,7 -3349,7 +3349,7 @@@ msgstr "
  ">"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-ftparchive.1.xml:629
++#: apt-ftparchive.1.xml:632
  msgid ""
  "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
  "100 on error."
@@@ -3803,17 -3819,14 +3819,17 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-get.8.xml:281
  msgid "download"
 -msgstr ""
 +msgstr "download"
  
 +# FIXME s/directoy/directory/
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:282
  msgid ""
  "<literal>download</literal> will download the given binary package into the "
  "current directoy."
  msgstr ""
 +"<literal>download</literal> wird das angegebene Binärpaket in das aktuelle "
 +"Verzeichnis herunterladen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:288
@@@ -3878,7 -3891,7 +3894,7 @@@ msgstr "
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-get.8.xml:312
  msgid "changelog"
 -msgstr ""
 +msgstr "changelog"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:313
@@@ -3892,14 -3905,6 +3908,14 @@@ msgid "
  "installed.  However, you can specify the same options as for the "
  "<option>install</option> command."
  msgstr ""
 +"<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und "
 +"zeigt es mit <command>sensible-pager</command> an. Der Servername und das "
 +"Basisverzeichnis sind in der Variable <literal>APT::Changelogs::Server</"
 +"literal> definiert (z.B. <ulink>http://packages.debian.org/changelogs</"
 +"ulink> für Debian oder <ulink>http://changelogs.ubuntu.com/changelogs</"
 +"ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die "
 +"installierte Version. Sie können jedoch die gleichen Optionen wie für den "
 +"Befehl <option>install</option> angeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-get.8.xml:335
@@@ -3917,17 -3922,23 +3933,17 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-get.8.xml:340
 -#, fuzzy
 -#| msgid "<option>--no-suggests</option>"
  msgid "<option>--install-suggests</option>"
 -msgstr "<option>--no-suggests</option>"
 +msgstr "<option>--install-suggests</option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt-get.8.xml:341
 -#, fuzzy
 -#| msgid ""
 -#| "Do not consider recommended packages as a dependency for installing.  "
 -#| "Configuration Item: <literal>APT::Install-Recommends</literal>."
  msgid ""
  "Consider suggested packages as a dependency for installing.  Configuration "
  "Item: <literal>APT::Install-Suggests</literal>."
  msgstr ""
 -"Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. "
 -"Konfigurationselement: <literal>APT::Install-Recommends</literal>."
 +"Empfohlene Pakete als Abhängigkeit für die Installation betrachten. "
 +"Konfigurationselement: <literal>APT::Install-Suggests</literal>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
  #: apt-get.8.xml:345
@@@ -4703,8 -4714,8 +4719,24 @@@ msgstr "
  "aktualisieren und aus dem Schlüsselbund die Archivschlüssel entfernen, die "
  "nicht länger gültig sind."
  
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
++#: apt-key.8.xml:140
++#, fuzzy
++#| msgid "update"
++msgid "net-update"
++msgstr "update"
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
++#: apt-key.8.xml:144
++msgid ""
++"Update the local keyring with the keys of a key server and removes from the "
++"keyring the archive keys which are no longer valid. This requires an "
++"installed wget and an APT build configured to have a server to fetch from. "
++"APT in Debian does not support this command, but Ubuntu's APT does."
++msgstr ""
++
  #. type: Content of: <refentry><refsect1><para>
--#: apt-key.8.xml:143
++#: apt-key.8.xml:159
  msgid ""
  "Note that options need to be defined before the commands described in the "
  "previous section."
@@@ -4713,12 -4724,12 +4745,12 @@@ msgstr "
  "Befehlen definiert sein müssen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-key.8.xml:145
++#: apt-key.8.xml:161
  msgid "--keyring <replaceable>filename</replaceable>"
  msgstr "--keyring <replaceable>Dateiname</replaceable>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-key.8.xml:146
++#: apt-key.8.xml:162
  msgid ""
  "With this option it is possible to specify a specific keyring file the "
  "command should operate on. The default is that a command is executed on the "
@@@ -4735,54 -4746,54 +4767,58 @@@ msgstr "
  "Schlüssel werden zu diesem hinzugefügt."
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt-key.8.xml:159
++#: apt-key.8.xml:175
  msgid "&file-trustedgpg;"
  msgstr "&file-trustedgpg;"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-key.8.xml:161
++#: apt-key.8.xml:177
  msgid "<filename>/etc/apt/trustdb.gpg</filename>"
  msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-key.8.xml:162
++#: apt-key.8.xml:178
  msgid "Local trust database of archive keys."
  msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-key.8.xml:165
++#: apt-key.8.xml:181
  msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-key.8.xml:166
++#: apt-key.8.xml:182
  msgid "Keyring of Debian archive trusted keys."
  msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-key.8.xml:169
++#: apt-key.8.xml:185
  msgid ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  msgstr ""
  "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-key.8.xml:170
++#: apt-key.8.xml:186
  msgid "Keyring of Debian archive removed trusted keys."
  msgstr ""
  "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-key.8.xml:179
++#: apt-key.8.xml:195
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
  #.  The last update date 
  #. type: Content of: <refentry><refentryinfo>
  #: apt-mark.8.xml:16
++#, fuzzy
++#| msgid ""
++#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
++#| "August 2009</date>"
  msgid ""
--"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
--"August 2009</date>"
++"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
++"April 2011</date>"
  msgstr ""
  "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. "
  "August 2009</date>"
@@@ -4801,13 -4812,13 +4837,22 @@@ msgstr "
  
  #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
  #: apt-mark.8.xml:39
++#, fuzzy
++#| msgid ""
++#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
++#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
++#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
++#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
++#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
++#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
  msgid ""
  "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
  "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
  "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
--"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
++"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
++"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
  "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
--"arg> <arg choice=\"plain\">showauto</arg> </group>"
++"arg> </group>"
  msgstr ""
  "  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
  "f=<replaceable>DATEINAME</replaceable></option></arg> <group choice=\"plain"
@@@ -4817,7 -4828,7 +4862,7 @@@
  "arg> <arg choice=\"plain\">showauto</arg> </group>"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-mark.8.xml:56
++#: apt-mark.8.xml:57
  msgid ""
  "<command>apt-mark</command> will change whether a package has been marked as "
  "being automatically installed."
@@@ -4826,7 -4837,7 +4871,7 @@@ msgstr "
  "installiert markiert ist."
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-mark.8.xml:60
++#: apt-mark.8.xml:61
  msgid ""
  "When you request that a package is installed, and as a result other packages "
  "are installed to satisfy its dependencies, the dependencies are marked as "
@@@ -4842,14 -4853,14 +4887,21 @@@ msgstr "
  "<command>aptitude</command> entfernt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:68
--msgid "markauto"
++#: apt-mark.8.xml:69
++#, fuzzy
++#| msgid "markauto"
++msgid "auto"
  msgstr "markauto"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-mark.8.xml:69
++#: apt-mark.8.xml:70
++#, fuzzy
++#| msgid ""
++#| "<literal>markauto</literal> is used to mark a package as being "
++#| "automatically installed, which will cause the package to be removed when "
++#| "no more manually installed packages depend on this package."
  msgid ""
--"<literal>markauto</literal> is used to mark a package as being automatically "
++"<literal>auto</literal> is used to mark a package as being automatically "
  "installed, which will cause the package to be removed when no more manually "
  "installed packages depend on this package."
  msgstr ""
@@@ -4858,14 -4869,14 +4910,19 @@@
  "keine manuell installierten Pakete von ihm abhängen."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:76
--msgid "unmarkauto"
--msgstr "unmarkauto"
++#: apt-mark.8.xml:77
++msgid "manual"
++msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-mark.8.xml:77
++#: apt-mark.8.xml:78
++#, fuzzy
++#| msgid ""
++#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
++#| "installed, which will prevent the package from being automatically "
++#| "removed if no other packages depend on it."
  msgid ""
--"<literal>unmarkauto</literal> is used to mark a package as being manually "
++"<literal>manual</literal> is used to mark a package as being manually "
  "installed, which will prevent the package from being automatically removed "
  "if no other packages depend on it."
  msgstr ""
@@@ -4874,28 -4885,28 +4931,102 @@@
  "entfernt wird, wenn kein anderes Paket von ihm abhängt."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:84
++#: apt-mark.8.xml:85
++msgid "hold"
++msgstr ""
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
++#: apt-mark.8.xml:86
++msgid ""
++"<literal>hold</literal> is used to mark a package as hold back, which will "
++"prevent the package from being automatically installed, upgraded or "
++"removed.  The command is only a wrapper around <command>dpkg --set-"
++"selections</command> and the state is therefore maintained by &dpkg; and not "
++"effected by the <option>--filename</option> option."
++msgstr ""
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
++#: apt-mark.8.xml:95
++msgid "unhold"
++msgstr ""
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
++#: apt-mark.8.xml:96
++#, fuzzy
++#| msgid ""
++#| "<literal>showauto</literal> is used to print a list of automatically "
++#| "installed packages with each package on a new line."
++msgid ""
++"<literal>unhold</literal> is used to cancel a previously set hold on a "
++"package to allow all actions again."
++msgstr ""
++"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
++"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
++#: apt-mark.8.xml:101
  msgid "showauto"
  msgstr "showauto"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-mark.8.xml:85
++#: apt-mark.8.xml:102
++#, fuzzy
++#| msgid ""
++#| "<literal>showauto</literal> is used to print a list of automatically "
++#| "installed packages with each package on a new line."
  msgid ""
  "<literal>showauto</literal> is used to print a list of automatically "
--"installed packages with each package on a new line."
++"installed packages with each package on a new line.  All automatically "
++"installed packages will be listed if no package is given.  If packages are "
++"given only those which are automatically installed will be shown."
  msgstr ""
  "<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
  "installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:96
++#: apt-mark.8.xml:109
++#, fuzzy
++#| msgid "showauto"
++msgid "showmanual"
++msgstr "showauto"
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
++#: apt-mark.8.xml:110
++msgid ""
++"<literal>showmanual</literal> can be used in the same way as "
++"<literal>showauto</literal> except that it will print a list of manually "
++"installed packages instead."
++msgstr ""
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
++#: apt-mark.8.xml:116
++#, fuzzy
++#| msgid "showauto"
++msgid "showhold"
++msgstr "showauto"
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
++#: apt-mark.8.xml:117
++#, fuzzy
++#| msgid ""
++#| "<literal>showauto</literal> is used to print a list of automatically "
++#| "installed packages with each package on a new line."
++msgid ""
++"<literal>showhold</literal> is used to print a list of packages on hold in "
++"the same way as for the other show commands."
++msgstr ""
++"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
++"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
++
++#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
++#: apt-mark.8.xml:130
  msgid ""
  "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
  msgstr ""
  "<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:97
++#: apt-mark.8.xml:131
  msgid ""
  "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
  "option>"
@@@ -4904,7 -4915,7 +5035,7 @@@ msgstr "
  "option>"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-mark.8.xml:100
++#: apt-mark.8.xml:134
  msgid ""
  "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
  "filename> instead of the default location, which is "
@@@ -4916,48 -4927,48 +5047,18 @@@ msgstr "
  "filename> im von Konfigurationselement <literal>Dir::State</literal> "
  "definierten Verzeichnis, ist."
  
--#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:106
--msgid "<option>-h</option>"
--msgstr "<option>-h</option>"
--
--#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:107
--msgid "<option>--help</option>"
--msgstr "<option>--help</option>"
--
--#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-mark.8.xml:108
--msgid "Show a short usage summary."
--msgstr "Eine kurze Zusammenfassung anzeigen."
--
--#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:114
--msgid "<option>-v</option>"
--msgstr "<option>-v</option>"
--
--#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
--#: apt-mark.8.xml:115
--msgid "<option>--version</option>"
--msgstr "<option>--version</option>"
--
--#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
--#: apt-mark.8.xml:116
--msgid "Show the program version."
--msgstr "Die Programmversion anzeigen."
--
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt-mark.8.xml:127
++#: apt-mark.8.xml:146
  msgid "  &file-extended_states;"
  msgstr "  &file-extended_states;"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-mark.8.xml:132
++#: apt-mark.8.xml:151
  msgid "&apt-get;,&aptitude;,&apt-conf;"
  msgstr "&apt-get;,&aptitude;,&apt-conf;"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt-mark.8.xml:136
++#: apt-mark.8.xml:155
  msgid ""
  "<command>apt-mark</command> returns zero on normal operation, non-zero on "
  "error."
@@@ -5172,6 -5183,14 +5273,6 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt-secure.8.xml:147
 -#, fuzzy
 -#| msgid ""
 -#| "In order to add a new key you need to first download it (you should make "
 -#| "sure you are using a trusted communication channel when retrieving it), "
 -#| "add it with <command>apt-key</command> and then run <command>apt-get "
 -#| "update</command> so that apt can download and verify the "
 -#| "<filename>Release.gpg</filename> files from the archives you have "
 -#| "configured."
  msgid ""
  "In order to add a new key you need to first download it (you should make "
  "sure you are using a trusted communication channel when retrieving it), add "
@@@ -5184,9 -5203,8 +5285,9 @@@ msgstr "
  "(Sie sollten sicherstellen, dass Sie einen vertrauenswürdigen "
  "Kommunikationskanal benutzen, wenn Sie ihn herunterladen), ihn mit "
  "<command>apt-key</command> hinzufügen und dann <command>apt-get update</"
 -"command> ausführen, so dass APT die <filename>Release.gpg</filename>-Dateien "
 -"der von Ihnen konfigurierten Archive herunterladen und prüfen kann."
 +"command> ausführen, so dass APT die Dateien <filename>InRelease</filename> "
 +"oder <filename>Release.gpg</filename> der von Ihnen konfigurierten Archive "
 +"herunterladen und prüfen kann."
  
  #. type: Content of: <refentry><refsect1><title>
  #: apt-secure.8.xml:156
@@@ -5215,14 -5233,17 +5316,14 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
  #: apt-secure.8.xml:168
 -#, fuzzy
 -#| msgid ""
 -#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
 -#| "abs -o Release.gpg Release</command>."
  msgid ""
  "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
  "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
  "gpg Release</command>."
  msgstr ""
  "<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie "
 -"<command>gpg -abs -o Release.gpg Release</command> ausführen."
 +"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -"
 +"abs -o Release.gpg Release</command> ausführen."
  
  #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
  #: apt-secure.8.xml:172
@@@ -5413,9 -5434,14 +5514,9 @@@ msgstr "
  "die Datei, die durch die Umgebungsvariable <envar>APT_CONFIG</envar> "
  "angegeben wird (falls gesetzt)"
  
 +# FIXME s/no or/no/
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:52
 -#, fuzzy
 -#| msgid ""
 -#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 -#| "order which have no or \"<literal>conf</literal>\" as filename extension "
 -#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
 -#| "period (.) characters - otherwise they will be silently ignored."
  msgid ""
  "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
  "order which have no or \"<literal>conf</literal>\" as filename extension and "
@@@ -5426,12 -5452,9 +5527,12 @@@
  msgstr ""
  "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
  "alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als "
 -"Dateinamenserweiterung haben und die alphanumerische Zeichen, Bindestriche "
 -"(-), Unterstriche (_) und Punkte (.) enthalten – andernfalls werden sie "
 -"stillschweigend ignoriert."
 +"Dateinamenserweiterung haben und die nur alphanumerische Zeichen, "
 +"Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls "
 +"wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die "
 +"Datei nicht auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-"
 +"Files-Silently</literal> passt – in diesem Fall wird sie stillschweigend "
 +"ignoriert."
  
  #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
  #: apt.conf.5.xml:59
@@@ -6460,9 -6483,20 +6561,9 @@@ msgstr "
  msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
  msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
  
 +# FIXME s/> Note/>. Note/
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:442
 -#, fuzzy
 -#| msgid ""
 -#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 -#| "replaceable></literal> will be checked: If this setting exists the method "
 -#| "will only be used if this file exists, e.g. for the bzip2 method (the "
 -#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
 -#| "also that list entries specified on the command line will be added at the "
 -#| "end of the list specified in the configuration files, but before the "
 -#| "default entries. To prefer a type in this case over the ones specified in "
 -#| "in the configuration files you can set the option direct - not in list "
 -#| "style.  This will not override the defined list, it will only prefix the "
 -#| "list with this type."
  msgid ""
  "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
  "replaceable></literal> will be checked: If this setting exists the method "
@@@ -6479,15 -6513,14 +6580,15 @@@ msgstr "
  "replaceable></literal> zur Laufzeit geprüft wird: Falls diese Einstellung "
  "existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. für "
  "die (integrierte) bzip2-Methode ist die Einstellung <placeholder type="
 -"\"literallayout\" id=\"0\"/>. Beachten Sie, dass diese auf der Befehlszeile "
 +"\"literallayout\" id=\"0\"/>. Beachten Sie auch, dass auf der Befehlszeile "
  "eingegebenen Einträge an das Ende der Liste angehängt werden, die in den "
  "Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeinträgen. Um "
 -"einen Eintrag in diesem Fall vor einem, über die in der Konfigurationsdatei "
 -"angegebenen, zu bevorzugen, können Sie diese Option direkt setzen – nicht im "
 -"Listenstil. Dies wird die definierte Liste nicht überschreiben, es wird "
 -"diesen Typ nur vor die Liste setzen."
 +"einen Typ in diesem Fall gegenüber einem, der über die Konfigurationsdatei "
 +"angegebenen wurde, zu bevorzugen, können Sie diese Option direkt setzen – "
 +"nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es "
 +"wird diesen Typ nur vor die Liste setzen."
  
 +# FIXME: s/doesn't provide/don't provide/
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
  #: apt.conf.5.xml:449
  msgid ""
@@@ -6495,10 -6528,6 +6596,10 @@@
  "uncompressed files a preference, but note that most archives doesn't provide "
  "uncompressed files so this is mostly only useable for local mirrors."
  msgstr ""
 +"Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um "
 +"unkomprimierten Dateien einen Vorrang zu geben, beachten Sie jedoch, dass "
 +"die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass "
 +"dies meist nur für lokale Spiegel benutzt werden kann."
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
  #: apt.conf.5.xml:454
@@@ -6934,6 -6963,19 +7035,6 @@@ msgstr "Dpkd-Trigger-Benutzung (und zug
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
  #: apt.conf.5.xml:621
 -#, fuzzy
 -#| msgid ""
 -#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
 -#| "multiply calls of dpkg. Without further options dpkg will use triggers "
 -#| "only in between his own run. Activating these options can therefore "
 -#| "decrease the time needed to perform the install / upgrade. Note that it "
 -#| "is intended to activate these options per default in the future, but as "
 -#| "it changes the way APT calling dpkg drastically it needs a lot more "
 -#| "testing.  <emphasis>These options are therefore currently experimental "
 -#| "and should not be used in productive environments.</emphasis> Also it "
 -#| "breaks the progress reporting so all frontends will currently stay around "
 -#| "half (or more) of the time in the 100% state while it actually configures "
 -#| "all packages."
  msgid ""
  "APT can call dpkg in a way so it can make aggressive use of triggers over "
  "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@@ -6946,18 -6988,17 +7047,18 @@@
  "all frontends will currently stay around half (or more) of the time in the "
  "100% state while it actually configures all packages."
  msgstr ""
 -"APT kann Dpkg auf eine Art aufrufen, auf die aggressiv Gebrauch von Triggern "
 -"über mehrere Dpkg-Aufrufe gemacht wird. Ohne weitere Optionen wird Dpkg "
 -"Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen zu "
 -"benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit verkürzen. "
 -"Beachten Sie, dass geplant ist, diese Optionen in Zukunft standardmäßig zu "
 -"aktivieren, aber da es die Art, wie APT Dpkg aufruft, drastisch ändert, "
 -"benötigt es noch viele weitere Tests. <emphasis>Diese Optionen sind daher "
 -"aktuell noch experimentell und sollten nicht in produktiven Umgebungen "
 -"benutzt werden.</emphasis> Außerdem unterbricht es die Fortschrittsanzeige, "
 -"so dass alle Oberflächen aktuell in der halben (oder mehr) Zeit auf dem "
 -"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
 +"APT kann Dpkg auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern "
 +"über mehrere Dpkg-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird "
 +"Dpkg Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen "
 +"zu benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit "
 +"verkürzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft "
 +"standardmäßig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, "
 +"drastisch ändert, benötigt es noch viele weitere Tests. <emphasis>Diese "
 +"Optionen sind daher aktuell noch experimentell und sollten nicht in "
 +"produktiven Umgebungen benutzt werden.</emphasis> Außerdem unterbricht es "
 +"die Fortschrittsanzeige, so dass alle Oberflächen derzeit die halbe (oder "
 +"mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle Pakete "
 +"konfiguriert werden."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
  #: apt.conf.5.xml:636
@@@ -7777,6 -7818,14 +7878,6 @@@ msgstr "
  
  #. type: Content of: <refentry><refsect1><para>
  #: apt_preferences.5.xml:70
 -#, fuzzy
 -#| msgid ""
 -#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 -#| "directory are parsed in alphanumeric ascending order and need to obey the "
 -#| "following naming convention: The files have no or \"<literal>pref</"
 -#| "literal>\" as filename extension and which only contain alphanumeric, "
 -#| "hyphen (-), underscore (_) and period (.) characters - otherwise they "
 -#| "will be silently ignored."
  msgid ""
  "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
  "directory are parsed in alphanumeric ascending order and need to obey the "
@@@ -7787,14 -7836,11 +7888,14 @@@
  "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
  "case it will be silently ignored."
  msgstr ""
 -"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in "
 -"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden "
 -"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als "
 -"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche "
 -"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden "
 +"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences."
 +"d</filename> in alphanumerisch aufsteigender Reihenfolge ausgewertet werden "
 +"und der folgenden Namenskonvention unterliegen: Die Dateien haben keine oder "
 +"<literal>»pref«</literal> als Dateierweiterung und sie enthalten nur "
 +"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte (.). "
 +"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert "
 +"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste "
 +"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird "
  "sie stillschweigend ignoriert."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
@@@ -7849,39 -7895,32 +7950,49 @@@ msgstr "Priorität 1
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
  #: apt_preferences.5.xml:107
 +#, fuzzy
 +#| msgid ""
 +#| "to the versions coming from archives which in their <filename>Release</"
 +#| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
 +#| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
 +#| "<literal>experimental</literal> archive."
  msgid ""
  "to the versions coming from archives which in their <filename>Release</"
--"filename> files are marked as \"NotAutomatic: yes\" like the debian "
--"experimental archive."
++"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
++"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
++"<literal>experimental</literal> archive."
  msgstr ""
 -"zu den Versionen, die von Archiven kommen, deren <filename>Release</"
 -"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
 -"Experimental-Archiv."
 +"zu den Versionen, die von Archiven kommen, die in deren <filename>Release</"
 +"filename>-Dateien als »NotAutomatic: yes« markiert sind, aber "
 +"<emphasis>nicht</emphasis> als »ButAutomaticUpgrades: yes« wie das Archiv "
 +"<literal>experimental</literal> von Debian."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:112
++#: apt_preferences.5.xml:113
  msgid "priority 100"
  msgstr "Priorität 100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:113
--msgid "to the version that is already installed (if any)."
--msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
++#: apt_preferences.5.xml:114
++msgid ""
++"to the version that is already installed (if any) and to the versions coming "
++"from archives which in their <filename>Release</filename> files are marked "
++"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
++"backports archive since <literal>squeeze-backports</literal>."
++msgstr ""
++"zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu "
++"Versionen, die von Archiven kommen, die in deren <filename>Release</"
++"filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« "
++"markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-"
++"backports</literal>."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:117
++#: apt_preferences.5.xml:121
  msgid "priority 500"
  msgstr "Priorität 500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:118
++#: apt_preferences.5.xml:122
  msgid ""
  "to the versions that are not installed and do not belong to the target "
  "release."
@@@ -7890,12 -7929,12 +8001,12 @@@ msgstr "
  "gehören."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:122
++#: apt_preferences.5.xml:126
  msgid "priority 990"
  msgstr "Priorität 990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:123
++#: apt_preferences.5.xml:127
  msgid ""
  "to the versions that are not installed and belong to the target release."
  msgstr ""
@@@ -7913,32 -7952,22 +8024,33 @@@ msgstr "
  "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:128
++#: apt_preferences.5.xml:132
 +#, fuzzy
 +#| msgid ""
 +#| "If the target release has not been specified then APT simply assigns "
 +#| "priority 100 to all installed package versions and priority 500 to all "
 +#| "uninstalled package versions, except versions coming from archives which "
 +#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
 +#| "yes\" - these versions get the priority 1 or priority 100 if it is "
 +#| "additionally marked as \"ButAutomaticUpgrades: yes\"."
  msgid ""
  "If the target release has not been specified then APT simply assigns "
  "priority 100 to all installed package versions and priority 500 to all "
--"uninstalled package versions, expect versions coming from archives which in "
++"uninstalled package versions, except versions coming from archives which in "
  "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
--"- these versions get the priority 1."
++"- these versions get the priority 1 or priority 100 if it is additionally "
++"marked as \"ButAutomaticUpgrades: yes\"."
  msgstr ""
  "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen "
  "installierten Paketversionen eine Priorität von 100 und allen nicht "
  "installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen "
 -"aus Archiven kommen, in deren Release-Dateien »NotAutomatic: yes« markiert "
 -"ist – diese Versionen erhalten die Prirität 1."
 +"aus Archiven kommen, die in deren <filename>Release<filename>-Dateien "
 +"»NotAutomatic: yes« markiert sind – diese Versionen erhalten die Priorität 1 "
 +"oder die Priorität 100, falls sie zusätzlich als »ButAutomaticUpgrades: yes« "
 +"markiert sind."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:134
++#: apt_preferences.5.xml:139
  msgid ""
  "APT then applies the following rules, listed in order of precedence, to "
  "determine which version of a package to install."
@@@ -7948,7 -7977,7 +8060,7 @@@ msgstr "
  "ist."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:137
++#: apt_preferences.5.xml:142
  msgid ""
  "Never downgrade unless the priority of an available version exceeds 1000.  "
  "(\"Downgrading\" is installing a less recent version of a package in place "
@@@ -7964,12 -7993,12 +8076,12 @@@ msgstr "
  "Downgrading eines Paketes riskant sein kann.)"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:143
++#: apt_preferences.5.xml:148
  msgid "Install the highest priority version."
  msgstr "Die Version mit der höchsten Priorität installieren."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:144
++#: apt_preferences.5.xml:149
  msgid ""
  "If two or more versions have the same priority, install the most recent one "
  "(that is, the one with the higher version number)."
@@@ -7978,7 -8007,7 +8090,7 @@@ msgstr "
  "aktuellste installiert (das ist die mit der höheren Versionsnummer)."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:147
++#: apt_preferences.5.xml:152
  msgid ""
  "If two or more versions have the same priority and version number but either "
  "the packages differ in some of their metadata or the <literal>--reinstall</"
@@@ -7990,7 -8019,7 +8102,7 @@@ msgstr "
  "installierte installiert."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:153
++#: apt_preferences.5.xml:158
  msgid ""
  "In a typical situation, the installed version of a package (priority 100)  "
  "is not as recent as one of the versions available from the sources listed in "
@@@ -8006,7 -8035,7 +8118,7 @@@ msgstr "
  "upgrade</command> ausgeführt wird."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:160
++#: apt_preferences.5.xml:165
  msgid ""
  "More rarely, the installed version of a package is <emphasis>more</emphasis> "
  "recent than any of the other available versions.  The package will not be "
@@@ -8020,7 -8049,7 +8132,7 @@@ msgstr "
  "upgrade</command> ausgeführt wird."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:165
++#: apt_preferences.5.xml:170
  msgid ""
  "Sometimes the installed version of a package is more recent than the version "
  "belonging to the target release, but not as recent as a version belonging to "
@@@ -8040,12 -8069,12 +8152,12 @@@ msgstr "
  "hat."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:174
++#: apt_preferences.5.xml:179
  msgid "The Effect of APT Preferences"
  msgstr "Die Auswirkungen von APT-Einstellungen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:176
++#: apt_preferences.5.xml:181
  msgid ""
  "The APT preferences file allows the system administrator to control the "
  "assignment of priorities.  The file consists of one or more multi-line "
@@@ -8059,7 -8088,7 +8171,7 @@@ msgstr "
  "allgemeine Gestalt."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:182
++#: apt_preferences.5.xml:187
  msgid ""
  "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
  "specified packages and specified version or version range.  For example, the "
@@@ -8075,7 -8104,7 +8187,7 @@@ msgstr "
  "können durch Leerzeichen getrennt werden."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:189
++#: apt_preferences.5.xml:194
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8087,7 -8116,7 +8199,7 @@@ msgstr "
  "Pin-Priority: 1001\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:195
++#: apt_preferences.5.xml:200
  msgid ""
  "The general form assigns a priority to all of the package versions in a "
  "given distribution (that is, to all the versions of packages that are listed "
@@@ -8102,7 -8131,7 +8214,7 @@@ msgstr "
  "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:201
++#: apt_preferences.5.xml:206
  msgid ""
  "This general-form entry in the APT preferences file applies only to groups "
  "of packages.  For example, the following record assigns a high priority to "
@@@ -8113,7 -8142,7 +8225,7 @@@ msgstr "
  "Paketversionen eine hohe Priorität zu, die lokal liegen."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:206
++#: apt_preferences.5.xml:211
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8125,7 -8154,7 +8237,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:211
++#: apt_preferences.5.xml:216
  msgid ""
  "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
  "which can be used to match a hostname. The following record will assign a "
@@@ -8139,7 -8168,7 +8251,7 @@@ msgstr "
  "de.debian.org« identifiziert wird."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:215
++#: apt_preferences.5.xml:220
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8151,7 -8180,7 +8263,7 @@@ msgstr "
  "Pin-Priority: 999\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:219
++#: apt_preferences.5.xml:224
  msgid ""
  "This should <emphasis>not</emphasis> be confused with the Origin of a "
  "distribution as specified in a <filename>Release</filename> file.  What "
@@@ -8166,7 -8195,7 +8278,7 @@@ msgstr "
  "oder »Ximian«."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:224
++#: apt_preferences.5.xml:229
  msgid ""
  "The following record assigns a low priority to all package versions "
  "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@@ -8177,7 -8206,7 +8289,7 @@@ msgstr "
  "Priorität zu."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:228
++#: apt_preferences.5.xml:233
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8189,7 -8218,7 +8301,7 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:233
++#: apt_preferences.5.xml:238
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@@ -8200,7 -8229,7 +8312,7 @@@ msgstr "
  "hohe Priorität zu."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:237
++#: apt_preferences.5.xml:242
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8212,7 -8241,7 +8324,7 @@@ msgstr "
  "Pin-Priority: 900\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:242
++#: apt_preferences.5.xml:247
  msgid ""
  "The following record assigns a high priority to all package versions "
  "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@@ -8223,7 -8252,7 +8335,7 @@@ msgstr "
  "Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
--#: apt_preferences.5.xml:247
++#: apt_preferences.5.xml:252
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8235,17 -8264,17 +8347,85 @@@ msgstr "
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:258
++#: apt_preferences.5.xml:262
++msgid "Regular expressions and glob() syntax"
++msgstr "Reguläre Ausdrücke und glob()-Syntax"
++
++# FIXME: s/expression or/expression) or/
++#. type: Content of: <refentry><refsect1><refsect2><para>
++#: apt_preferences.5.xml:264
++msgid ""
++"APT also supports pinning by glob() expressions and regular expressions "
++"surrounded by /. For example, the following example assigns the priority 500 "
++"to all packages from experimental where the name starts with gnome (as a glob"
++"()-like expression or contains the word kde (as a POSIX extended regular "
++"expression surrounded by slashes)."
++msgstr ""
++"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
++"Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist "
++"beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei "
++"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder "
++"das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der "
++"von Schrägstrichen umschlossen wird)."
++
++#. type: Content of: <refentry><refsect1><refsect2><programlisting>
++#: apt_preferences.5.xml:273
++#, no-wrap
++msgid ""
++"Package: gnome* /kde/\n"
++"Pin: release n=experimental\n"
++"Pin-Priority: 500\n"
++msgstr ""
++"Package: gnome* /kde/\n"
++"Pin: release n=experimental\n"
++"Pin-Priority: 500\n"
++
++# FIXME: s/Those/Thus/
++#. type: Content of: <refentry><refsect1><refsect2><para>
++#: apt_preferences.5.xml:279
++msgid ""
++"The rule for those expressions is that they can occur anywhere where a "
++"string can occur. Those, the following pin assigns the priority 990 to all "
++"packages from a release starting with karmic."
++msgstr ""
++"Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, "
++"wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen "
++"Paketen von einem Release seit Karmic die Priorität 900 zu."
++
++#. type: Content of: <refentry><refsect1><refsect2><programlisting>
++#: apt_preferences.5.xml:285
++#, no-wrap
++msgid ""
++"Package: *\n"
++"Pin: release n=karmic*\n"
++"Pin-Priority: 990\n"
++msgstr ""
++"Package: *\n"
++"Pin: release n=karmic*\n"
++"Pin-Priority: 990\n"
++
++#. type: Content of: <refentry><refsect1><refsect2><literal>
++#: apt_preferences.5.xml:290
++msgid "Package"
++msgstr "Package"
++
++#. type: Content of: <refentry><refsect1><refsect2><literal>
++#: apt_preferences.5.xml:296
++msgid "*"
++msgstr "*"
++
++#. type: Content of: <refentry><refsect1><refsect2><title>
++#: apt_preferences.5.xml:306
  msgid "How APT Interprets Priorities"
  msgstr "Wie APT Prioritäten interpretiert"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:266
++#: apt_preferences.5.xml:314
  msgid "P &gt; 1000"
  msgstr "P &gt; 1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:267
++#: apt_preferences.5.xml:315
  msgid ""
  "causes a version to be installed even if this constitutes a downgrade of the "
  "package"
@@@ -8254,12 -8283,12 +8434,12 @@@ msgstr "
  "des Pakets durchführt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:271
++#: apt_preferences.5.xml:319
  msgid "990 &lt; P &lt;=1000"
  msgstr "990 &lt; P &lt;=1000"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:272
++#: apt_preferences.5.xml:320
  msgid ""
  "causes a version to be installed even if it does not come from the target "
  "release, unless the installed version is more recent"
@@@ -8268,12 -8297,12 +8448,12 @@@ msgstr "
  "Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:277
++#: apt_preferences.5.xml:325
  msgid "500 &lt; P &lt;=990"
  msgstr "500 &lt; P &lt;=990"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:278
++#: apt_preferences.5.xml:326
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to the target release or the installed version is more recent"
@@@ -8283,12 -8312,12 +8463,12 @@@ msgstr "
  "neuer ist"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:283
++#: apt_preferences.5.xml:331
  msgid "100 &lt; P &lt;=500"
  msgstr "100 &lt; P &lt;=500"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:284
++#: apt_preferences.5.xml:332
  msgid ""
  "causes a version to be installed unless there is a version available "
  "belonging to some other distribution or the installed version is more recent"
@@@ -8298,12 -8327,12 +8478,12 @@@ msgstr "
  "installierte Version neuer ist"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:289
++#: apt_preferences.5.xml:337
  msgid "0 &lt; P &lt;=100"
  msgstr "0 &lt; P &lt;=100"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:290
++#: apt_preferences.5.xml:338
  msgid ""
  "causes a version to be installed only if there is no installed version of "
  "the package"
@@@ -8312,17 -8341,17 +8492,17 @@@ msgstr "
  "installierte Version des Pakets gibt"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:294
++#: apt_preferences.5.xml:342
  msgid "P &lt; 0"
  msgstr "P &lt; 0"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:295
++#: apt_preferences.5.xml:343
  msgid "prevents the version from being installed"
  msgstr "verhindert das Installieren der Version"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:261
++#: apt_preferences.5.xml:309
  msgid ""
  "Priorities (P) assigned in the APT preferences file must be positive or "
  "negative integers.  They are interpreted as follows (roughly speaking): "
@@@ -8333,7 -8362,7 +8513,7 @@@ msgstr "
  "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:300
++#: apt_preferences.5.xml:348
  msgid ""
  "If any specific-form records match an available package version then the "
  "first such record determines the priority of the package version.  Failing "
@@@ -8347,7 -8376,7 +8527,7 @@@ msgstr "
  "erste dieser Datensätze die Priorität der Paketversion fest."
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:306
++#: apt_preferences.5.xml:354
  msgid ""
  "For example, suppose the APT preferences file contains the three records "
  "presented earlier:"
@@@ -8356,7 -8385,7 +8536,7 @@@ msgstr "
  "bereits gezeigten Datensätze:"
  
  #. type: Content of: <refentry><refsect1><refsect2><programlisting>
--#: apt_preferences.5.xml:310
++#: apt_preferences.5.xml:358
  #, no-wrap
  msgid ""
  "Package: perl\n"
@@@ -8384,12 -8413,12 +8564,12 @@@ msgstr "
  "Pin-Priority: 50\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:323
++#: apt_preferences.5.xml:371
  msgid "Then:"
  msgstr "Dann:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:325
++#: apt_preferences.5.xml:373
  msgid ""
  "The most recent available version of the <literal>perl</literal> package "
  "will be installed, so long as that version's version number begins with "
@@@ -8404,7 -8433,7 +8584,7 @@@ msgstr "
  "dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:330
++#: apt_preferences.5.xml:378
  msgid ""
  "A version of any package other than <literal>perl</literal> that is "
  "available from the local system has priority over other versions, even "
@@@ -8415,7 -8444,7 +8595,7 @@@ msgstr "
  "sogar wenn diese Versionen zum Ziel-Release gehören."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
--#: apt_preferences.5.xml:334
++#: apt_preferences.5.xml:382
  msgid ""
  "A version of a package whose origin is not the local system but some other "
  "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@@ -8429,12 -8458,12 +8609,12 @@@ msgstr "
  "Pakets installiert ist."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:344
++#: apt_preferences.5.xml:392
  msgid "Determination of Package Version and Distribution Properties"
  msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:346
++#: apt_preferences.5.xml:394
  msgid ""
  "The locations listed in the &sources-list; file should provide "
  "<filename>Packages</filename> and <filename>Release</filename> files to "
@@@ -8445,27 -8474,27 +8625,27 @@@ msgstr "
  "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:358
++#: apt_preferences.5.xml:406
  msgid "the <literal>Package:</literal> line"
  msgstr "die <literal>Package:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:359
++#: apt_preferences.5.xml:407
  msgid "gives the package name"
  msgstr "gibt den Paketnamen an"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:362 apt_preferences.5.xml:412
++#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
  msgid "the <literal>Version:</literal> line"
  msgstr "die <literal>Version:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:363
++#: apt_preferences.5.xml:411
  msgid "gives the version number for the named package"
  msgstr "gibt die Versionsnummer für das genannte Paket an"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:350
++#: apt_preferences.5.xml:398
  msgid ""
  "The <filename>Packages</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@@ -8486,12 -8515,12 +8666,12 @@@ msgstr "
  "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:379
++#: apt_preferences.5.xml:427
  msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
  msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:380
++#: apt_preferences.5.xml:428
  msgid ""
  "names the archive to which all the packages in the directory tree belong.  "
  "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@@ -8508,18 -8537,18 +8688,18 @@@ msgstr "
  "die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:390
++#: apt_preferences.5.xml:438
  #, no-wrap
  msgid "Pin: release a=stable\n"
  msgstr "Pin: release a=stable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:396
++#: apt_preferences.5.xml:444
  msgid "the <literal>Codename:</literal> line"
  msgstr "die <literal>Codename:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:397
++#: apt_preferences.5.xml:445
  msgid ""
  "names the codename to which all the packages in the directory tree belong.  "
  "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@@ -8536,13 -8565,13 +8716,13 @@@ msgstr "
  "anzugeben würde die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:406
++#: apt_preferences.5.xml:454
  #, no-wrap
  msgid "Pin: release n=&testing-codename;\n"
  msgstr "Pin: release n=&testing-codename;\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:413
++#: apt_preferences.5.xml:461
  msgid ""
  "names the release version.  For example, the packages in the tree might "
  "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@@ -8558,7 -8587,7 +8738,7 @@@ msgstr "
  "eine der folgenden Zeilen benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:422
++#: apt_preferences.5.xml:470
  #, no-wrap
  msgid ""
  "Pin: release v=3.0\n"
@@@ -8570,12 -8599,12 +8750,12 @@@ msgstr "
  "Pin: release 3.0\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:431
++#: apt_preferences.5.xml:479
  msgid "the <literal>Component:</literal> line"
  msgstr "die <literal>Component:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:432
++#: apt_preferences.5.xml:480
  msgid ""
  "names the licensing component associated with the packages in the directory "
  "tree of the <filename>Release</filename> file.  For example, the line "
@@@ -8593,18 -8622,18 +8773,18 @@@ msgstr "
  "Zeilen benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:441
++#: apt_preferences.5.xml:489
  #, no-wrap
  msgid "Pin: release c=main\n"
  msgstr "Pin: release c=main\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:447
++#: apt_preferences.5.xml:495
  msgid "the <literal>Origin:</literal> line"
  msgstr "die <literal>Origin:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:448
++#: apt_preferences.5.xml:496
  msgid ""
  "names the originator of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8616,18 -8645,18 +8796,18 @@@ msgstr "
  "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:454
++#: apt_preferences.5.xml:502
  #, no-wrap
  msgid "Pin: release o=Debian\n"
  msgstr "Pin: release o=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
--#: apt_preferences.5.xml:460
++#: apt_preferences.5.xml:508
  msgid "the <literal>Label:</literal> line"
  msgstr "die <literal>Label:</literal>-Zeile"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
--#: apt_preferences.5.xml:461
++#: apt_preferences.5.xml:509
  msgid ""
  "names the label of the packages in the directory tree of the "
  "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@@ -8640,13 -8669,13 +8820,13 @@@ msgstr "
  "die folgende Zeile benötigen:"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
--#: apt_preferences.5.xml:467
++#: apt_preferences.5.xml:515
  #, no-wrap
  msgid "Pin: release l=Debian\n"
  msgstr "Pin: release l=Debian\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:368
++#: apt_preferences.5.xml:416
  msgid ""
  "The <filename>Release</filename> file is normally found in the directory "
  "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@@ -8669,7 -8698,7 +8849,7 @@@ msgstr "
  "APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:474
++#: apt_preferences.5.xml:522
  msgid ""
  "All of the <filename>Packages</filename> and <filename>Release</filename> "
  "files retrieved from locations listed in the &sources-list; file are stored "
@@@ -8695,12 -8724,12 +8875,12 @@@ msgstr "
  "Distribution heruntergeladen wurde."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:487
++#: apt_preferences.5.xml:535
  msgid "Optional Lines in an APT Preferences Record"
  msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:489
++#: apt_preferences.5.xml:537
  msgid ""
  "Each record in the APT preferences file can optionally begin with one or "
  "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@@ -8711,12 -8740,12 +8891,12 @@@ msgstr "
  "anfangen. Dieses stellt einen Platz für Kommentare bereit."
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:498
++#: apt_preferences.5.xml:546
  msgid "Tracking Stable"
  msgstr "Stable verfolgen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:506
++#: apt_preferences.5.xml:554
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated\n"
@@@ -8740,7 -8769,7 +8920,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:500
++#: apt_preferences.5.xml:548
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8755,8 -8784,8 +8935,8 @@@ msgstr "
  "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:523 apt_preferences.5.xml:569
--#: apt_preferences.5.xml:627
++#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
++#: apt_preferences.5.xml:675
  #, no-wrap
  msgid ""
  "apt-get install <replaceable>package-name</replaceable>\n"
@@@ -8768,7 -8797,7 +8948,7 @@@ msgstr "
  "apt-get dist-upgrade\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:518
++#: apt_preferences.5.xml:566
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8781,13 -8810,13 +8961,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:535
++#: apt_preferences.5.xml:583
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/testing\n"
  msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:529
++#: apt_preferences.5.xml:577
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>testing</literal> distribution; the package "
@@@ -8801,12 -8830,12 +8981,12 @@@ msgstr "
  "\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:541
++#: apt_preferences.5.xml:589
  msgid "Tracking Testing or Unstable"
  msgstr "Testing oder Unstable verfolgen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:550
++#: apt_preferences.5.xml:598
  #, no-wrap
  msgid ""
  "Package: *\n"
@@@ -8834,7 -8863,7 +9014,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:543
++#: apt_preferences.5.xml:591
  msgid ""
  "The following APT preferences file will cause APT to assign a high priority "
  "to package versions from the <literal>testing</literal> distribution, a "
@@@ -8851,7 -8880,7 +9031,7 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:564
++#: apt_preferences.5.xml:612
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest "
@@@ -8864,13 -8893,13 +9044,13 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:584
++#: apt_preferences.5.xml:632
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
  msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:575
++#: apt_preferences.5.xml:623
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>unstable</literal> distribution.  "
@@@ -8890,12 -8919,12 +9070,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><title>
--#: apt_preferences.5.xml:591
++#: apt_preferences.5.xml:639
  msgid "Tracking the evolution of a codename release"
  msgstr "Die Entwicklung eines Codename-Releases verfolgen"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:605
++#: apt_preferences.5.xml:653
  #, no-wrap
  msgid ""
  "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@@ -8930,7 -8959,7 +9110,7 @@@ msgstr "
  "Pin-Priority: -10\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:593
++#: apt_preferences.5.xml:641
  msgid ""
  "The following APT preferences file will cause APT to assign a priority "
  "higher than the default (500) to all package versions belonging to a "
@@@ -8956,7 -8985,7 +9136,7 @@@ msgstr "
  "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:622
++#: apt_preferences.5.xml:670
  msgid ""
  "With a suitable &sources-list; file and the above preferences file, any of "
  "the following commands will cause APT to upgrade to the latest version(s) in "
@@@ -8969,13 -8998,13 +9149,13 @@@ msgstr "
  "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
--#: apt_preferences.5.xml:642
++#: apt_preferences.5.xml:690
  #, no-wrap
  msgid "apt-get install <replaceable>package</replaceable>/sid\n"
  msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
--#: apt_preferences.5.xml:633
++#: apt_preferences.5.xml:681
  msgid ""
  "The following command will cause APT to upgrade the specified package to the "
  "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@@ -8995,12 -9024,12 +9175,12 @@@ msgstr "
  "\"programlisting\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><variablelist>
--#: apt_preferences.5.xml:651
++#: apt_preferences.5.xml:699
  msgid "&file-preferences;"
  msgstr "&file-preferences;"
  
  #. type: Content of: <refentry><refsect1><para>
--#: apt_preferences.5.xml:657
++#: apt_preferences.5.xml:705
  msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
  
@@@ -9058,6 -9087,14 +9238,6 @@@ msgstr "sources.list.d
  
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:54
 -#, fuzzy
 -#| msgid ""
 -#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
 -#| "to add sources.list entries in separate files.  The format is the same as "
 -#| "for the regular <filename>sources.list</filename> file.  File names need "
 -#| "to end with <filename>.list</filename> and may only contain letters (a-z "
 -#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
 -#| "characters.  Otherwise they will be silently ignored."
  msgid ""
  "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
  "add sources.list entries in separate files.  The format is the same as for "
@@@ -9073,10 -9110,8 +9253,10 @@@ msgstr "
  "Das Format ist das gleiche wie für die normale <filename>sources.list</"
  "filename>-Datei. Dateinamen müssen mit <filename>.list</filename> enden und "
  "können nur Buchstaben (a-z und A-Z), Ziffern (0-9), Unterstriche (_), "
 -"Bindestriche (-) und Punkte (.) enthalten. Ansonsten werden sie "
 -"stillschweigend ignoriert."
 +"Bindestriche (-) und Punkte (.) enthalten. Andernfalls wird APT einen "
 +"Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die Datei nicht "
 +"auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-Files-"
 +"Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
  
  #. type: Content of: <refentry><refsect1><title>
  #: sources.list.5.xml:65
@@@ -9085,6 -9120,17 +9265,6 @@@ msgstr "Die Typen deb und deb-src
  
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:66
 -#, fuzzy
 -#| msgid ""
 -#| "The <literal>deb</literal> type describes a typical two-level Debian "
 -#| "archive, <filename>distribution/component</filename>. Typically, "
 -#| "<literal>distribution</literal> is generally one of <literal>stable</"
 -#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
 -#| "component is one of <literal>main</literal> <literal>contrib</literal> "
 -#| "<literal>non-free</literal> or <literal>non-us</literal>. The "
 -#| "<literal>deb-src</literal> type describes a debian distribution's source "
 -#| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
 -#| "src</literal> line is required to fetch source indexes."
  msgid ""
  "The <literal>deb</literal> type describes a typical two-level Debian "
  "archive, <filename>distribution/component</filename>. Typically, "
@@@ -9099,14 -9145,14 +9279,14 @@@
  msgstr ""
  "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-"
  "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</"
 -"literal> ist typischerweise entweder <literal>stable</literal>, "
 -"<literal>unstable</literal> oder <literal>testing</literal>, während "
 -"Komponente entweder <literal>main</literal>, <literal>contrib</literal>, "
 -"<literal>non-free</literal> oder <literal>non-us</literal> ist. Der "
 -"<literal>deb-src</literal>-Typ beschreibt einen Quellcode einer Debian-"
 -"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine "
 -"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes "
 -"herunterzuladen."
 +"literal> ist typischerweise ein Archivname wie <literal>stable</literal> "
 +"oder <literal>testing</literal> oder ein Kodename wie <literal>&stable-"
 +"codename;</literal> oder <literal>&testing-codename;</literal> während "
 +"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder "
 +"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ "
 +"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie "
 +"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird "
 +"benötigt, um Quellindizes herunterzuladen."
  
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:78
@@@ -9459,12 -9505,22 +9639,12 @@@ msgstr "deb ftp://ftp.debian.org/debia
  
  #. type: Content of: <refentry><refsect1><para><literallayout>
  #: sources.list.5.xml:230
 -#, fuzzy, no-wrap
 -#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 +#, no-wrap
  msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 -msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 +msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
  
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:223
 -#, fuzzy
 -#| msgid ""
 -#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
 -#| "US directory, and uses only files found under <filename>unstable/binary-"
 -#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
 -#| "filename> on m68k, and so forth for other supported architectures. [Note "
 -#| "this example only illustrates how to use the substitution variable; non-"
 -#| "us is no longer structured like this] <placeholder type=\"literallayout\" "
 -#| "id=\"0\"/>"
  msgid ""
  "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
  "directory, and uses only files found under <filename>unstable/binary-i386</"
@@@ -9474,14 -9530,14 +9654,14 @@@
  "archives are not structured like this] <placeholder type=\"literallayout\" "
  "id=\"0\"/>"
  msgstr ""
 -"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-"
 +"Benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
  "Verzeichnis zuzugreifen und benutzt nur Dateien, die unter "
  "<filename>unstable/binary-i386</filename> auf i386-Maschinen, "
 -"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere "
 -"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses "
 -"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. "
 -"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout"
 -"\" id=\"0\"/>"
 +"<filename>unstable/binary-amd64</filename> auf amd64 und so weiter für "
 +"andere unterstützte Architekturen, gefunden werden. [Beachten Sie, dass "
 +"dieses Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt "
 +"wird. Offizielle Debian-Archive sind nicht so strukturiert.] <placeholder "
 +"type=\"literallayout\" id=\"0\"/>"
  
  #. type: Content of: <refentry><refsect1><para>
  #: sources.list.5.xml:235
@@@ -11041,100 -11097,6 +11221,43 @@@ msgstr "  # apt-get -o dir::cache::arch
  msgid "Which will use the already fetched archives on the disc."
  msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
  
- #~ msgid ""
- #~ "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
- #~ msgstr ""
- #~ "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
++#~ msgid "<option>--md5</option>"
++#~ msgstr "<option>--md5</option>"
 +
- # FIXME <literal>Checksum</literal> im letzten Abschnitt <replaceable>?
 +#~ msgid ""
- #~ "Generate the given checksum. These options default to on, when turned off "
- #~ "the generated index files will not have the checksum fields where "
- #~ "possible.  Configuration Items: <literal>APT::FTPArchive::"
- #~ "<replaceable>Checksum</replaceable></literal> and <literal>APT::"
- #~ "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</"
- #~ "replaceable></literal> where <literal>Index</literal> can be "
- #~ "<literal>Packages</literal>, <literal>Sources</literal> or "
- #~ "<literal>Release</literal> and <literal>Checksum</literal> can be "
- #~ "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</"
- #~ "literal>."
++#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
++#~ "index files will not have MD5Sum fields where possible.  Configuration "
++#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
 +#~ msgstr ""
- #~ "erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
- #~ "aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien "
- #~ "nach Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: "
- #~ "<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> "
- #~ "und <literal>APT::FTPArchive::<replaceable>Index</replaceable>::"
- #~ "<replaceable>Prüfsumme</replaceable></literal>, wobei <literal>Index</"
- #~ "literal> <literal>Packages</literal>, <literal>Sources</literal> oder "
- #~ "<literal>Release</literal> sein kann und <literal>Checksum</literal> "
- #~ "<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</"
- #~ "literal> sein kann."
++#~ "Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet "
++#~ "ist, haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies "
++#~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</"
++#~ "literal>"
 +
- #~ msgid ""
- #~ "to the version that is already installed (if any) and to the versions "
- #~ "coming from archives which in their <filename>Release</filename> files "
- #~ "are marked as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" "
- #~ "like the debian backports archive since <literal>squeeze-backports</"
- #~ "literal>."
- #~ msgstr ""
- #~ "zu der Version, die bereits installiert ist (wenn dies der Fall ist) und "
- #~ "zu Versionen, die von Archiven kommen, die in deren <filename>Release</"
- #~ "filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« "
- #~ "markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-"
- #~ "backports</literal>."
++#~ msgid "unmarkauto"
++#~ msgstr "unmarkauto"
 +
- #~ msgid "Regular expressions and glob() syntax"
- #~ msgstr "Reguläre Ausdrücke und glob()-Syntax"
++#~ msgid "<option>-h</option>"
++#~ msgstr "<option>-h</option>"
 +
- # FIXME: s/expression or/expression) or/
- #~ msgid ""
- #~ "APT also supports pinning by glob() expressions and regular expressions "
- #~ "surrounded by /. For example, the following example assigns the priority "
- #~ "500 to all packages from experimental where the name starts with gnome "
- #~ "(as a glob()-like expression or contains the word kde (as a POSIX "
- #~ "extended regular expression surrounded by slashes)."
- #~ msgstr ""
- #~ "APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
- #~ "Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist "
- #~ "beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei "
- #~ "denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder "
- #~ "das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der "
- #~ "von Schrägstrichen umschlossen wird)."
++#~ msgid "<option>--help</option>"
++#~ msgstr "<option>--help</option>"
 +
- #~ msgid ""
- #~ "Package: gnome* /kde/\n"
- #~ "Pin: release n=experimental\n"
- #~ "Pin-Priority: 500\n"
- #~ msgstr ""
- #~ "Package: gnome* /kde/\n"
- #~ "Pin: release n=experimental\n"
- #~ "Pin-Priority: 500\n"
++#~ msgid "Show a short usage summary."
++#~ msgstr "Eine kurze Zusammenfassung anzeigen."
 +
- # FIXME: s/Those/Thus/
- #~ msgid ""
- #~ "The rule for those expressions is that they can occur anywhere where a "
- #~ "string can occur. Those, the following pin assigns the priority 990 to "
- #~ "all packages from a release starting with karmic."
- #~ msgstr ""
- #~ "Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten "
- #~ "können, wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin "
- #~ "allen Paketen von einem Release seit Karmic die Priorität 900 zu."
++#~ msgid "<option>-v</option>"
++#~ msgstr "<option>-v</option>"
 +
- #~ msgid ""
- #~ "Package: *\n"
- #~ "Pin: release n=karmic*\n"
- #~ "Pin-Priority: 990\n"
- #~ msgstr ""
- #~ "Package: *\n"
- #~ "Pin: release n=karmic*\n"
- #~ "Pin-Priority: 990\n"
++#~ msgid "<option>--version</option>"
++#~ msgstr "<option>--version</option>"
 +
- #~ msgid "Package"
- #~ msgstr "Package"
++#~ msgid "Show the program version."
++#~ msgstr "Die Programmversion anzeigen."
 +
- #~ msgid "*"
- #~ msgstr "*"
++#~ msgid "to the version that is already installed (if any)."
++#~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
 +
  #~ msgid "APT package handling utility -- cache manipulator"
  #~ msgstr ""
  #~ "APT-Werkzeug zur Handhabung von Paketen -- Zwischenspeichermanipulierer"
@@@ -11195,12 -11157,8 +11318,12 @@@
  #~ "Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-"
  #~ "US-Verzeichnis zuzugreifen."
  
 -#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
 -#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
 +#~ msgid ""
 +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
 +#~ "free"
 +#~ msgstr ""
 +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
 +#~ "free"
  
  #~ msgid "OPTIONS"
  #~ msgstr "OPTIONEN"
diff --combined ftparchive/writer.cc
index 9f12cbf3d,eb8938b95..c43e8f4b4
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@@ -20,7 -20,7 +20,7 @@@
  #include <apt-pkg/aptconfiguration.h>
  #include <apt-pkg/md5.h>
  #include <apt-pkg/sha1.h>
- #include <apt-pkg/sha256.h>
+ #include <apt-pkg/sha2.h>
  #include <apt-pkg/deblistparser.h>
  
  #include <sys/types.h>
@@@ -64,6 -64,6 +64,7 @@@ FTWScanner::FTWScanner(string const &Ar
     DoMD5 = _config->FindB("APT::FTPArchive::MD5",true);
     DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true);
     DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true);
++   DoSHA512 = _config->FindB("APT::FTPArchive::SHA512",true);
  }
  									/*}}}*/
  // FTWScanner::Scanner - FTW Scanner					/*{{{*/
@@@ -316,6 -316,7 +317,7 @@@ PackagesWriter::PackagesWriter(string c
     DoMD5 = _config->FindB("APT::FTPArchive::Packages::MD5",DoMD5);
     DoSHA1 = _config->FindB("APT::FTPArchive::Packages::SHA1",DoSHA1);
     DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA256",DoSHA256);
+    DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA512",true);
     DoAlwaysStat = _config->FindB("APT::FTPArchive::AlwaysStat", false);
     DoContents = _config->FindB("APT::FTPArchive::Contents",true);
     NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false);
@@@ -370,7 -371,7 +372,7 @@@ bool FTWScanner::SetExts(string const &
  bool PackagesWriter::DoPackage(string FileName)
  {      
     // Pull all the data we need form the DB
-    if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256, DoAlwaysStat)
+    if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256, DoSHA512, DoAlwaysStat)
  		  == false)
     {
        return false;
@@@ -446,6 -447,8 +448,8 @@@
        SetTFRewriteData(Changes[End++], "SHA1", Db.SHA1Res.c_str());
     if (DoSHA256 == true)
        SetTFRewriteData(Changes[End++], "SHA256", Db.SHA256Res.c_str());
+    if (DoSHA512 == true)
+       SetTFRewriteData(Changes[End++], "SHA512", Db.SHA512Res.c_str());
     SetTFRewriteData(Changes[End++], "Filename", NewFileName.c_str());
     SetTFRewriteData(Changes[End++], "Priority", OverItem->Priority.c_str());
     SetTFRewriteData(Changes[End++], "Status", 0);
@@@ -623,6 -626,7 +627,7 @@@ bool SourcesWriter::DoPackage(string Fi
     MD5Summation MD5;
     SHA1Summation SHA1;
     SHA256Summation SHA256;
+    SHA256Summation SHA512;
  
     if (DoMD5 == true)
        MD5.Add((unsigned char *)Start,BlkEnd - Start);
@@@ -630,6 -634,8 +635,8 @@@
        SHA1.Add((unsigned char *)Start,BlkEnd - Start);
     if (DoSHA256 == true)
        SHA256.Add((unsigned char *)Start,BlkEnd - Start);
+    if (DoSHA512 == true)
+       SHA512.Add((unsigned char *)Start,BlkEnd - Start);
  
     // Add an extra \n to the end, just in case
     *BlkEnd++ = '\n';
@@@ -740,6 -746,12 +747,12 @@@
  		   << strippedName << "\n " << Tags.FindS("Checksums-Sha256");
     string const ChecksumsSha256 = ostreamSha256.str();
  
+    std::ostringstream ostreamSha512;
+    if (Tags.Exists("Checksums-Sha512"))
+       ostreamSha512 << "\n " << string(SHA512.Result()) << " " << St.st_size << " "
+ 		   << strippedName << "\n " << Tags.FindS("Checksums-Sha512");
+    string const ChecksumsSha512 = ostreamSha512.str();
+ 
     // Strip the DirStrip prefix from the FileName and add the PathPrefix
     string NewFileName;
     if (DirStrip.empty() == false &&
@@@ -795,6 -807,8 +808,8 @@@
        SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1.c_str());
     if (ChecksumsSha256.empty() == false)
        SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256.c_str());
+    if (ChecksumsSha512.empty() == false)
+       SetTFRewriteData(Changes[End++],"Checksums-Sha512",ChecksumsSha512.c_str());
     if (Directory != "./")
        SetTFRewriteData(Changes[End++],"Directory",Directory.c_str());
     SetTFRewriteData(Changes[End++],"Priority",BestPrio.c_str());
@@@ -1046,6 -1060,10 +1061,12 @@@ bool ReleaseWriter::DoPackage(string Fi
        CheckSums[NewFileName].SHA256 = SHA256.Result();
     }
  
 -   SHA256Summation SHA512;
 -   SHA256.AddFD(fd.Fd(), fd.Size());
 -   CheckSums[NewFileName].SHA512 = SHA512.Result();
 -
++   if (DoSHA512 == true)
++   {
++      SHA512Summation SHA512;
++      SHA512.AddFD(fd.Fd(), fd.Size());
++      CheckSums[NewFileName].SHA512 = SHA512.Result();
++   }
     fd.Close();
     
     return true;
@@@ -1092,4 -1110,16 +1113,16 @@@ void ReleaseWriter::Finish(
  		 (*I).first.c_str());
        }
     }
+ 
+    fprintf(Output, "SHA512:\n");
+    for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin();
+        I != CheckSums.end();
+        ++I)
+    {
+       fprintf(Output, " %s %32ld %s\n",
+               (*I).second.SHA512.c_str(),
+               (*I).second.size,
+               (*I).first.c_str());
+    }
+ 
  }
diff --combined ftparchive/writer.h
index ce0eab7af,b8747decd..c6026e954
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@@ -63,6 -63,6 +63,7 @@@ class FTWScanne
     bool DoMD5;
     bool DoSHA1;
     bool DoSHA256;
++   bool DoSHA512;
  
     unsigned long DeLinkLimit;
     string InternalPrefix;
@@@ -195,6 -195,7 +196,7 @@@ protected
        string MD5;
        string SHA1;
        string SHA256;
+       string SHA512;
        // Limited by FileFd::Size()
        unsigned long size;
        ~CheckSum() {};
diff --combined po/apt-all.pot
index 73ed82195,73ed82195..b409363d0
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2011-01-12 17:42+0100\n"
++"POT-Creation-Date: 2011-06-29 12:34+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -17,155 -17,155 +17,159 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
--#: cmdline/apt-cache.cc:156
++#: cmdline/apt-cache.cc:154
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr ""
  
--#: cmdline/apt-cache.cc:284
++#: cmdline/apt-cache.cc:282
  msgid "Total package names: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:286
++#: cmdline/apt-cache.cc:284
  msgid "Total package structures: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:326
++#: cmdline/apt-cache.cc:324
  msgid "  Normal packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:327
++#: cmdline/apt-cache.cc:325
  msgid "  Pure virtual packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:328
++#: cmdline/apt-cache.cc:326
  msgid "  Single virtual packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:329
++#: cmdline/apt-cache.cc:327
  msgid "  Mixed virtual packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:330
++#: cmdline/apt-cache.cc:328
  msgid "  Missing: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:332
++#: cmdline/apt-cache.cc:330
  msgid "Total distinct versions: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:334
++#: cmdline/apt-cache.cc:332
  msgid "Total distinct descriptions: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:336
++#: cmdline/apt-cache.cc:334
  msgid "Total dependencies: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:339
++#: cmdline/apt-cache.cc:337
  msgid "Total ver/file relations: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:341
++#: cmdline/apt-cache.cc:339
  msgid "Total Desc/File relations: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:343
++#: cmdline/apt-cache.cc:341
  msgid "Total Provides mappings: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:355
++#: cmdline/apt-cache.cc:353
  msgid "Total globbed strings: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:369
++#: cmdline/apt-cache.cc:367
  msgid "Total dependency version space: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:374
++#: cmdline/apt-cache.cc:372
  msgid "Total slack space: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:382
++#: cmdline/apt-cache.cc:380
  msgid "Total space accounted for: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
++#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
--#: cmdline/apt-cache.cc:1273
++#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
++#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
++#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
++msgid "No packages found"
++msgstr ""
++
++#: cmdline/apt-cache.cc:1218
  msgid "You must give at least one search pattern"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
--#: cmdline/apt-cache.cc:1508
--msgid "No packages found"
++#: cmdline/apt-cache.cc:1353
++msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
  msgstr ""
  
--#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
++#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1533
++#: cmdline/apt-cache.cc:1478
  msgid "Package files:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
++#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1554
++#: cmdline/apt-cache.cc:1499
  msgid "Pinned packages:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
++#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
  msgid "(not found)"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1575
++#: cmdline/apt-cache.cc:1519
  msgid "  Installed: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:1576
++#: cmdline/apt-cache.cc:1520
  msgid "  Candidate: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
++#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
  msgid "(none)"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1615
++#: cmdline/apt-cache.cc:1553
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1624
++#: cmdline/apt-cache.cc:1562
  msgid "  Version table:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
--#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:3126 cmdline/apt-internal-solver.cc:30
++#: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s compiled on %s %s\n"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1745
++#: cmdline/apt-cache.cc:1682
  msgid ""
  "Usage: apt-cache [options] command\n"
--"       apt-cache [options] add file1 [file2 ...]\n"
  "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
  "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
  "\n"
--"apt-cache is a low-level tool used to manipulate APT's binary\n"
--"cache files, and query information from them\n"
++"apt-cache is a low-level tool used to query information\n"
++"from APT's binary cache files\n"
  "\n"
  "Commands:\n"
--"   add - Add a package file to the source cache\n"
  "   gencaches - Build both the package and source cache\n"
  "   showpkg - Show some general information for a single package\n"
  "   showsrc - Show source records\n"
@@@ -175,7 -175,7 +179,6 @@@
  "   unmet - Show unmet dependencies\n"
  "   search - Search the package list for a regex pattern\n"
  "   show - Show a readable record for the package\n"
--"   showauto - Display a list of automatically installed packages\n"
  "   depends - Show raw dependency information for a package\n"
  "   rdepends - Show reverse dependency information for a package\n"
  "   pkgnames - List the names of all packages in the system\n"
@@@ -211,11 -211,11 +214,11 @@@ msgstr "
  msgid "Repeat this process for the rest of the CDs in your set."
  msgstr ""
  
--#: cmdline/apt-config.cc:41
++#: cmdline/apt-config.cc:44
  msgid "Arguments not in pairs"
  msgstr ""
  
--#: cmdline/apt-config.cc:76
++#: cmdline/apt-config.cc:79
  msgid ""
  "Usage: apt-config [options] command\n"
  "\n"
@@@ -250,7 -250,7 +253,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -361,105 -361,105 +364,100 @@@ msgstr "
  msgid "Failed to stat %s"
  msgstr ""
  
--#: ftparchive/cachedb.cc:242
++#: ftparchive/cachedb.cc:245
  msgid "Archive has no control record"
  msgstr ""
  
--#: ftparchive/cachedb.cc:448
++#: ftparchive/cachedb.cc:482
  msgid "Unable to get a cursor"
  msgstr ""
  
--#: ftparchive/writer.cc:73
++#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:78
++#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:134
++#: ftparchive/writer.cc:140
  msgid "E: "
  msgstr ""
  
--#: ftparchive/writer.cc:136
++#: ftparchive/writer.cc:142
  msgid "W: "
  msgstr ""
  
--#: ftparchive/writer.cc:143
++#: ftparchive/writer.cc:149
  msgid "E: Errors apply to file "
  msgstr ""
  
--#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
++#: ftparchive/writer.cc:167 ftparchive/writer.cc:199
  #, c-format
  msgid "Failed to resolve %s"
  msgstr ""
  
--#: ftparchive/writer.cc:174
++#: ftparchive/writer.cc:180
  msgid "Tree walking failed"
  msgstr ""
  
--#: ftparchive/writer.cc:201
++#: ftparchive/writer.cc:207
  #, c-format
  msgid "Failed to open %s"
  msgstr ""
  
--#: ftparchive/writer.cc:260
++#: ftparchive/writer.cc:266
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr ""
  
--#: ftparchive/writer.cc:268
++#: ftparchive/writer.cc:274
  #, c-format
  msgid "Failed to readlink %s"
  msgstr ""
  
--#: ftparchive/writer.cc:272
++#: ftparchive/writer.cc:278
  #, c-format
  msgid "Failed to unlink %s"
  msgstr ""
  
--#: ftparchive/writer.cc:279
++#: ftparchive/writer.cc:285
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr ""
  
--#: ftparchive/writer.cc:289
++#: ftparchive/writer.cc:295
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr ""
  
--#: ftparchive/writer.cc:393
++#: ftparchive/writer.cc:400
  msgid "Archive had no package field"
  msgstr ""
  
--#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
++#: ftparchive/writer.cc:408 ftparchive/writer.cc:710
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr ""
  
--#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
++#: ftparchive/writer.cc:476 ftparchive/writer.cc:826
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr ""
  
--#: ftparchive/writer.cc:698
++#: ftparchive/writer.cc:720
  #, c-format
  msgid "  %s has no source override entry\n"
  msgstr ""
  
--#: ftparchive/writer.cc:702
++#: ftparchive/writer.cc:724
  #, c-format
  msgid "  %s has no binary override entry either\n"
  msgstr ""
  
--#: ftparchive/contents.cc:321
--#, c-format
--msgid "Internal error, could not locate member %s"
--msgstr ""
--
--#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
++#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
  msgid "realloc - Failed to allocate memory"
  msgstr ""
  
@@@ -488,63 -488,63 +486,63 @@@ msgstr "
  msgid "Failed to read the override file %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:72
++#: ftparchive/multicompress.cc:67
  #, c-format
  msgid "Unknown compression algorithm '%s'"
  msgstr ""
  
--#: ftparchive/multicompress.cc:102
++#: ftparchive/multicompress.cc:97
  #, c-format
  msgid "Compressed output %s needs a compression set"
  msgstr ""
  
--#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
++#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
  msgid "Failed to create IPC pipe to subprocess"
  msgstr ""
  
--#: ftparchive/multicompress.cc:195
++#: ftparchive/multicompress.cc:191
  msgid "Failed to create FILE*"
  msgstr ""
  
--#: ftparchive/multicompress.cc:198
++#: ftparchive/multicompress.cc:194
  msgid "Failed to fork"
  msgstr ""
  
--#: ftparchive/multicompress.cc:212
++#: ftparchive/multicompress.cc:208
  msgid "Compress child"
  msgstr ""
  
--#: ftparchive/multicompress.cc:235
++#: ftparchive/multicompress.cc:231
  #, c-format
  msgid "Internal error, failed to create %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:286
++#: ftparchive/multicompress.cc:282
  msgid "Failed to create subprocess IPC"
  msgstr ""
  
--#: ftparchive/multicompress.cc:321
++#: ftparchive/multicompress.cc:319
  msgid "Failed to exec compressor "
  msgstr ""
  
--#: ftparchive/multicompress.cc:360
++#: ftparchive/multicompress.cc:358
  msgid "decompressor"
  msgstr ""
  
--#: ftparchive/multicompress.cc:403
++#: ftparchive/multicompress.cc:401
  msgid "IO to subprocess/file failed"
  msgstr ""
  
--#: ftparchive/multicompress.cc:455
++#: ftparchive/multicompress.cc:453
  msgid "Failed to read while computing MD5"
  msgstr ""
  
--#: ftparchive/multicompress.cc:472
++#: ftparchive/multicompress.cc:470
  #, c-format
  msgid "Problem unlinking %s"
  msgstr ""
  
--#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
++#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
  #, c-format
  msgid "Failed to rename %s to %s"
  msgstr ""
@@@ -592,94 -592,94 +590,94 @@@ msgstr "
  msgid " or"
  msgstr ""
  
--#: cmdline/apt-get.cc:392
++#: cmdline/apt-get.cc:390
  msgid "The following NEW packages will be installed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:420
++#: cmdline/apt-get.cc:416
  msgid "The following packages will be REMOVED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:442
++#: cmdline/apt-get.cc:438
  msgid "The following packages have been kept back:"
  msgstr ""
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:459
  msgid "The following packages will be upgraded:"
  msgstr ""
  
--#: cmdline/apt-get.cc:488
++#: cmdline/apt-get.cc:480
  msgid "The following packages will be DOWNGRADED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:508
++#: cmdline/apt-get.cc:500
  msgid "The following held packages will be changed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:563
++#: cmdline/apt-get.cc:555
  #, c-format
  msgid "%s (due to %s) "
  msgstr ""
  
--#: cmdline/apt-get.cc:571
++#: cmdline/apt-get.cc:563
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
  
--#: cmdline/apt-get.cc:605
++#: cmdline/apt-get.cc:594
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr ""
  
--#: cmdline/apt-get.cc:609
++#: cmdline/apt-get.cc:598
  #, c-format
  msgid "%lu reinstalled, "
  msgstr ""
  
--#: cmdline/apt-get.cc:611
++#: cmdline/apt-get.cc:600
  #, c-format
  msgid "%lu downgraded, "
  msgstr ""
  
--#: cmdline/apt-get.cc:613
++#: cmdline/apt-get.cc:602
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:617
++#: cmdline/apt-get.cc:606
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:639
++#: cmdline/apt-get.cc:628
  #, c-format
  msgid "Note, selecting '%s' for task '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:645
++#: cmdline/apt-get.cc:634
  #, c-format
  msgid "Note, selecting '%s' for regex '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:662
++#: cmdline/apt-get.cc:651
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:673
++#: cmdline/apt-get.cc:662
  msgid " [Installed]"
  msgstr ""
  
--#: cmdline/apt-get.cc:682
++#: cmdline/apt-get.cc:671
  msgid " [Not candidate version]"
  msgstr ""
  
--#: cmdline/apt-get.cc:684
++#: cmdline/apt-get.cc:673
  msgid "You should explicitly select one to install."
  msgstr ""
  
--#: cmdline/apt-get.cc:687
++#: cmdline/apt-get.cc:676
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -687,177 -687,177 +685,177 @@@
  "is only available from another source\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:705
++#: cmdline/apt-get.cc:694
  msgid "However the following packages replace it:"
  msgstr ""
  
--#: cmdline/apt-get.cc:717
++#: cmdline/apt-get.cc:706
  #, c-format
  msgid "Package '%s' has no installation candidate"
  msgstr ""
  
--#: cmdline/apt-get.cc:728
++#: cmdline/apt-get.cc:717
  #, c-format
  msgid "Virtual packages like '%s' can't be removed\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:759
++#: cmdline/apt-get.cc:748
  #, c-format
  msgid "Note, selecting '%s' instead of '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:789
++#: cmdline/apt-get.cc:778
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:793
++#: cmdline/apt-get.cc:782
  #, c-format
  msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:803
++#: cmdline/apt-get.cc:794
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:808
++#: cmdline/apt-get.cc:799
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
++#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2082 cmdline/apt-mark.cc:59
  #, c-format
  msgid "%s set to manually installed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:853
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "Selected version '%s' (%s) for '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:849
  #, c-format
  msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:898
++#: cmdline/apt-get.cc:893
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:973
++#: cmdline/apt-get.cc:971
  msgid "Correcting dependencies..."
  msgstr ""
  
--#: cmdline/apt-get.cc:976
++#: cmdline/apt-get.cc:974
  msgid " failed."
  msgstr ""
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:977
  msgid "Unable to correct dependencies"
  msgstr ""
  
--#: cmdline/apt-get.cc:982
++#: cmdline/apt-get.cc:980
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
--#: cmdline/apt-get.cc:984
++#: cmdline/apt-get.cc:982
  msgid " Done"
  msgstr ""
  
--#: cmdline/apt-get.cc:988
++#: cmdline/apt-get.cc:986
  msgid "You might want to run 'apt-get -f install' to correct these."
  msgstr ""
  
--#: cmdline/apt-get.cc:991
++#: cmdline/apt-get.cc:989
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
--#: cmdline/apt-get.cc:1016
++#: cmdline/apt-get.cc:1014
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
--#: cmdline/apt-get.cc:1020
++#: cmdline/apt-get.cc:1018
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1027
++#: cmdline/apt-get.cc:1025
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
--#: cmdline/apt-get.cc:1029
++#: cmdline/apt-get.cc:1027
  msgid "Some packages could not be authenticated"
  msgstr ""
  
--#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
++#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
--#: cmdline/apt-get.cc:1079
++#: cmdline/apt-get.cc:1077
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
--#: cmdline/apt-get.cc:1088
++#: cmdline/apt-get.cc:1086
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
--#: cmdline/apt-get.cc:1099
++#: cmdline/apt-get.cc:1097
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
--#: cmdline/apt-get.cc:1137
++#: cmdline/apt-get.cc:1135
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:1144
++#: cmdline/apt-get.cc:1142
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:1149
++#: cmdline/apt-get.cc:1147
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:1156
++#: cmdline/apt-get.cc:1154
  #, c-format
  msgid "After this operation, %sB of additional disk space will be used.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:1161
++#: cmdline/apt-get.cc:1159
  #, c-format
  msgid "After this operation, %sB disk space will be freed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
--#: cmdline/apt-get.cc:2370
++#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2496
++#: cmdline/apt-get.cc:2499
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:1189
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
--#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225
++#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
--#: cmdline/apt-get.cc:1207
++#: cmdline/apt-get.cc:1205
  msgid "Yes, do as I say!"
  msgstr ""
  
--#: cmdline/apt-get.cc:1209
++#: cmdline/apt-get.cc:1207
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -865,46 -865,46 +863,46 @@@
  " ?] "
  msgstr ""
  
--#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
++#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
  msgid "Abort."
  msgstr ""
  
--#: cmdline/apt-get.cc:1230
++#: cmdline/apt-get.cc:1228
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
--#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
++#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2561 apt-pkg/algorithms.cc:1453
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1320
++#: cmdline/apt-get.cc:1318
  msgid "Some files failed to download"
  msgstr ""
  
--#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
++#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2573
  msgid "Download complete and in download only mode"
  msgstr ""
  
--#: cmdline/apt-get.cc:1327
++#: cmdline/apt-get.cc:1325
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
--#: cmdline/apt-get.cc:1331
++#: cmdline/apt-get.cc:1329
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
--#: cmdline/apt-get.cc:1336
++#: cmdline/apt-get.cc:1334
  msgid "Unable to correct missing packages."
  msgstr ""
  
--#: cmdline/apt-get.cc:1337
++#: cmdline/apt-get.cc:1335
  msgid "Aborting install."
  msgstr ""
  
--#: cmdline/apt-get.cc:1365
++#: cmdline/apt-get.cc:1363
  msgid ""
  "The following package disappeared from your system as\n"
  "all files have been overwritten by other packages:"
@@@ -914,35 -914,35 +912,35 @@@ msgid_plural "
  msgstr[0] ""
  msgstr[1] ""
  
--#: cmdline/apt-get.cc:1369
++#: cmdline/apt-get.cc:1367
  msgid "Note: This is done automatic and on purpose by dpkg."
  msgstr ""
  
--#: cmdline/apt-get.cc:1499
++#: cmdline/apt-get.cc:1497
  #, c-format
  msgid "Ignore unavailable target release '%s' of package '%s'"
  msgstr ""
  
--#: cmdline/apt-get.cc:1531
++#: cmdline/apt-get.cc:1529
  #, c-format
  msgid "Picking '%s' as source package instead of '%s'\n"
  msgstr ""
  
  #. if (VerTag.empty() == false && Last == 0)
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1567
  #, c-format
  msgid "Ignore unavailable version '%s' of package '%s'"
  msgstr ""
  
--#: cmdline/apt-get.cc:1585
++#: cmdline/apt-get.cc:1583
  msgid "The update command takes no arguments"
  msgstr ""
  
--#: cmdline/apt-get.cc:1647
++#: cmdline/apt-get.cc:1645
  msgid "We are not supposed to delete stuff, can't start AutoRemover"
  msgstr ""
  
--#: cmdline/apt-get.cc:1699
++#: cmdline/apt-get.cc:1740
  msgid ""
  "Hmm, seems like the AutoRemover destroyed something which really\n"
  "shouldn't happen. Please file a bug report against apt."
@@@ -958,15 -958,15 +956,15 @@@ msgstr "
  #. "that package should be filed.") << endl;
  #. }
  #.
--#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
++#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1912
  msgid "The following information may help to resolve the situation:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1706
++#: cmdline/apt-get.cc:1747
  msgid "Internal Error, AutoRemover broke stuff"
  msgstr ""
  
--#: cmdline/apt-get.cc:1713
++#: cmdline/apt-get.cc:1754
  msgid ""
  "The following package was automatically installed and is no longer required:"
  msgid_plural ""
@@@ -975,7 -975,7 +973,7 @@@
  msgstr[0] ""
  msgstr[1] ""
  
--#: cmdline/apt-get.cc:1717
++#: cmdline/apt-get.cc:1758
  #, c-format
  msgid "%lu package was automatically installed and is no longer required.\n"
  msgid_plural ""
@@@ -983,25 -983,25 +981,25 @@@
  msgstr[0] ""
  msgstr[1] ""
  
--#: cmdline/apt-get.cc:1719
++#: cmdline/apt-get.cc:1760
  msgid "Use 'apt-get autoremove' to remove them."
  msgstr ""
  
--#: cmdline/apt-get.cc:1738
++#: cmdline/apt-get.cc:1779
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
--#: cmdline/apt-get.cc:1828
++#: cmdline/apt-get.cc:1878
  msgid "You might want to run 'apt-get -f install' to correct these:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1831
++#: cmdline/apt-get.cc:1882
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
--#: cmdline/apt-get.cc:1843
++#: cmdline/apt-get.cc:1897
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1009,69 -1009,69 +1007,80 @@@
  "or been moved out of Incoming."
  msgstr ""
  
--#: cmdline/apt-get.cc:1861
++#: cmdline/apt-get.cc:1918
  msgid "Broken packages"
  msgstr ""
  
--#: cmdline/apt-get.cc:1889
++#: cmdline/apt-get.cc:1944
  msgid "The following extra packages will be installed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2034
  msgid "Suggested packages:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1980
++#: cmdline/apt-get.cc:2035
  msgid "Recommended packages:"
  msgstr ""
  
--#: cmdline/apt-get.cc:2022
++#: cmdline/apt-get.cc:2077
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:2029
++#: cmdline/apt-get.cc:2084 cmdline/apt-mark.cc:61
  #, c-format
  msgid "%s set to automatically installed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2050
++#: cmdline/apt-get.cc:2092 cmdline/apt-mark.cc:105
++msgid ""
++"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
++"instead."
++msgstr ""
++
++#: cmdline/apt-get.cc:2108
  msgid "Calculating upgrade... "
  msgstr ""
  
--#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
++#: cmdline/apt-get.cc:2111 methods/ftp.cc:707 methods/connect.cc:111
  msgid "Failed"
  msgstr ""
  
--#: cmdline/apt-get.cc:2058
++#: cmdline/apt-get.cc:2116
  msgid "Done"
  msgstr ""
  
--#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
++#: cmdline/apt-get.cc:2183 cmdline/apt-get.cc:2191
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
--#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
++#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2248
  msgid "Unable to lock the download directory"
  msgstr ""
  
--#: cmdline/apt-get.cc:2233
++#: cmdline/apt-get.cc:2299
++#, c-format
++msgid "Downloading %s %s"
++msgstr ""
++
++#: cmdline/apt-get.cc:2357
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
--#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554
++#: cmdline/apt-get.cc:2398 cmdline/apt-get.cc:2694
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:2289
++#: cmdline/apt-get.cc:2415
  #, c-format
  msgid ""
  "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
  "%s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2294
++#: cmdline/apt-get.cc:2420
  #, c-format
  msgid ""
  "Please use:\n"
@@@ -1079,115 -1079,115 +1088,120 @@@
  "to retrieve the latest (possibly unreleased) updates to the package.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2345
++#: cmdline/apt-get.cc:2473
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2380
++#: cmdline/apt-get.cc:2510
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:2388
++#: cmdline/apt-get.cc:2519
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
  #. TRANSLATOR: The required space between number and unit is already included
  #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
--#: cmdline/apt-get.cc:2393
++#: cmdline/apt-get.cc:2524
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2399
++#: cmdline/apt-get.cc:2530
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2432
++#: cmdline/apt-get.cc:2568
  msgid "Failed to fetch some archives."
  msgstr ""
  
--#: cmdline/apt-get.cc:2462
++#: cmdline/apt-get.cc:2599
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2474
++#: cmdline/apt-get.cc:2611
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2475
++#: cmdline/apt-get.cc:2612
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2492
++#: cmdline/apt-get.cc:2629
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2512
++#: cmdline/apt-get.cc:2649
  msgid "Child process failed"
  msgstr ""
  
--#: cmdline/apt-get.cc:2528
++#: cmdline/apt-get.cc:2668
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
--#: cmdline/apt-get.cc:2559
++#: cmdline/apt-get.cc:2699
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:2579
++#: cmdline/apt-get.cc:2719
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2630
++#: cmdline/apt-get.cc:2770
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
--#: cmdline/apt-get.cc:2683
++#: cmdline/apt-get.cc:2823
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
--#: cmdline/apt-get.cc:2719
++#: cmdline/apt-get.cc:2859
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
--#: cmdline/apt-get.cc:2746
++#: cmdline/apt-get.cc:2886
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:2762
++#: cmdline/apt-get.cc:2902
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
--#: cmdline/apt-get.cc:2767
++#: cmdline/apt-get.cc:2907
  msgid "Failed to process build dependencies"
  msgstr ""
  
--#: cmdline/apt-get.cc:2798
++#: cmdline/apt-get.cc:3000 cmdline/apt-get.cc:3012
++#, c-format
++msgid "Changelog for %s (%s)"
++msgstr ""
++
++#: cmdline/apt-get.cc:3131
  msgid "Supported modules:"
  msgstr ""
  
--#: cmdline/apt-get.cc:2839
++#: cmdline/apt-get.cc:3172
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1211,8 -1211,8 +1225,8 @@@
  "   clean - Erase downloaded archive files\n"
  "   autoclean - Erase old downloaded archive files\n"
  "   check - Verify that there are no broken dependencies\n"
--"   markauto - Mark the given packages as automatically installed\n"
--"   unmarkauto - Mark the given packages as manually installed\n"
++"   changelog - Download and display the changelog for the given package\n"
++"   download - Download the binary package into the current directory\n"
  "\n"
  "Options:\n"
  "  -h  This help text.\n"
@@@ -1233,7 -1233,7 +1247,7 @@@
  "                       This APT has Super Cow Powers.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:2995
++#: cmdline/apt-get.cc:3335
  msgid ""
  "NOTE: This is only a simulation!\n"
  "      apt-get needs root privileges for real execution.\n"
@@@ -1275,6 -1275,6 +1289,83 @@@ msgid "
  "in the drive '%s' and press enter\n"
  msgstr ""
  
++#: cmdline/apt-internal-solver.cc:34
++msgid ""
++"Usage: apt-internal-resolver\n"
++"\n"
++"apt-internal-resolver is an interface to use the current internal\n"
++"like an external resolver for the APT family for debugging or alike\n"
++"\n"
++"Options:\n"
++"  -h  This help text.\n"
++"  -q  Loggable output - no progress indicator\n"
++"  -c=? Read this configuration file\n"
++"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
++"apt.conf(5) manual pages for more information and options.\n"
++"                       This APT has Super Cow Powers.\n"
++msgstr ""
++
++#: cmdline/apt-mark.cc:46
++#, c-format
++msgid "%s can not be marked as it is not installed.\n"
++msgstr ""
++
++#: cmdline/apt-mark.cc:52
++#, c-format
++msgid "%s was already set to manually installed.\n"
++msgstr ""
++
++#: cmdline/apt-mark.cc:54
++#, c-format
++msgid "%s was already set to automatically installed.\n"
++msgstr ""
++
++#: cmdline/apt-mark.cc:169
++#, c-format
++msgid "%s was already set on hold.\n"
++msgstr ""
++
++#: cmdline/apt-mark.cc:171
++#, c-format
++msgid "%s was already not hold.\n"
++msgstr ""
++
++#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
++#, c-format
++msgid "%s set on hold.\n"
++msgstr ""
++
++#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
++#, c-format
++msgid "Canceled hold on %s.\n"
++msgstr ""
++
++#: cmdline/apt-mark.cc:220
++msgid "Executing dpkg failed. Are you root?"
++msgstr ""
++
++#: cmdline/apt-mark.cc:268
++msgid ""
++"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
++"\n"
++"apt-mark is a simple command line interface for marking packages\n"
++"as manual or automatical installed. It can also list marks.\n"
++"\n"
++"Commands:\n"
++"   auto - Mark the given packages as automatically installed\n"
++"   manual - Mark the given packages as manually installed\n"
++"\n"
++"Options:\n"
++"  -h  This help text.\n"
++"  -q  Loggable output - no progress indicator\n"
++"  -qq No output except for errors\n"
++"  -s  No-act. Just prints what would be done.\n"
++"  -f  read/write auto/manual marking in the given file\n"
++"  -c=? Read this configuration file\n"
++"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
++"See the apt-mark(8) and apt.conf(5) manual pages for more information."
++msgstr ""
++
  #: cmdline/apt-sortpkgs.cc:86
  msgid "Unknown package record!"
  msgstr ""
@@@ -1335,7 -1335,7 +1426,7 @@@ msgstr "
  msgid "Failed to exec gzip "
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
++#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
  msgid "Corrupted archive"
  msgstr ""
  
@@@ -1343,7 -1343,7 +1434,7 @@@
  msgid "Tar checksum failed, archive corrupted"
  msgstr ""
  
--#: apt-inst/contrib/extracttar.cc:296
++#: apt-inst/contrib/extracttar.cc:300
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr ""
@@@ -1404,12 -1404,12 +1495,12 @@@ msgstr "
  msgid "Duplicate conf file %s/%s"
  msgstr ""
  
--#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
++#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
  #, c-format
  msgid "Failed to write file %s"
  msgstr ""
  
--#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
++#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
  #, c-format
  msgid "Failed to close file %s"
  msgstr ""
@@@ -1451,28 -1451,28 +1542,28 @@@ msgstr "
  msgid "The path is too long"
  msgstr ""
  
--#: apt-inst/extract.cc:414
++#: apt-inst/extract.cc:412
  #, c-format
  msgid "Overwrite package match with no version for %s"
  msgstr ""
  
--#: apt-inst/extract.cc:431
++#: apt-inst/extract.cc:429
  #, c-format
  msgid "File %s/%s overwrites the one in the package %s"
  msgstr ""
  
  #. Only warn if there are no sources.list.d.
  #. Only warn if there is no sources.list file.
--#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
--#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
--#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
--#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
--#: methods/mirror.cc:87
++#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
++#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
++#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:102
++#: apt-pkg/init.cc:110 apt-pkg/clean.cc:33 apt-pkg/policy.cc:318
++#: methods/mirror.cc:91
  #, c-format
  msgid "Unable to read %s"
  msgstr ""
  
--#: apt-inst/extract.cc:491
++#: apt-inst/extract.cc:489
  #, c-format
  msgid "Unable to stat %s"
  msgstr ""
@@@ -1496,9 -1496,9 +1587,9 @@@ msgstr "
  msgid "The info and temp directories need to be on the same filesystem"
  msgstr ""
  
--#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
--#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
--#: apt-pkg/pkgcachegen.cc:1326
++#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
++#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
++#: apt-pkg/pkgcachegen.cc:1304
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1571,51 -1571,51 +1662,57 @@@ msgstr "
  msgid "Error parsing MD5. Offset %lu"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
++#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
  #, c-format
  msgid "This is not a valid DEB archive, missing '%s' member"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:50
++#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
++#: apt-inst/deb/debfile.cc:53
  #, c-format
  msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:110
++#: apt-inst/deb/debfile.cc:113
  #, c-format
  msgid "Couldn't change to %s"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:140
--msgid "Internal error, could not locate member"
++#: apt-inst/deb/debfile.cc:154
++#, c-format
++msgid "Internal error, could not locate member %s"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:173
++#: apt-inst/deb/debfile.cc:189
  msgid "Failed to locate a valid control file"
  msgstr ""
  
--#: apt-inst/deb/debfile.cc:258
++#: apt-inst/deb/debfile.cc:274
  msgid "Unparsable control file"
  msgstr ""
  
--#: methods/bzip2.cc:65
++#: methods/bzip2.cc:60 methods/gzip.cc:52
++msgid "Empty files can't be valid archives"
++msgstr ""
++
++#: methods/bzip2.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr ""
  
--#: methods/bzip2.cc:109
++#: methods/bzip2.cc:108
  #, c-format
  msgid "Read error from %s process"
  msgstr ""
  
--#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
--#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
--#: methods/rred.cc:495
++#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
++#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
++#: methods/rred.cc:533
  msgid "Failed to stat"
  msgstr ""
  
--#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
--#: methods/rred.cc:492
++#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
++#: methods/rred.cc:530
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1643,7 -1643,7 +1740,7 @@@ msgstr "
  msgid "Disk not found."
  msgstr ""
  
--#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
++#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
  msgid "File not found"
  msgstr ""
  
@@@ -1695,7 -1695,7 +1792,7 @@@ msgstr "
  msgid "TYPE failed, server said: %s"
  msgstr ""
  
--#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
++#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
  msgid "Connection timeout"
  msgstr ""
  
@@@ -1703,11 -1703,11 +1800,11 @@@
  msgid "Server closed the connection"
  msgstr ""
  
--#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
++#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
  msgid "Read error"
  msgstr ""
  
--#: methods/ftp.cc:351 methods/rsh.cc:197
++#: methods/ftp.cc:351 methods/rsh.cc:198
  msgid "A response overflowed the buffer."
  msgstr ""
  
@@@ -1715,7 -1715,7 +1812,7 @@@
  msgid "Protocol corruption"
  msgstr ""
  
--#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
++#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
  msgid "Write error"
  msgstr ""
  
@@@ -1769,7 -1769,7 +1866,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
--#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
++#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1778,7 -1778,7 +1875,7 @@@
  msgid "Unable to fetch file, server said '%s'"
  msgstr ""
  
--#: methods/ftp.cc:897 methods/rsh.cc:321
++#: methods/ftp.cc:897 methods/rsh.cc:322
  msgid "Data socket timed out"
  msgstr ""
  
@@@ -1828,7 -1828,7 +1925,7 @@@ msgstr "
  
  #. We say this mainly because the pause here is for the
  #. ssh connection that is still going
--#: methods/connect.cc:149 methods/rsh.cc:424
++#: methods/connect.cc:149 methods/rsh.cc:425
  #, c-format
  msgid "Connecting to %s"
  msgstr ""
@@@ -1919,47 -1919,47 +2016,47 @@@ msgstr "
  msgid "Unknown date format"
  msgstr ""
  
--#: methods/http.cc:799
++#: methods/http.cc:800
  msgid "Select failed"
  msgstr ""
  
--#: methods/http.cc:804
++#: methods/http.cc:805
  msgid "Connection timed out"
  msgstr ""
  
--#: methods/http.cc:827
++#: methods/http.cc:828
  msgid "Error writing to output file"
  msgstr ""
  
--#: methods/http.cc:858
++#: methods/http.cc:859
  msgid "Error writing to file"
  msgstr ""
  
--#: methods/http.cc:886
++#: methods/http.cc:887
  msgid "Error writing to the file"
  msgstr ""
  
--#: methods/http.cc:900
++#: methods/http.cc:901
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
--#: methods/http.cc:902
++#: methods/http.cc:903
  msgid "Error reading from server"
  msgstr ""
  
--#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
++#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
  msgid "Failed to truncate file"
  msgstr ""
  
--#: methods/http.cc:1160
++#: methods/http.cc:1183
  msgid "Bad header data"
  msgstr ""
  
--#: methods/http.cc:1177 methods/http.cc:1232
++#: methods/http.cc:1200 methods/http.cc:1255
  msgid "Connection failed"
  msgstr ""
  
--#: methods/http.cc:1324
++#: methods/http.cc:1347
  msgid "Internal error"
  msgstr ""
  
@@@ -1972,7 -1972,7 +2069,7 @@@ msgstr "
  msgid "Couldn't duplicate file descriptor %i"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
++#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
  #, c-format
  msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
@@@ -1985,21 -1985,21 +2082,21 @@@ msgstr "
  msgid "Unable to synchronize mmap"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:300
++#: apt-pkg/contrib/mmap.cc:310
  #, c-format
  msgid ""
  "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
  "Current value: %lu. (man 5 apt.conf)"
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:399
++#: apt-pkg/contrib/mmap.cc:409
  #, c-format
  msgid ""
  "Unable to increase the size of the MMap as the limit of %lu bytes is already "
  "reached."
  msgstr ""
  
--#: apt-pkg/contrib/mmap.cc:402
++#: apt-pkg/contrib/mmap.cc:412
  msgid ""
  "Unable to increase size of the MMap as automatic growing is disabled by user."
  msgstr ""
@@@ -2028,7 -2028,7 +2125,7 @@@ msgstr "
  msgid "%lis"
  msgstr ""
  
--#: apt-pkg/contrib/strutl.cc:1119
++#: apt-pkg/contrib/strutl.cc:1138
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -2088,12 -2088,12 +2185,12 @@@ msgstr "
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr ""
  
--#: apt-pkg/contrib/progress.cc:153
++#: apt-pkg/contrib/progress.cc:144
  #, c-format
  msgid "%c%s... Error!"
  msgstr ""
  
--#: apt-pkg/contrib/progress.cc:155
++#: apt-pkg/contrib/progress.cc:146
  #, c-format
  msgid "%c%s... Done"
  msgstr ""
@@@ -2151,106 -2151,106 +2248,122 @@@ msgstr "
  
  #: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
  #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
--#: methods/mirror.cc:93
++#: methods/mirror.cc:97
  #, c-format
  msgid "Unable to change to %s"
  msgstr ""
  
--#: apt-pkg/contrib/cdromutl.cc:217
++#: apt-pkg/contrib/cdromutl.cc:220
  msgid "Failed to stat the cdrom"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:154
++#: apt-pkg/contrib/fileutl.cc:168
  #, c-format
  msgid "Not using locking for read only lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:159
++#: apt-pkg/contrib/fileutl.cc:173
  #, c-format
  msgid "Could not open lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:177
++#: apt-pkg/contrib/fileutl.cc:191
  #, c-format
  msgid "Not using locking for nfs mounted lock file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:181
++#: apt-pkg/contrib/fileutl.cc:195
  #, c-format
  msgid "Could not get lock %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:321
++#: apt-pkg/contrib/fileutl.cc:335
  #, c-format
  msgid "List of files can't be created as '%s' is not a directory"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:661
++#: apt-pkg/contrib/fileutl.cc:362
++#, c-format
++msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
++msgstr ""
++
++#: apt-pkg/contrib/fileutl.cc:380
++#, c-format
++msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
++msgstr ""
++
++#: apt-pkg/contrib/fileutl.cc:389
++#, c-format
++msgid ""
++"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
++msgstr ""
++
++#: apt-pkg/contrib/fileutl.cc:679
  #, c-format
  msgid "Waited for %s but it wasn't there"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:673
++#: apt-pkg/contrib/fileutl.cc:691
  #, c-format
  msgid "Sub-process %s received a segmentation fault."
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:675
++#: apt-pkg/contrib/fileutl.cc:693
  #, c-format
  msgid "Sub-process %s received signal %u."
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:679
++#: apt-pkg/contrib/fileutl.cc:697
  #, c-format
  msgid "Sub-process %s returned an error code (%u)"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:681
++#: apt-pkg/contrib/fileutl.cc:699
  #, c-format
  msgid "Sub-process %s exited unexpectedly"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:746
++#: apt-pkg/contrib/fileutl.cc:764
  #, c-format
  msgid "Could not open file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:763
++#: apt-pkg/contrib/fileutl.cc:781
  #, c-format
  msgid "Could not open file descriptor %d"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:823
++#: apt-pkg/contrib/fileutl.cc:841
  #, c-format
  msgid "read, still have %lu to read but none left"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:856
++#: apt-pkg/contrib/fileutl.cc:874
  #, c-format
  msgid "write, still have %lu to write but couldn't"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:985
++#: apt-pkg/contrib/fileutl.cc:1010
  #, c-format
  msgid "Problem closing the gzip file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:988
++#: apt-pkg/contrib/fileutl.cc:1013
  #, c-format
  msgid "Problem closing the file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:993
++#: apt-pkg/contrib/fileutl.cc:1018
  #, c-format
  msgid "Problem renaming the file %s to %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:1004
++#: apt-pkg/contrib/fileutl.cc:1029
  #, c-format
  msgid "Problem unlinking the file %s"
  msgstr ""
  
--#: apt-pkg/contrib/fileutl.cc:1017
++#: apt-pkg/contrib/fileutl.cc:1042
  msgid "Problem syncing the file"
  msgstr ""
  
@@@ -2275,59 -2275,59 +2388,59 @@@ msgstr "
  msgid "The package cache was built for a different architecture"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:293
++#: apt-pkg/pkgcache.cc:299
  msgid "Depends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:293
++#: apt-pkg/pkgcache.cc:299
  msgid "PreDepends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:293
++#: apt-pkg/pkgcache.cc:299
  msgid "Suggests"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:294
++#: apt-pkg/pkgcache.cc:300
  msgid "Recommends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:294
++#: apt-pkg/pkgcache.cc:300
  msgid "Conflicts"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:294
++#: apt-pkg/pkgcache.cc:300
  msgid "Replaces"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:295
++#: apt-pkg/pkgcache.cc:301
  msgid "Obsoletes"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:295
++#: apt-pkg/pkgcache.cc:301
  msgid "Breaks"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:295
++#: apt-pkg/pkgcache.cc:301
  msgid "Enhances"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:306
++#: apt-pkg/pkgcache.cc:312
  msgid "important"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:306
++#: apt-pkg/pkgcache.cc:312
  msgid "required"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:306
++#: apt-pkg/pkgcache.cc:312
  msgid "standard"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:307
++#: apt-pkg/pkgcache.cc:313
  msgid "optional"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:307
++#: apt-pkg/pkgcache.cc:313
  msgid "extra"
  msgstr ""
  
@@@ -2357,17 -2357,17 +2470,12 @@@ msgstr "
  msgid "Failed to write temporary StateFile %s"
  msgstr ""
  
--#: apt-pkg/depcache.cc:922
--#, c-format
--msgid "Internal error, group '%s' has no installable pseudo package"
--msgstr ""
--
--#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:123
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr ""
  
--#: apt-pkg/tagfile.cc:189
++#: apt-pkg/tagfile.cc:210
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr ""
@@@ -2427,7 -2427,7 +2535,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
++#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
@@@ -2442,14 -2442,14 +2550,14 @@@ msgstr "
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
++#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
  #, c-format
  msgid ""
  "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
  "under APT::Immediate-Configure for details. (%d)"
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:452
++#: apt-pkg/packagemanager.cc:456
  #, c-format
  msgid ""
  "This installation run will require temporarily removing the essential "
@@@ -2457,7 -2457,7 +2565,7 @@@
  "you really want to do it, activate the APT::Force-LoopBreak option."
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:495
++#: apt-pkg/packagemanager.cc:501
  #, c-format
  msgid ""
  "Could not perform immediate configuration on already unpacked '%s'. Please "
@@@ -2469,25 -2469,25 +2577,25 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
--#: apt-pkg/algorithms.cc:292
++#: apt-pkg/algorithms.cc:250
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
--#: apt-pkg/algorithms.cc:1218
++#: apt-pkg/algorithms.cc:1186
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
--#: apt-pkg/algorithms.cc:1220
++#: apt-pkg/algorithms.cc:1188
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
--#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
++#: apt-pkg/algorithms.cc:1479 apt-pkg/algorithms.cc:1481
  msgid ""
--"Some index files failed to download, they have been ignored, or old ones "
++"Some index files failed to download. They have been ignored, or old ones "
  "used instead."
  msgstr ""
  
@@@ -2528,17 -2528,17 +2636,17 @@@ msgstr "
  msgid "Method %s did not start correctly"
  msgstr ""
  
--#: apt-pkg/acquire-worker.cc:413
++#: apt-pkg/acquire-worker.cc:423
  #, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
--#: apt-pkg/init.cc:143
++#: apt-pkg/init.cc:145
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
--#: apt-pkg/init.cc:159
++#: apt-pkg/init.cc:161
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2563,17 -2563,17 +2671,17 @@@ msgstr "
  msgid "The list of sources could not be read."
  msgstr ""
  
--#: apt-pkg/policy.cc:344
++#: apt-pkg/policy.cc:355
  #, c-format
  msgid "Invalid record in the preferences file %s, no Package header"
  msgstr ""
  
--#: apt-pkg/policy.cc:366
++#: apt-pkg/policy.cc:377
  #, c-format
  msgid "Did not understand pin type %s"
  msgstr ""
  
--#: apt-pkg/policy.cc:374
++#: apt-pkg/policy.cc:385
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
@@@ -2581,155 -2581,155 +2689,168 @@@
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:198
++#: apt-pkg/pkgcachegen.cc:187
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:215
++#: apt-pkg/pkgcachegen.cc:204
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:253
++#: apt-pkg/pkgcachegen.cc:242
  #, c-format
  msgid "Error occurred while processing %s (NewFileDesc1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:285
++#: apt-pkg/pkgcachegen.cc:274
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:289
++#: apt-pkg/pkgcachegen.cc:278
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
--#: apt-pkg/pkgcachegen.cc:324
++#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
++#: apt-pkg/pkgcachegen.cc:313
  #, c-format
  msgid "Error occurred while processing %s (NewVersion%d)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:320
++#: apt-pkg/pkgcachegen.cc:309
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:353
++#: apt-pkg/pkgcachegen.cc:342
  #, c-format
  msgid "Error occurred while processing %s (NewFileDesc2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:360
++#: apt-pkg/pkgcachegen.cc:348
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:363
++#: apt-pkg/pkgcachegen.cc:351
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:366
++#: apt-pkg/pkgcachegen.cc:354
  msgid "Wow, you exceeded the number of descriptions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:369
++#: apt-pkg/pkgcachegen.cc:357
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:398
++#: apt-pkg/pkgcachegen.cc:386
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:412
++#: apt-pkg/pkgcachegen.cc:400
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:418
++#: apt-pkg/pkgcachegen.cc:406
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:982
++#: apt-pkg/pkgcachegen.cc:960
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:1087
++#: apt-pkg/pkgcachegen.cc:1065
  msgid "Collecting File Provides"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
++#: apt-pkg/pkgcachegen.cc:1243 apt-pkg/pkgcachegen.cc:1250
  msgid "IO Error saving source cache"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:136
++#: apt-pkg/acquire-item.cc:135
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:484
++#: apt-pkg/acquire-item.cc:636
  msgid "MD5Sum mismatch"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
--#: apt-pkg/acquire-item.cc:1717
++#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1850
++#: apt-pkg/acquire-item.cc:1993
  msgid "Hash Sum mismatch"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1244
++#: apt-pkg/acquire-item.cc:1388
++#, c-format
++msgid ""
++"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
++"or malformed file)"
++msgstr ""
++
++#: apt-pkg/acquire-item.cc:1403
++#, c-format
++msgid "Unable to find hash sum for '%s' in Release file"
++msgstr ""
++
++#: apt-pkg/acquire-item.cc:1439
  msgid "There is no public key available for the following key IDs:\n"
  msgstr ""
  
  #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
  #. the time since then the file is invalid - formated in the same way as in
  #. the download progress display (e.g. 7d 3h 42min 1s)
--#: apt-pkg/acquire-item.cc:1281
++#: apt-pkg/acquire-item.cc:1476
  #, c-format
  msgid "Release file expired, ignoring %s (invalid since %s)"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1302
++#: apt-pkg/acquire-item.cc:1497
  #, c-format
  msgid "Conflicting distribution: %s (expected %s but got %s)"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1328
++#: apt-pkg/acquire-item.cc:1530
  #, c-format
  msgid ""
  "A error occurred during the signature verification. The repository is not "
  "updated and the previous index files will be used. GPG error: %s: %s\n"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1337
++#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
++#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545
  #, c-format
  msgid "GPG error: %s: %s"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1365
++#: apt-pkg/acquire-item.cc:1637
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1424
++#: apt-pkg/acquire-item.cc:1696
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1479
++#: apt-pkg/acquire-item.cc:1755
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:1566
++#: apt-pkg/acquire-item.cc:1842
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2738,130 -2738,130 +2859,129 @@@
  msgid "Unable to parse Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:60
++#: apt-pkg/indexrecords.cc:63
  #, c-format
  msgid "No sections in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:94
++#: apt-pkg/indexrecords.cc:97
  #, c-format
  msgid "No Hash entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:107
++#: apt-pkg/indexrecords.cc:110
  #, c-format
  msgid "Invalid 'Valid-Until' entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/indexrecords.cc:122
++#: apt-pkg/indexrecords.cc:125
  #, c-format
  msgid "Invalid 'Date' entry in Release file %s"
  msgstr ""
  
--#: apt-pkg/vendorlist.cc:66
++#: apt-pkg/vendorlist.cc:71
  #, c-format
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:518
++#: apt-pkg/cdrom.cc:525
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
++#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
  msgid "Identifying.. "
  msgstr ""
  
--#: apt-pkg/cdrom.cc:552
++#: apt-pkg/cdrom.cc:562
  #, c-format
  msgid "Stored label: %s\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
++#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
  msgid "Unmounting CD-ROM...\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:578
++#: apt-pkg/cdrom.cc:591
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:596
++#: apt-pkg/cdrom.cc:609
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:600
++#: apt-pkg/cdrom.cc:614
  msgid "Waiting for disc...\n"
  msgstr ""
  
--#. Mount the new CDROM
--#: apt-pkg/cdrom.cc:608
++#: apt-pkg/cdrom.cc:623
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:626
++#: apt-pkg/cdrom.cc:642
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:666
++#: apt-pkg/cdrom.cc:684
  #, c-format
  msgid ""
  "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
  "%zu signatures\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:677
++#: apt-pkg/cdrom.cc:695
  msgid ""
  "Unable to locate any package files, perhaps this is not a Debian Disc or the "
  "wrong architecture?"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:703
++#: apt-pkg/cdrom.cc:722
  #, c-format
  msgid "Found label '%s'\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:732
++#: apt-pkg/cdrom.cc:751
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:748
++#: apt-pkg/cdrom.cc:768
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:752
++#: apt-pkg/cdrom.cc:770
  msgid "Copying package lists..."
  msgstr ""
  
--#: apt-pkg/cdrom.cc:778
++#: apt-pkg/cdrom.cc:797
  msgid "Writing new source list\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:787
++#: apt-pkg/cdrom.cc:805
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
++#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
++#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
++#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
++#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2928,177 -2928,177 +3048,204 @@@ msgstr "
  msgid "Can't select installed version from package %s as it is not installed"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:52
++#: apt-pkg/edsp.cc:32 apt-pkg/edsp.cc:52
++msgid "Send scenario to solver"
++msgstr ""
++
++#: apt-pkg/edsp.cc:204
++msgid "Send request to solver"
++msgstr ""
++
++#: apt-pkg/edsp.cc:272
++msgid "Prepare for receiving solution"
++msgstr ""
++
++#: apt-pkg/edsp.cc:279
++msgid "External solver failed without a proper error message"
++msgstr ""
++
++#: apt-pkg/edsp.cc:550 apt-pkg/edsp.cc:553 apt-pkg/edsp.cc:558
++msgid "Execute external solver"
++msgstr ""
++
++#: apt-pkg/deb/dpkgpm.cc:69
  #, c-format
  msgid "Installing %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
++#: apt-pkg/deb/dpkgpm.cc:70 apt-pkg/deb/dpkgpm.cc:864
  #, c-format
  msgid "Configuring %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
++#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:871
  #, c-format
  msgid "Removing %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:55
++#: apt-pkg/deb/dpkgpm.cc:72
  #, c-format
  msgid "Completely removing %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:56
++#: apt-pkg/deb/dpkgpm.cc:73
  #, c-format
  msgid "Noting disappearance of %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:57
++#: apt-pkg/deb/dpkgpm.cc:74
  #, c-format
  msgid "Running post-installation trigger %s"
  msgstr ""
  
  #. FIXME: use a better string after freeze
--#: apt-pkg/deb/dpkgpm.cc:646
++#: apt-pkg/deb/dpkgpm.cc:670
  #, c-format
  msgid "Directory '%s' missing"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675
++#: apt-pkg/deb/dpkgpm.cc:685 apt-pkg/deb/dpkgpm.cc:705
  #, c-format
  msgid "Could not open file '%s'"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:816
++#: apt-pkg/deb/dpkgpm.cc:857
  #, c-format
  msgid "Preparing %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:817
++#: apt-pkg/deb/dpkgpm.cc:858
  #, c-format
  msgid "Unpacking %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:822
++#: apt-pkg/deb/dpkgpm.cc:863
  #, c-format
  msgid "Preparing to configure %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:824
++#: apt-pkg/deb/dpkgpm.cc:865
  #, c-format
  msgid "Installed %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:829
++#: apt-pkg/deb/dpkgpm.cc:870
  #, c-format
  msgid "Preparing for removal of %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:831
++#: apt-pkg/deb/dpkgpm.cc:872
  #, c-format
  msgid "Removed %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:836
++#: apt-pkg/deb/dpkgpm.cc:877
  #, c-format
  msgid "Preparing to completely remove %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:837
++#: apt-pkg/deb/dpkgpm.cc:878
  #, c-format
  msgid "Completely removed %s"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1043
++#: apt-pkg/deb/dpkgpm.cc:1098
  msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1074
++#: apt-pkg/deb/dpkgpm.cc:1129
  msgid "Running dpkg"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1277
++#: apt-pkg/deb/dpkgpm.cc:1354
  msgid "No apport report written because MaxReports is reached already"
  msgstr ""
  
  #. check if its not a follow up error
--#: apt-pkg/deb/dpkgpm.cc:1282
++#: apt-pkg/deb/dpkgpm.cc:1359
  msgid "dependency problems - leaving unconfigured"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1284
++#: apt-pkg/deb/dpkgpm.cc:1361
  msgid ""
  "No apport report written because the error message indicates its a followup "
  "error from a previous failure."
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1290
++#: apt-pkg/deb/dpkgpm.cc:1367
  msgid ""
  "No apport report written because the error message indicates a disk full "
  "error"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1296
++#: apt-pkg/deb/dpkgpm.cc:1373
  msgid ""
  "No apport report written because the error message indicates a out of memory "
  "error"
  msgstr ""
  
--#: apt-pkg/deb/dpkgpm.cc:1303
++#: apt-pkg/deb/dpkgpm.cc:1380
  msgid ""
  "No apport report written because the error message indicates a dpkg I/O error"
  msgstr ""
  
--#: apt-pkg/deb/debsystem.cc:69
++#: apt-pkg/deb/debsystem.cc:79
  #, c-format
  msgid ""
  "Unable to lock the administration directory (%s), is another process using "
  "it?"
  msgstr ""
  
--#: apt-pkg/deb/debsystem.cc:72
++#: apt-pkg/deb/debsystem.cc:82
  #, c-format
  msgid "Unable to lock the administration directory (%s), are you root?"
  msgstr ""
  
  #. TRANSLATORS: the %s contains the recovery command, usually
  #. dpkg --configure -a
--#: apt-pkg/deb/debsystem.cc:88
++#: apt-pkg/deb/debsystem.cc:98
  #, c-format
  msgid ""
  "dpkg was interrupted, you must manually run '%s' to correct the problem. "
  msgstr ""
  
--#: apt-pkg/deb/debsystem.cc:106
++#: apt-pkg/deb/debsystem.cc:116
  msgid "Not locked"
  msgstr ""
  
  #. FIXME: fallback to a default mirror here instead
  #. and provide a config option to define that default
--#: methods/mirror.cc:200
++#: methods/mirror.cc:260
  #, c-format
  msgid "No mirror file '%s' found "
  msgstr ""
  
--#: methods/mirror.cc:343
++#. FIXME: fallback to a default mirror here instead
++#. and provide a config option to define that default
++#: methods/mirror.cc:267
++#, c-format
++msgid "Can not read mirror file '%s'"
++msgstr ""
++
++#: methods/mirror.cc:422
  #, c-format
  msgid "[Mirror: %s]"
  msgstr ""
  
--#: methods/rred.cc:465
++#: methods/rred.cc:503
  #, c-format
  msgid ""
  "Could not patch %s with mmap and with file operation usage - the patch seems "
  "to be corrupt."
  msgstr ""
  
--#: methods/rred.cc:470
++#: methods/rred.cc:508
  #, c-format
  msgid ""
  "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
  "to be corrupt."
  msgstr ""
  
--#: methods/rsh.cc:329
++#: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr ""