merge debian/sid into debian/experimental

diff --cc apt-pkg/algorithms.cc
Simple merge

diff --cc apt-pkg/cacheiterators.h
index f8f4c05ce9d5dd63213790fd45fecdc11158d806,513f40f17c68fcac9d53473e31741acd84b4797b..fe798799cdbdb161c7888268dd7f152234f805e5
--- 1/apt-pkg/cacheiterators.h
--- 2/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@@ -159,12 -159,10 +159,14 @@@ class pkgCache::PkgIterator: public Ite
        enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure};
  
        // Accessors
 -      inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}
 +      inline const char *Name() const { return Group().Name(); }
        // Versions have sections - and packages can have different versions with different sections
-       // so this interface is broken by design. It used to return the section of the "first parsed
-       // package stanza", but as this can potentially be anything it now returns the section of the
-       // newest version instead (if any). aka: Run as fast as you can to Version.Section().
-       APT_DEPRECATED const char *Section() const;
+       // so this interface is broken by design. Run as fast as you can to Version.Section().
 -      APT_DEPRECATED inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}
++      APT_DEPRECATED inline const char *Section() const {
++         APT_IGNORE_DEPRECATED_PUSH
++         return S->Section == 0?0:Owner->StrP + S->Section;
++         APT_IGNORE_DEPRECATED_POP
++      }
        inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge ||
                (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}
        inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}

diff --cc apt-pkg/deb/debsrcrecords.cc
index d3c137bb9c1bdc91eca13782a96bbb7521a292eb,49a348dd4e9ebe7fe66447176a523c7de2ac8593..ca6d098967f38af7335835e6585dd291d50b1333
--- 1/apt-pkg/deb/debsrcrecords.cc
--- 2/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@@ -179,13 -207,22 +202,16 @@@ bool debSrcRecordParser::Files2(std::ve
         }
  
         // we haven't seen this file yet
-        pkgSrcRecords::File F;
+        pkgSrcRecords::File2 F;
         F.Path = path;
-        F.Size = strtoull(size.c_str(), NULL, 10);
+        F.FileSize = strtoull(size.c_str(), NULL, 10);
         F.Hashes.push_back(hashString);
  
 -#if __GNUC__ >= 4
 -      // set for compatibility only, so warn users not us
 -      #pragma GCC diagnostic push
 -      #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 -#endif
++       APT_IGNORE_DEPRECATED_PUSH
+        F.Size = F.FileSize;
         if (checksumField == "Files")
-           APT_IGNORE_DEPRECATED(F.MD5Hash = hash;)
+           F.MD5Hash = hash;
 -#if __GNUC__ >= 4
 -      #pragma GCC diagnostic pop
 -#endif
++       APT_IGNORE_DEPRECATED_POP
  
         // Try to guess what sort of file it is we are getting.
         string::size_type Pos = F.Path.length()-1;

diff --cc apt-pkg/deb/debsrcrecords.h
Simple merge

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc apt-pkg/pkgcache.cc
Simple merge

diff --cc apt-pkg/srcrecords.h
index de2b6ff648987038ed175d0e75a90bc66e5a00e3,dde22bd6538f5bfde8d02193b8d624219c649440..c931e17b72f24f4865b2ba5572a5d25bdab75397
--- 1/apt-pkg/srcrecords.h
--- 2/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@@ -34,13 -38,19 +34,17 @@@ APT_IGNORE_DEPRECATED_PUS
     // Describes a single file
     struct File
     {
+       APT_DEPRECATED std::string MD5Hash;
+       APT_DEPRECATED unsigned long Size;
        std::string Path;
        std::string Type;
-       unsigned long long Size;
+    };
+    struct File2 : public File
+    {
+       unsigned long long FileSize;
        HashStringList Hashes;
-       APT_DEPRECATED std::string MD5Hash;
     };
 -#if __GNUC__ >= 4
 -      #pragma GCC diagnostic pop
 -#endif
 +APT_IGNORE_DEPRECATED_POP
  
     // Abstract parser for each source record
     class Parser

diff --cc cmdline/apt-get.cc
index eab79226406de71af9af51737009311e0c06723e,a2853771227f9924ae36bcfdd334b101c982b475..33bbdd86189fa5305b09d79bf45bff1e7e67e6a8
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -844,7 -851,8 +844,7 @@@ static bool DoSource(CommandLine &CmdL
         }
  
         new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path),
-                       I->Hashes, I->Size, Last->Index().SourceInfo(*Last,*I), Src);
 -                      hs != NULL ? hs->toStr() : "", I->FileSize,
 -                      Last->Index().SourceInfo(*Last,*I),Src);
++                      I->Hashes, I->FileSize, Last->Index().SourceInfo(*Last,*I), Src);
        }
     }
  

diff --cc configure.ac
index 4647a1118d8369ba573f7146c224833744acbdf4,d728e5e6cbbb26d1b67fef7ab1be90e7ef309067..06879f8390195f5b8c60c7d7b6805a306e7f8cc4
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  PACKAGE="apt"
- PACKAGE_VERSION="1.1~exp7"
 -PACKAGE_VERSION="1.0.9.6"
++PACKAGE_VERSION="1.0.9.7"
  PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --cc debian/changelog
index 246c0be4077e0cd2a7efc1071353e1fea243df3a,4b38ba8bad40e3f27c2c3f0a157468dad6cd1b2d..b8954102ef2ab966929fd934c015ae4f22cfafb6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,239 -1,89 +1,325 @@@
 +apt (1.1~exp8) experimental; urgency=medium
 +
 +  [ Michael Vogt ]
 +  * merge unstable upload version 1.0.9.3
 +  * Ensure /etc/apt/auth.conf has _apt:root owner
 +  * Use sysconf(_SC_ARG_MAX) to find the size of Dpkg::MaxArgBytes
 +  * Only support Translation-* that are listed in the {In,}Release file
 +  * Call "Dequeue()" for items in AbortTransaction() to fix race
 +  * prepare ABI for feature/socketpair
 +  * Bump ABI to 4.15
 +
 +  [ David Kalnischkies ]
 +  * reenable support for -s (and co) in apt-get source (Closes: 742578)
 +  * run acquire transactions only once
 +  * aborted reverify restores file owner and permission
 +  * test if TMPDIR is accessible before using (Closes: 765951)
 +  * chown finished partial files earlier
 +  * promote filesize to a hashstring
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 06 Nov 2014 10:01:21 +0100
 +
 +apt (1.1~exp7) experimental; urgency=medium
 +
 +  [ David Kalnischkies ]
 +  * don't cleanup cdrom files in apt-get update (Closes: 765458)
 +  * ignore Acquire::GzipIndexes for cdrom sources
 +
 + -- David Kalnischkies <david@kalnischkies.de>  Wed, 15 Oct 2014 20:12:15 +0200
 +
 +apt (1.1~exp6) experimental; urgency=medium
 +
 +  [ josch ]
 +  * implement the updated build profile spec
 +
 +  [ Michael Vogt ]
 +  * methods/rsh.cc: replace strcat with std::string (Closes: #76442)
 +  * Add new configallowinsecurerepositories to the test framework
 +
 +  [ Guillem Jover ]
 +  * Update Status field values handling
 +
 +  [ David Kalnischkies ]
 +  * don't drop privileges if _apt has not enough rights
 +  * check for available space, excluding root reserved blocks
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 15 Oct 2014 07:47:36 +0200
 +
 +apt (1.1~exp5) experimental; urgency=medium
 +
 +  [ Michael Vogt ]
 +  * Only rename StatError files in AbortTransaction()
 +  * Document Acquire{MaxReleaseFileSize,AllowInsecureRepositories,
 +    AllowDowngradeToInsecureRepositories} and
 +    --no-allow-insecure-repositories
 +  * Fix backward compatiblity of the new pkgAcquireMethod::DropPrivsOrDie()
 +  * Change default of Acquire::AllowInsecureRepositories to "true"
 +    so that this change is less disruptive, this will be switched
 +    to "false" again after jessie
 +
 +  [ David Kalnischkies ]
 +  * remove useless pdiff filename output (Closes: 764737)
 +  * make --allow-insecure-repositories message an error
 +  * display a warning for unsigned repos
 +  * trusted=yes sources are secure, we just don't know why
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 13 Oct 2014 16:15:22 +0200
 +
 +apt (1.1~exp4) experimental; urgency=medium
 +
 +  [ Michael Vogt ]
 +  * Merge sid version 1.0.9.2
 +  * feature/acq-trans:
 +    - Make apt-get update more transactional by keeping all data from
 +      a sources.list line in partial/ until all data is good and only
 +      then move it into lists/ in one step
 +    - add new -o Debug::Acquire::Transaction=1 debug option
 +  * feature/expected-size:
 +    Do not download more data in the mehotds than expected if we know
 +    the size. For the InRelease/Release/Release.gpg add new 
 +    Acquire::MaxReleaseFileSize that defaults to 10Mb for now
 +  * Verify the the hashes of the downloaded compressed files early
 +  * Only load unauthenticated data into our parsers when the user
 +    explicitly asked for it via --allow-insecure-repositories
 +    (Acquire::AllowInsecureRepositories)
 +  * Print warning when trying to use unauthenticated repositories
 +  * Use /var/empty as the homedir for _apt
 +  * Revert making pkgAcquire::Item::DescURI() "const" to not break
 +    API
 +  * Do not allow going from a authenticated to unauthenticated repository
 +  * Add missing "adduser" dependency (for the new _apt user)
 +    Thanks to Russ Allbery (Closes: #763004)
 +  * Test if TMPDIR is a directory in apt-key and if not unset it
 +  * add early verification for the .diff/Index download
 +  * Bump library version to libapt-pkg4.14
 +  * Rework pkgAcqMeta{Index,Sig,ClearSig}::{Done,Failed]() for readability
 +  * Ignore EINVAL from prctl(PR_SET_NO_NEW_PRIVS) (closes: 764066)
 +
 +  [ David Kalnischkies ]
 +  * deprecate Pkg->Name in favor of Grp->Name
 +  * drop stored StringItems in favor of in-memory mappings
 +  * de-duplicate version strings in the cache
 +  * fix progress output for (dist-)upgrade calculation
 +  * move PCI::From* methods into CacheSetHelper class (Closes: 686221)
 +  * add a (hidden) --quiet option for apt-key
 +  * only create new trusted.gpg if directory is writeable
 +  * support (multiple) arguments properly in apt-key
 +  * set a primary-keyring only if we have access to it
 +  * merge fragment keyrings in apt-key to avoid hitting gpg limits
 +    (Closes: 733028)
 +  * use apt-key adv (+ gnupg) instead of gpgv for verify
 +  * support gnupg2 as drop-in replacement for gnupg
 +  * allow to specify fingerprints in 'apt-key del'
 +  * use only one --keyring in gpg interactions
 +  * add and use 'apt-key verify' which prefers gpgv over gpg
 +  * remove empty keyrings in trusted.gpg.d on upgrade
 +  * store source name and version in binary cache
 +  * allow fetcher setup without directory creation (Closes: 762898)
 +  * cleanup partial directory of lists in apt-get clean (Closes: #762889)
 +  * allow options between command and -- on commandline
 +  * update symbols file
 +  * support parsing of all hashes for pdiff
 +  * ensure world-readability for trusted.gpg in postinst (Closes: 647001)
 +  * ensure partial dirs are 0700 and owned by _apt:root
 +  * use _apt:root only for partial directories
 +  * display errortext for all Err
 +  * set PR_SET_NO_NEW_PRIVS also if run as non-root
 +
 +  [ James McCoy ]
 +  * ensure apt-key del handles 16-byte key ids (Closes: 754436)
 +
 +  [ Kenshi Muto ]
 +  * Japanese program translation update (Closes: 763033)
 +
 +  [ Trần Ngọc Quân ]
 +  * Set STRIP_FROM_PATH for doxygen
 +
 +  [ Mert Dirik ]
 +  * Turkish program translation update (Closes: 763379)
 +
 +  [ Guillem Jover ]
 +  * apt-get: Create the temporary downloaded changelog inside tmpdir
 +
 +  [ Miroslav Kure ]
 +  * [l10n] Updated Czech translation of apt (Closes: #764055)
 +
 + -- Michael Vogt <mvo@ubuntu.com>  Wed, 08 Oct 2014 09:37:35 +0200
 +
 +apt (1.1~exp3) experimental; urgency=medium
 +
 +  [ Michael Vogt ]
 +  * merged changes from debian/sid up to 1.0.9.1
 +  * Make /var/lib/apt/lists and /var/cache/apt/archives owned
 +    by the new _apt user
 +  * Drop Privileges in the following acquire methods:
 +     copy, http, https, ftp, gpgv, gzip/bzip2/lzma/xz 
 +  * DropPrivs: Improvements based on feedback from error@debian.org
 +
 +  [ Julian Andres Klode ]
 +  * DropPriv: Really call seteuid and not setuid, and add more checks
 +  * Use _apt as our unprivileged user name
 +  * DropPrivs: Also check for saved set-user-ID and set-group-ID
 +  * methods: Fail if we cannot drop privileges
 +  * DropPrivs: Also check for saved set-user-ID and set-group-ID
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 24 Sep 2014 22:30:09 +0200
 +
 +apt (1.1~exp2) experimental; urgency=medium
 +
 +  [ Guillem Jover ]
 +  * Add new Base256ToNum long long overload function
 +  * Fix ar and tar code to be LFS-safe (Closes: #742882)
 +
 +  [ Michael Vogt ]
 +  * increase libapt-inst to version 1.6
 +  * Only allow "apt-get build-dep path" when path starts with ./ or /
 +  * Allow passing a full path to apt-get install /foo/bar.deb (CLoses: #752327)
 +  * merge changes from the 1.0.6 upload
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 10 Jul 2014 13:18:08 +0200
 +
 +apt (1.1~exp1) experimental; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * [API Break] change "std::string pkgAcquire::Item::DescURI()" to
 +                       "std::string pkgAcquire::Item::DescURI() const"
 +  * [ABI-Break] increase hashtable size for packages/groups by factor 5
 +  * [ABI-Break] cleanup datatypes mix used in binary cache
 +  * [internal API-Break] remove the Section member from package struct
 +  * use 'best' hash for source authentication (LP: 1098738)
 +  * use HashStringList in the acquire system
 +  * deal with hashes in ftparchive more dynamic as well
 +  * reenable pipelining via hashsum reordering support
 +  * parse and retrieve multiple Descriptions in one record
 +  * improve pkgTagSection scanning and parsing
 +  * invalid cache if architecture set doesn't match (Closes: 745036)
 +
 +  [ Michael Vogt ]
 +  * add support for "apt-get build-dep foo.dsc"
 +  * add support for "apt-get build-dep unpacked-source-dir"
 +  * add support for "apt-get install foo_1.0_all.deb"
 +  * make "apt-get update" progress much more accurate by loading the
 +    sizes of the targets into the fetcher early
 +  * Implement simple by-hash for apt update to improve reliability of
 +    the update. Apt will try to fetch the Packages file via
 +    /by-hash/$hash_type/$hash_value if the repo supports that.
 +    - add APT::Acquire::$(host)::By-Hash=1 knob
 +    - add Acquire-By-Hash=1 to Release file
 +  * add Debug::Acquire::Progress debug option
 +  * [ABI-Break] lp:~mvo/apt/source-hashes:
 +    - use sha{512,256,1} for deb-src when available LP: #1098738
 +  * [ABI-Break] stop exporting the accidently exported parsenetrc() symbol
 +  * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
 +  * [ABI BREAK] apt-pkg/pkgcache.h:
 +    - adjust pkgCache::State::VerPriority enum, to match reality
 +  * test/integration/test-debsrc-hashes:
 +    - add integration test, thanks to Daniel Hartwig
 +  * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
 +  * [ABI-Break] Pass struct IndexTarget/indexRecords to
 +    pkgAcqIndex{,Merge}Diffs
 +  * [internal API-Break] rename pkgCache::Package::NextPackage to
 +    pkgCache::Package::Next
 +  * Calculate Percent as part of pkgAcquireStatus to provide a weighted
 +    percent for both items and bytes
 +  * apt-pkg/contrib/macros.h: bump library version to 4.13
 +  * apt-private/acqprogress.cc: do not show file size on IMSHit, it wasn't
 +    fetched
 +  * Fix warnings from clang -Wall/clang -fsanitize=address
 +  * add DropPrivs() and drop privileges to nobody when running the
 +    the buildin apt and dump solvers
 +  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
 +    - fix invalid InRelease file download checking and add regression
 +      test to server broken files to the buildin test webserver
 +    - add regression test for LP: #34638
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 19 Jun 2014 12:01:48 +0200
 +
+ apt (1.0.9.7) unstable; urgency=medium
+ 
+   [ Tomasz Buchert ]
+   * Fix crash in the apt-transport-https when Owner is NULL (Closes: #778375)
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 23 Feb 2015 12:54:03 +0100
+ 
+ apt (1.0.9.6) unstable; urgency=medium
+ 
+   [ Michael Vogt ]
+   * Fix missing URIStart() for https downloads
+   * Add regression test for the previous commit
+ 
+   [ David Kalnischkies ]
+   * 128 KiB DSC files ought to be enough for everyone (Closes: 774893)
+   * award points for positive dependencies again (Closes: 774924)
+ 
+  -- Michael Vogt <mvo@ubuntu.com>  Fri, 16 Jan 2015 08:37:25 +0100
+ 
+ apt (1.0.9.5) unstable; urgency=medium
+ 
+   [ David Kalnischkies ]
+   * dispose http(s) 416 error page as non-content (Closes: 768797)
+   * do not make PTY slave the controlling terminal (Closes: 772641)
+   * always run 'dpkg --configure -a' at the end of our dpkg callings
+     (Closes: 769609)
+   * pass-through stdin fd instead of content if not a terminal (Closes: 773061)
+ 
+   [ James McCoy ]
+   * tighten filtering of kernel images in apt.auto-removal (Closes: 772732)
+ 
+   [ Jean-Pierre Giraud ]
+   * French manpages translation update (Closes: 771967)
+ 
+   [ Zhou Mo ]
+   * Chinese (simplified) program translation update (Closes: 771982)
+ 
+   [ Kenshi Muto ]
+   * Japanese program translation update (Closes: 772678)
+ 
+   [ Theppitak Karoonboonyanan ]
+   * Thai program translation update (Closes: 772913)
+ 
+  -- David Kalnischkies <david@kalnischkies.de>  Tue, 23 Dec 2014 13:22:42 +0100
+ 
+ apt (1.0.9.4) unstable; urgency=medium
+ 
+   [ David Kalnischkies ]
+   * use 'best' hash for source authentication (LP: 1098738)
+   * deprecate the Section member from package struct
+   * allow options between command and -- on commandline
+   * re-enable support for -s (and co) in apt-get source (Closes: 742578)
+   * change codenames to jessie as stable POV in docs
+   * close leaking slave fd after setting up pty magic (Closes: 767774)
+   * fix PTY interaction on linux and kfreebsd (Closes: 765687)
+ 
+   [ James McCoy ]
+   * support long keyids in "apt-key del" instead of ignoring them
+     (Closes: 754436)
+ 
+   [ Michael Vogt ]
+   * Use sysconf(_SC_ARG_MAX) to find the size of Dpkg::MaxArgBytes
+ 
+   [ Frans Spiesschaert ]
+   * Dutch program translation update (Closes: 771039)
+ 
+   [ Julien Patriarca ]
+   * French program translation update (Closes: 766755)
+ 
+   [ Zhou Mo ]
+   * Chinese (simplified) program translation update (Closes: 766170)
+ 
+   [ Miroslav Kure ]
+   * Czech program translation update (Closes: 764055)
+ 
+   [ Mert Dirik ]
+   * Turkish program translation update (Closes: 763379)
+ 
+   [ Kenshi Muto ]
+   * Japanese program translation update (Closes: 763033)
+ 
+   [ Manuel "Venturi" Porras Peralta ]
+   * Spanish program translation update (Closes: 771815)
+ 
+  -- David Kalnischkies <david@kalnischkies.de>  Wed, 03 Dec 2014 14:26:04 +0100
+ 
  apt (1.0.9.3) unstable; urgency=medium
  
    [ josch ]

diff --cc debian/libapt-pkg4.15.symbols
index 55b7f33c3ef2dc76a268c7fc8033e557cfb40d62,0000000000000000000000000000000000000000..ee7f7a66e2383a853af34d5a7426c9b671e5d0d9
mode 100644,000000..100644
--- 1/debian/libapt-pkg4.15.symbols
--- /dev/null
+++ b/debian/libapt-pkg4.15.symbols
@@@ -1,1413 -1,0 +1,1431 @@@
 +libapt-pkg.so.4.15 libapt-pkg4.15 #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++)"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++)"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++)"Base256ToNum(char const*, unsigned long long&, unsigned int)@Base" 1.0.5
 + (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++)"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++|optional=inline)"stringcasecmp(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@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++)"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++)"pkgMakeStatusCache(pkgSourceList&, OpProgress&, MMap**, bool)@Base" 0.8.0
 + (c++)"pkgMinimizeUpgrade(pkgDepCache&)@Base" 0.8.0
 + (c++)"pkgAllUpgrade(pkgDepCache&)@Base" 0.8.0
 + (c++)"pkgDistUpgrade(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++)"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++)"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++)"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++)"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::Done()@Base" 0.8.0
 + (c++)"OpProgress::Update()@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::~SourceCopy()@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::~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::ReportMirrorFailure(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@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::Finished()@Base" 0.8.0
 + (c++)"pkgAcquire::Item::ShortDesc()@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::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::Name()@Base" 0.8.0
 + (c++)"pkgRecords::Parser::GetRec(char const*&, char const*&)@Base" 0.8.0
 + (c++)"pkgRecords::Parser::FileName()@Base" 0.8.0
 + (c++)"pkgRecords::Parser::Homepage()@Base" 0.8.0
 + (c++)"pkgRecords::Parser::SourcePkg()@Base" 0.8.0
 + (c++)"pkgRecords::Parser::SourceVer()@Base" 0.8.0
 + (c++)"pkgRecords::pkgRecords(pkgCache&)@Base" 0.8.0
 + (c++)"pkgRecords::~pkgRecords()@Base" 0.8.0
 + (c++)"pkgTagFile::Step(pkgTagSection&)@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::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++)"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::~PackageCopy()@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::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::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::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::MarkRequired(pkgDepCache::InRootSetFunc&)@Base" 0.8.0
 + (c++)"pkgDepCache::Sweep()@Base" 0.8.0
 + (c++)"pkgDepCache::pkgDepCache(pkgCache*, pkgDepCache::Policy*)@Base" 0.8.0
 + (c++)"pkgDepCache::~pkgDepCache()@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::Configure(pkgCache::PkgIterator)@Base" 0.8.0
 + (c++)"pkgSimulate::pkgSimulate(pkgDepCache*)@Base" 0.8.0
 + (c++)"pkgSimulate::~pkgSimulate()@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()@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++)"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::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++)"WeakPointable::~WeakPointable()@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::ConvertRelation(char const*, unsigned int&)@Base" 0.8.0
 + (c++)"debListParser::GetPrio(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@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::Finished()@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++)"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::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::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::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++)"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++)"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::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::MakeStatusCache(pkgSourceList&, OpProgress*, MMap**, bool)@Base" 0.8.0
 + (c++)"pkgCacheGenerator::CreateDynamicMMap(FileFd*, unsigned long)@Base" 0.8.0
 + (c++)"pkgCacheGenerator::MakeOnlyStatusCache(OpProgress*, DynamicMMap**)@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::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::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++)"pkgProblemResolver::InstallProtect()@Base" 0.8.0
 + (c++)"pkgProblemResolver::This@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++)"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::canNotFindPkgName(pkgCacheFile&, 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::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::Size()@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::~FileFd()@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++)"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::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++)"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::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::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++)"pkgDPkgPM::SendV2Pkgs(_IO_FILE*)@Base" 0.8.0
 + (c++)"pkgDPkgPM::DoTerminalPty(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::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::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++)"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++)"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::Type::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
 + (c++)"pkgIndexFile::Merge(pkgCacheGenerator&, OpProgress&) 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++)"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::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 pkgDepCache@Base" 0.8.0
 + (c++)"typeinfo for pkgSimulate@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 pkgAcqArchive@Base" 0.8.0
 + (c++)"typeinfo for pkgTagSection@Base" 0.8.0
 + (c++)"typeinfo for OpTextProgress@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 debVersioningSystem@Base" 0.8.0
 + (c++)"typeinfo for pkgUdevCdromDevices@Base" 0.8.0
 + (c++)"typeinfo for pkgVersioningSystem@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 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 pkgDepCache@Base" 0.8.0
 + (c++)"typeinfo name for pkgSimulate@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 pkgAcqArchive@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 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 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 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 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 pkgDepCache@Base" 0.8.0
 + (c++)"vtable for pkgSimulate@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 pkgAcqArchive@Base" 0.8.0
 + (c++)"vtable for pkgTagSection@Base" 0.8.0
 + (c++)"vtable for OpTextProgress@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 debVersioningSystem@Base" 0.8.0
 + (c++)"vtable for pkgUdevCdromDevices@Base" 0.8.0
 + (c++)"vtable for pkgVersioningSystem@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 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
 + _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
 + (c++)"pkgAcquireStatus::~pkgAcquireStatus()@Base" 0.8.0
 + (c++)"IndexCopy::~IndexCopy()@Base" 0.8.0
 + (c++)"pkgIndexFile::Type::~Type()@Base" 0.8.0
 + (c++)"pkgAcqBaseIndex::~pkgAcqBaseIndex()@Base" 0.8.0
 + (c++)"pkgArchiveCleaner::~pkgArchiveCleaner()@Base" 0.8.0
 + (c++)"typeinfo for pkgArchiveCleaner@Base" 0.8.0
 + (c++)"typeinfo name for pkgArchiveCleaner@Base" 0.8.0
 + (c++)"vtable for pkgArchiveCleaner@Base" 0.8.0
 +### architecture specific: va_list
 + (arch=armel armhf|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, std::__va_list&) const@Base" 0.8.15~exp1
 + (arch=i386 hurd-i386 kfreebsd-i386 ppc64|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1
 + (arch=hppa ia64 mips mipsel sparc sparc64|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, void*&) const@Base" 0.8.15~exp1
 + (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390 s390x x32|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag (&) [1]) const@Base" 0.8.15~exp1
 + (arch=sh4|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __builtin_va_list&) const@Base" 0.8.15~exp1
 + (arch=alpha|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag&) const@Base" 0.8.15~exp1
 +### architecture specific: va_list & size_t
 + (arch=i386 hurd-i386 kfreebsd-i386|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4
 + (arch=armel armhf|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4
 + (arch=alpha|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4
 + (arch=powerpc powerpcspe x32|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4
 + (arch=amd64 kfreebsd-amd64 s390 s390x|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4
 + (arch=hppa mips mipsel sparc|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4
 + (arch=ia64 sparc64|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4
 + (arch=sh4|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4
 + (arch=ppc64|c++)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned long&)@Base" 0.8.11.4
 + (arch=i386 hurd-i386 kfreebsd-i386|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4
 + (arch=armel armhf|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4
 + (arch=alpha|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4
 + (arch=powerpc powerpcspe x32|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4
 + (arch=amd64 kfreebsd-amd64 s390 s390x|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4
 + (arch=hppa mips mipsel sparc|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4
 + (arch=ia64 sparc64|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@Base" 0.8.11.4 1
 + (arch=sh4|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4
 + (arch=ppc64|c++)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned long&)@Base" 0.8.11.4
 +### architecture specific: size_t
 + (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc x32|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0
 + (arch=alpha amd64 ia64 kfreebsd-amd64 s390 s390x sparc64 ppc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0
 +### architecture specific: time_t
 + (arch=!x32|c++)"TimeRFC1123(long)@Base" 0.8.0
 + (arch=x32|c++)"TimeRFC1123(long long)@Base" 0.8.0
 + (arch=!x32|c++)"FTPMDTMStrToTime(char const*, long&)@Base" 0.8.0
 + (arch=x32|c++)"FTPMDTMStrToTime(char const*, long long&)@Base" 0.8.0
 + (arch=!x32|c++)"StrToTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, long&)@Base" 0.8.0
 + (arch=x32|c++)"StrToTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, long long&)@Base" 0.8.0
 + (arch=!x32|c++)"RFC1123StrToTime(char const*, long&)@Base" 0.8.0
 + (arch=x32|c++)"RFC1123StrToTime(char const*, long long&)@Base" 0.8.0
 +###
 + (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++)"pkgTagSection::FindFlag(unsigned long&, unsigned long, char const*, char const*)@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++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1
 + (c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3
 + (c++)"pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator)@Base" 0.8.15.3
 + (c++)"DeEscapeString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.4
 + (c++)"GetModificationTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.6
 + (c++)"pkgSourceList::GetLastModifiedTime()@Base" 0.8.15.6
 + (c++)"pkgCacheFile::RemoveCaches()@Base" 0.8.15.7
 + (c++)"pkgOrderList::VisitNode(pkgCache::PkgIterator, char const*)@Base" 0.8.15.7
 +### external dependency resolver ###
 + (c++)"EDSP::WriteError(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, _IO_FILE*)@Base" 0.8.16~exp2
 + (c++)"EDSP::ReadRequest(int, std::list<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::list<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&, bool&, bool&)@Base" 0.8.16~exp2
 + (c++)"EDSP::ApplyRequest(std::list<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&, std::list<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&, pkgDepCache&)@Base" 0.8.16~exp2
 + (c++)"EDSP::ReadResponse(int, pkgDepCache&, OpProgress*)@Base" 0.8.16~exp2
 + (c++)"EDSP::WriteRequest(pkgDepCache&, _IO_FILE*, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
 + (c++)"EDSP::ExecuteSolver(char const*, int*, int*)@Base" 0.8.16~exp2
 + (c++)"EDSP::WriteProgress(unsigned short, char const*, _IO_FILE*)@Base" 0.8.16~exp2
 + (c++)"EDSP::WriteScenario(pkgDepCache&, _IO_FILE*, OpProgress*)@Base" 0.8.16~exp2
 + (c++)"EDSP::WriteSolution(pkgDepCache&, _IO_FILE*)@Base" 0.8.16~exp2
 + (c++)"EDSP::ResolveExternal(char const*, pkgDepCache&, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
 + (c++)"EDSP::DepMap@Base" 0.8.16~exp2
 + (c++)"EDSP::PrioMap@Base" 0.8.16~exp2
 + (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.16~exp6
 + (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
 +### generalisation of checksums (with lfs) -- mostly api-compatible available (without sha512 in previous versions)
 + (c++)"AddCRC16(unsigned short, void const*, unsigned long long)@Base" 0.8.16~exp2
 + (c++)"MD5Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"MD5Summation::Result()@Base" 0.8.16~exp2
 + (c++)"MD5Summation::MD5Summation()@Base" 0.8.16~exp2
 + (c++)"SHA1Summation::SHA1Summation()@Base" 0.8.16~exp2
 + (c++)"SHA1Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"SHA1Summation::Result()@Base" 0.8.16~exp2
 + (c++)"SHA256Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"SHA512Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"SummationImplementation::AddFD(int, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"typeinfo for MD5Summation@Base" 0.8.16~exp6
 + (c++)"typeinfo for SHA1Summation@Base" 0.8.16~exp6
 + (c++)"typeinfo for SHA256Summation@Base" 0.8.16~exp6
 + (c++)"typeinfo for SHA512Summation@Base" 0.8.16~exp6
 + (c++)"typeinfo for SHA2SummationBase@Base" 0.8.16~exp6
 + (c++)"typeinfo for SummationImplementation@Base" 0.8.16~exp6
 + (c++)"typeinfo name for MD5Summation@Base" 0.8.16~exp6
 + (c++)"typeinfo name for SHA1Summation@Base" 0.8.16~exp6
 + (c++)"typeinfo name for SHA256Summation@Base" 0.8.16~exp6
 + (c++)"typeinfo name for SHA512Summation@Base" 0.8.16~exp6
 + (c++)"typeinfo name for SHA2SummationBase@Base" 0.8.16~exp6
 + (c++)"typeinfo name for SummationImplementation@Base" 0.8.16~exp6
 + (c++)"vtable for MD5Summation@Base" 0.8.16~exp6
 + (c++)"vtable for SHA1Summation@Base" 0.8.16~exp6
 + (c++)"vtable for SHA256Summation@Base" 0.8.16~exp6
 + (c++)"vtable for SHA512Summation@Base" 0.8.16~exp6
 + (c++)"vtable for SHA2SummationBase@Base" 0.8.16~exp6
 + (c++)"vtable for SummationImplementation@Base" 0.8.16~exp6
 +### large file support - available in older api-compatible versions without lfs ###
 + (c++)"StrToNum(char const*, unsigned long long&, unsigned int, unsigned int)@Base" 0.8.16~exp6
 + (c++)"OpProgress::SubProgress(unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, float)@Base" 0.8.16~exp6
 + (c++)"OpProgress::OverallProgress(unsigned long long, unsigned long long, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp6
 + (c++)"OpProgress::Progress(unsigned long long)@Base" 0.8.16~exp6
 + (c++)"SourceCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
 + (c++)"pkgAcquire::UriIterator::~UriIterator()@Base" 0.8.16~exp6
 + (c++)"pkgAcquire::MethodConfig::~MethodConfig()@Base" 0.8.16~exp6
 + (c++)"pkgAcquire::Item::Start(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"pkgRecords::Parser::RecordField(char const*)@Base" 0.8.16~exp6
 + (c++)"pkgTagFile::Jump(pkgTagSection&, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"pkgTagFile::Offset()@Base" 0.8.16~exp6
 + (c++)"pkgTagFile::pkgTagFile(FileFd*, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"DynamicMMap::RawAllocate(unsigned long long, unsigned long)@Base" 0.8.16~exp6
 + (c++)"PackageCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
 + (c++)"pkgTagSection::~pkgTagSection()@Base" 0.8.16~exp6
 + (c++)"pkgAcquireStatus::Fetched(unsigned long long, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"PreferenceSection::~PreferenceSection()@Base" 0.8.16~exp6
 + (c++)"FileFd::Read(void*, unsigned long long, unsigned long long*)@Base" 0.8.16~exp6
 + (c++)"FileFd::Seek(unsigned long long)@Base" 0.8.16~exp6
 + (c++)"FileFd::Skip(unsigned long long)@Base" 0.8.16~exp6
 + (c++)"FileFd::Write(void const*, unsigned long long)@Base" 0.8.16~exp6
 + (c++)"FileFd::Truncate(unsigned long long)@Base" 0.8.16~exp6
 + (c++)"pkgPolicy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
 + (c++)"typeinfo for pkgTagFile@Base" 0.8.16~exp6
 + (c++)"typeinfo for pkgSrcRecords@Base" 0.8.16~exp6
 + (c++)"typeinfo for pkgAcquire::UriIterator@Base" 0.8.16~exp6
 + (c++)"typeinfo for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
 + (c++)"typeinfo for pkgAcquire::Queue@Base" 0.8.16~exp6
 + (c++)"typeinfo for pkgAcquire::Worker@Base" 0.8.16~exp6
 + (c++)"typeinfo name for pkgTagFile@Base" 0.8.16~exp6
 + (c++)"typeinfo name for pkgSrcRecords@Base" 0.8.16~exp6
 + (c++)"typeinfo name for pkgAcquire::UriIterator@Base" 0.8.16~exp6
 + (c++)"typeinfo name for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
 + (c++)"typeinfo name for pkgAcquire::Queue@Base" 0.8.16~exp6
 + (c++)"typeinfo name for pkgAcquire::Worker@Base" 0.8.16~exp6
 + (c++)"vtable for pkgTagFile@Base" 0.8.16~exp6
 + (c++)"vtable for pkgSrcRecords@Base" 0.8.16~exp6
 + (c++)"vtable for pkgAcquire::UriIterator@Base" 0.8.16~exp6
 + (c++)"vtable for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
 + (c++)"vtable for pkgAcquire::Queue@Base" 0.8.16~exp6
 + (c++)"vtable for pkgAcquire::Worker@Base" 0.8.16~exp6
 +### remove deprecated parameter
 + (c++)"pkgDepCache::SetCandidateVersion(pkgCache::VerIterator)@Base" 0.8.16~exp6
 + (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, bool)@Base" 0.8.16~exp6
 + (c++)"pkgDepCache::AddStates(pkgCache::PkgIterator const&, bool)@Base" 0.8.16~exp6
 +### used internally by public interfaces - if you use them directly, you can keep the pieces
 + (c++|optional=internal|regex)"^SHA256_.*@Base$" 0.8.16~exp2
 + (c++|optional=internal|regex)"^SHA384_.*@Base$" 0.8.16~exp2
 + (c++|optional=internal|regex)"^SHA512_.*@Base$" 0.8.16~exp2
 +### orderlist rework: the touched methods are protected
 + (c++)"SigINT(int)@Base" 0.8.16~exp14
 + (c++)"pkgPackageManager::SigINTStop@Base" 0.8.16~exp14
 + (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool, int)@Base" 0.8.16~exp14
 + (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator, int)@Base" 0.8.16~exp14
 +### FileFd rework: supporting different on-the-fly (de)compressing needs more parameter (abi), but the api is stable
 + (c++)"FileFd::OpenDescriptor(int, unsigned int, FileFd::CompressMode, bool)@Base" 0.8.16~exp9
 + (c++)"FileFd::OpenDescriptor(int, unsigned int, APT::Configuration::Compressor const&, bool)@Base" 0.8.16~exp9
 + (c++)"FileFd::ModificationTime()@Base" 0.8.16~exp9
 + (c++)"FileFd::Open(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, FileFd::CompressMode, unsigned long)@Base" 0.8.16~exp9
 + (c++)"FileFd::Open(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, APT::Configuration::Compressor const&, unsigned long)@Base" 0.8.16~exp9
 + (c++)"FileFd::ReadLine(char*, unsigned long long)@Base" 0.8.16~exp9
 + (c++)"SummationImplementation::AddFD(FileFd&, unsigned long long)@Base" 0.8.16~exp9
 + (c++|optional=deprecated,previous-inline)"FileFd::gzFd()@Base" 0.8.0
 +### CacheSet rework: making them real containers breaks bigtime the API (for the CacheSetHelper)
 + (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator::getPkg() const@Base" 0.8.16~exp9
 + (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::empty() const@Base" 0.8.16~exp9
 + (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator::getPkg() const@Base" 0.8.16~exp9
 + (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::empty() const@Base" 0.8.16~exp9
 + (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::empty() const@Base" 0.8.16~exp9
 + (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator::getVer() const@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::canNotFindTask(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::canNotFindRegEx(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::canNotFindAllVer(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::canNotFindPackage(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const&, pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::canNotFindCandInstVer(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
 + (c++)"APT::CacheSetHelper::canNotFindInstCandVer(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
 + (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::clear()@Base" 0.8.16~exp9
 + (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::insert(pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
 + (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::clear()@Base" 0.8.16~exp9
 + (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::insert(pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
 + (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::clear()@Base" 0.8.16~exp9
 + (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::insert(pkgCache::VerIterator const&)@Base" 0.8.16~exp9
 + (c++)"APT::VersionContainerInterface::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 + (c++)"APT::VersionContainerInterface::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 + (c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list<APT::VersionContainerInterface::Modifier, std::allocator<APT::VersionContainerInterface::Modifier> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 + (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::PackageContainerInterface::const_iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::PackageContainerInterface@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::VersionContainerInterface::const_iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo for APT::VersionContainerInterface@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::PackageContainerInterface::const_iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::PackageContainerInterface@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::VersionContainerInterface::const_iterator@Base" 0.8.16~exp9
 + (c++)"typeinfo name for APT::VersionContainerInterface@Base" 0.8.16~exp9
 + (c++)"vtable for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
 + (c++)"vtable for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
 + (c++)"vtable for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
 + (c++)"vtable for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
 + (c++)"vtable for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator@Base" 0.8.16~exp9
 + (c++)"vtable for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >@Base" 0.8.16~exp9
 + (c++)"vtable for APT::PackageContainerInterface::const_iterator@Base" 0.8.16~exp9
 + (c++)"vtable for APT::PackageContainerInterface@Base" 0.8.16~exp9
 + (c++)"vtable for APT::VersionContainerInterface::const_iterator@Base" 0.8.16~exp9
 + (c++)"vtable for APT::VersionContainerInterface@Base" 0.8.16~exp9
 +### rework of the packagemanager rework
 + (c++)"APT::Progress::PackageManager::ConffilePrompt(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManager::Error(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerFancy::HandleSIGWINCH(int)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerFancy::SetupTerminalScrollArea(int)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerFancy::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerFancy::Stop()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManager::fork()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManager::GetPulseInterval()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManager::~PackageManager()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::ConffilePrompt(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::Error(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::~PackageManagerProgressDeb822Fd()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::PackageManagerProgressDeb822Fd(int)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::StartDpkg()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::Stop()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressDeb822Fd::WriteToStatusFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFactory()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFd::ConffilePrompt(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFd::Error(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFd::~PackageManagerProgressFd()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFd::PackageManagerProgressFd(int)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFd::StartDpkg()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFd::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFd::Stop()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerProgressFd::WriteToStatusFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManager::Pulse()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManager::StartDpkg()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManager::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManager::Stop()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerText::~PackageManagerText()@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerText::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
 + (c++)"APT::String::Strip(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.9.13~exp1
 + (c++)"pkgDPkgPM::BuildPackagesProgressMap()@Base" 0.9.13~exp1
 + (c++)"pkgDPkgPM::DoDpkgStatusFd(int)@Base" 0.9.13~exp1
 + (c++)"pkgDPkgPM::ProcessDpkgStatusLine(char*)@Base" 0.9.13~exp1
 + (c++)"pkgDPkgPM::StartPtyMagic()@Base" 0.9.13~exp1
 + (c++)"pkgDPkgPM::StopPtyMagic()@Base" 0.9.13~exp1
 + (c++)"typeinfo for APT::Progress::PackageManager@Base" 0.9.13~exp1
 + (c++)"typeinfo for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1
 + (c++)"typeinfo for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1
 + (c++)"typeinfo for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1
 + (c++)"typeinfo for APT::Progress::PackageManagerText@Base" 0.9.13~exp1
 + (c++)"typeinfo name for APT::Progress::PackageManager@Base" 0.9.13~exp1
 + (c++)"typeinfo name for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1
 + (c++)"typeinfo name for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1
 + (c++)"typeinfo name for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1
 + (c++)"typeinfo name for APT::Progress::PackageManagerText@Base" 0.9.13~exp1
 + (c++)"vtable for APT::Progress::PackageManager@Base" 0.9.13~exp1
 + (c++)"vtable for APT::Progress::PackageManagerFancy@Base" 0.9.13~exp1
 + (c++)"vtable for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1
 + (c++)"vtable for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1
 + (c++)"vtable for APT::Progress::PackageManagerText@Base" 0.9.13~exp1
 + (c++)"APT::Progress::PackageManagerFancy::instances@Base" 0.9.14.2
 + (c++)"APT::Progress::PackageManagerFancy::Start(int)@Base" 0.9.14.2
 + (c++)"APT::Progress::PackageManager::Start(int)@Base" 0.9.14.2
 +### deb822 sources.list format
 + (c++)"pkgSourceList::ParseFileDeb822(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1
 + (c++)"pkgSourceList::ParseFileOldStyle(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1
 + (c++)"pkgSourceList::Type::ParseStanza(std::vector<metaIndex*, std::allocator<metaIndex*> >&, pkgTagSection&, int, FileFd&)@Base" 0.9.14.3~exp1
 +### install foo.deb support
 + (c++)"flAbsPath(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp1
 + (c++)"GetTempFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 1.1~exp1
 + (c++)"pkgIndexFile::Type::CreateSrcPkgParser(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 1.1~exp1
 + (c++)"metaIndex::LocalFileName() const@Base" 1.1~exp1
 + (c++)"metaIndex::~metaIndex()@Base" 1.1~exp1
 +### CacheFilter functors
 + (c++)"APT::CacheFilter::ANDMatcher::AND(APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::ANDMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::ANDMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::ANDMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::ANDMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::ANDMatcher(APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::ANDMatcher()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::~ANDMatcher()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::operator()(pkgCache::GrpIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::operator()(pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ANDMatcher::operator()(pkgCache::VerIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::FalseMatcher::~FalseMatcher()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::FalseMatcher::operator()(pkgCache::GrpIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::FalseMatcher::operator()(pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::FalseMatcher::operator()(pkgCache::VerIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::Matcher::~Matcher()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::NOTMatcher::NOTMatcher(APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::NOTMatcher::~NOTMatcher()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::NOTMatcher::operator()(pkgCache::GrpIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::NOTMatcher::operator()(pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::NOTMatcher::operator()(pkgCache::VerIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::operator()(pkgCache::GrpIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::operator()(pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::operator()(pkgCache::VerIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::OR(APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::ORMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::ORMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::ORMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::ORMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::ORMatcher(APT::CacheFilter::Matcher*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::~ORMatcher()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::ORMatcher::ORMatcher()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::PackageIsNewInstall::operator()(pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::PackageIsNewInstall::~PackageIsNewInstall()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::PackageIsNewInstall::PackageIsNewInstall(pkgCacheFile*)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::PackageMatcher::operator()(pkgCache::GrpIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::PackageMatcher::operator()(pkgCache::VerIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::PackageMatcher::~PackageMatcher()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::~PackageNameMatchesFnmatch()@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::PackageNameMatchesFnmatch(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::TrueMatcher::operator()(pkgCache::GrpIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::TrueMatcher::operator()(pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::TrueMatcher::operator()(pkgCache::VerIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheFilter::TrueMatcher::~TrueMatcher()@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::ANDMatcher@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::FalseMatcher@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::Matcher@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::NOTMatcher@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::ORMatcher@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::PackageArchitectureMatchesSpecification@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::PackageIsNewInstall@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::PackageMatcher@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::PackageNameMatchesFnmatch@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::PackageNameMatchesRegEx@Base" 1.1~exp4
 + (c++)"typeinfo for APT::CacheFilter::TrueMatcher@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::ANDMatcher@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::FalseMatcher@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::Matcher@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::NOTMatcher@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::ORMatcher@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::PackageArchitectureMatchesSpecification@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::PackageIsNewInstall@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::PackageMatcher@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::PackageNameMatchesFnmatch@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::PackageNameMatchesRegEx@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::CacheFilter::TrueMatcher@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::ANDMatcher@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::FalseMatcher@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::Matcher@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::NOTMatcher@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::ORMatcher@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::PackageArchitectureMatchesSpecification@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::PackageIsNewInstall@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::PackageMatcher@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::PackageNameMatchesFnmatch@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::PackageNameMatchesRegEx@Base" 1.1~exp4
 + (c++)"vtable for APT::CacheFilter::TrueMatcher@Base" 1.1~exp4
 +### cacheset redesign (API, but not ABI compatible)
 +# (c++|optional=inline)"APT::PackageContainerInterface::FromCommandLine(APT::PackageContainerInterface*, pkgCacheFile&, char const**, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 +# (c++|optional=inline)"APT::PackageContainerInterface::FromModifierCommandLine(unsigned short&, APT::PackageContainerInterface*, pkgCacheFile&, char const*, std::list<APT::PackageContainerInterface::Modifier, std::allocator<APT::PackageContainerInterface::Modifier> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 +# (c++|optional=inline)"APT::PackageContainerInterface::FromName(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 +# (c++|optional=inline)"APT::PackageContainerInterface::FromTask(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 +# (c++|optional=inline)"APT::PackageContainerInterface::FromRegEx(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 +# (c++|optional=inline)"APT::VersionContainerInterface::FromString(APT::VersionContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::VersionContainerInterface::Version const&, APT::CacheSetHelper&, bool)@Base" 0.8.16~exp9
 +# (c++|optional=inline)"APT::VersionContainerInterface::FromPackage(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&, APT::VersionContainerInterface::Version const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 +# (c++|optional=inline)"APT::VersionContainerInterface::FromCommandLine(APT::VersionContainerInterface*, pkgCacheFile&, char const**, APT::VersionContainerInterface::Version const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 +# (c++)"APT::PackageContainerInterface::FromString(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
 +# (c++)"APT::PackageContainerInterface::FromGroup(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.9.7
 +# (c++)"APT::PackageContainerInterface::FromFnmatch(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.9.11
 + (c++)"APT::CacheSetHelper::canNotFindFnmatch(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::canNotFindPackage(APT::CacheSetHelper::PkgSelector, APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::canNotFindVersion(APT::CacheSetHelper::VerSelector, APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::canNotGetCandInstVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::canNotGetInstCandVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::canNotGetVersion(APT::CacheSetHelper::VerSelector, pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFrom(APT::CacheSetHelper::PkgSelector, APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFromCommandLine(APT::PackageContainerInterface*, pkgCacheFile&, char const**)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFromFnmatch(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFromModifierCommandLine(unsigned short&, APT::PackageContainerInterface*, pkgCacheFile&, char const*, std::list<APT::CacheSetHelper::PkgModifier, std::allocator<APT::CacheSetHelper::PkgModifier> > const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFromName(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFromPackageName(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFromRegEx(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFromString(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::PackageFromTask(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::showPackageSelection(pkgCache::PkgIterator const&, APT::CacheSetHelper::PkgSelector, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"APT::CacheSetHelper::showVersionSelection(pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::CacheSetHelper::VerSelector, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"APT::VersionContainerInterface::FromCommandLine(APT::VersionContainerInterface*, pkgCacheFile&, char const**, APT::CacheSetHelper::VerSelector, APT::CacheSetHelper&)@Base" 1.1~exp4
 + (c++)"APT::VersionContainerInterface::FromPackage(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper::VerSelector, APT::CacheSetHelper&)@Base" 1.1~exp4
 + (c++)"APT::VersionContainerInterface::FromString(APT::VersionContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper::VerSelector, APT::CacheSetHelper&, bool)@Base" 1.1~exp4
 +### all the hashes are belong to us
 +# (c++|optional=inline)"Hashes::AddFD(int, unsigned long long, bool, bool, bool, bool)@Base" 0.8.16~exp6
 +# (c++|optional=inline)"Hashes::AddFD(FileFd&, unsigned long long, bool, bool, bool, bool)@Base" 0.8.16~exp9
 +# (c++|optional=inline)"pkgRecords::Parser::MD5Hash()@Base" 0.8.0
 +# (c++|optional=inline)"pkgRecords::Parser::SHA1Hash()@Base" 0.8.0
 +# (c++|optional=inline)"pkgRecords::Parser::SHA256Hash()@Base" 0.8.0
 +# (c++|optional=inline)"pkgRecords::Parser::SHA512Hash()@Base" 0.8.16~exp6
 + (c++)"Hashes::AddFD(FileFd&, unsigned long long, unsigned int)@Base" 1.1~exp1
 + (c++)"Hashes::AddFD(int, unsigned long long, unsigned int)@Base" 1.1~exp1
 + (c++)"Hashes::Add(unsigned char const*, unsigned long long, unsigned int)@Base" 1.1~exp1
 + (c++)"Hashes::GetHashStringList()@Base" 1.1~exp1
 + (c++)"Hashes::Hashes()@Base" 1.1~exp1
 + (c++)"Hashes::~Hashes()@Base" 1.1~exp1
 + (c++)"HashStringList::find(char const*) const@Base" 1.1~exp1
 + (c++)"HashStringList::operator==(HashStringList const&) const@Base" 1.1~exp1
 + (c++)"HashStringList::operator!=(HashStringList const&) const@Base" 1.1~exp1
 + (c++)"HashStringList::push_back(HashString const&)@Base" 1.1~exp1
 + (c++)"HashStringList::supported(char const*)@Base" 1.1~exp1
 + (c++)"HashStringList::usable() const@Base" 1.1~exp1
 + (c++)"HashStringList::VerifyFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 1.1~exp1
 + (c++)"HashString::operator==(HashString const&) const@Base" 1.1~exp1
 + (c++)"HashString::operator!=(HashString const&) const@Base" 1.1~exp1
 + (c++)"indexRecords::GetSupportsAcquireByHash() const@Base" 1.1~exp1
 + (c++)"pkgAcqArchive::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
 + (c++)"pkgAcqArchive::IsTrusted() const@Base" 1.1~exp1
 + (c++)"pkgAcqFile::Custom600Headers() const@Base" 1.1~exp1
 + (c++)"pkgAcqFile::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
 + (c++)"pkgAcqFile::pkgAcqFile(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashStringList const&, unsigned long 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" 1.1~exp1
 + (c++)"pkgAcqMethod::DropPrivsOrDie()@Base" 1.1~exp1
 + (c++)"pkgAcquire::Item::Custom600Headers() const@Base" 1.1~exp1
 + (c++)"pkgAcquire::Item::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
 + (c++)"pkgAcquire::Item::IsTrusted() const@Base" 1.1~exp1
 + (c++)"pkgRecords::Parser::Hashes() const@Base" 1.1~exp1
 + (c++)"pkgRecords::Parser::LongDesc(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp1
 + (c++)"pkgRecords::Parser::ShortDesc(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp1
 + (c++)"typeinfo for Hashes@Base" 1.1~exp1
 + (c++)"typeinfo name for Hashes@Base" 1.1~exp1
 + (c++)"vtable for Hashes@Base" 1.1~exp1
 + (c++)"typeinfo for pkgAcqBaseIndex@Base" 1.1~exp1
 + (c++)"typeinfo name for pkgAcqBaseIndex@Base" 1.1~exp1
 + (c++)"vtable for pkgAcqBaseIndex@Base" 1.1~exp1
 +### more transactional update
 + (c++)"pkgAcqBaseIndex::VerifyHashByMetaKey(HashStringList const&)@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::AbortTransaction()@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::Add(pkgAcquire::Item*)@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::CheckAuthDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::CheckDownloadDone(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" 1.1~exp4
 + (c++)"pkgAcqMetaBase::CheckStopAuthentication(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" 1.1~exp4
 + (c++)"pkgAcqMetaBase::CommitTransaction()@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::GetCustom600Headers(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::QueueForSignatureVerify(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" 1.1~exp4
 + (c++)"pkgAcqMetaBase::QueueIndexes(bool)@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::TransactionHasError()@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::TransactionStageCopy(pkgAcquire::Item*, 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" 1.1~exp4
 + (c++)"pkgAcqMetaBase::TransactionStageRemoval(pkgAcquire::Item*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::VerifyVendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"pkgAcquire::GetLock(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"pkgAcquire::Item::Dequeue()@Base" 1.1~exp4
 + (c++)"pkgAcquire::Item::Item(pkgAcquire*, HashStringList const&, pkgAcqMetaBase*)@Base" 1.1~exp4
 + (c++)"pkgAcquire::Item::QueueURI(pkgAcquire::ItemDesc&)@Base" 1.1~exp4
 + (c++)"pkgAcquire::Item::SetActiveSubprocess(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"pkgAcquire::Setup(pkgAcquireStatus*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
 + (c++)"pkgArchiveCleaner::Erase(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, stat&)@Base" 1.1~exp4
 + (c++)"pkgDepCache::MarkAndSweep()@Base" 1.1~exp4
 + (c++)"pkgDepCache::MarkAndSweep(pkgDepCache::InRootSetFunc&)@Base" 1.1~exp4
 + (c++)"pkgAcqMetaBase::~pkgAcqMetaBase()@Base" 1.1~exp4
 + (c++)"typeinfo for pkgAcqMetaBase@Base" 1.1~exp4
 + (c++)"typeinfo name for pkgAcqMetaBase@Base" 1.1~exp4
 + (c++)"vtable for pkgAcqMetaBase@Base" 1.1~exp4
 +### mixed stuff
 + (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp13
 + (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10
 + (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PrvIterator const&) const@Base" 0.8.16~exp10
 + (c++)"FileFd::Write(int, void const*, unsigned long long)@Base" 0.8.16~exp14
 + (c++)"_strrstrip(char*)@Base" 0.9.7.9~exp2
 + (c++)"SplitClearSignedFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, FileFd*, 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> > > >*, FileFd*)@Base" 0.9.7.9~exp2
 + (c++)"OpenMaybeClearSignedFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, FileFd&)@Base" 0.9.7.9~exp2
 + (c++)"ExecGPGV(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.9.7.9~exp2
 + (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&)@Base" 0.9.7.9~exp2
 + (c++)"Configuration::Dump(std::basic_ostream<char, std::char_traits<char> >&, char const*, char const*, bool)@Base" 0.9.3
 + (c++)"AcquireUpdate(pkgAcquire&, int, bool, bool)@Base" 0.9.3
 + (c++)"pkgCache::DepIterator::IsMultiArchImplicit() const@Base" 0.9.6
 + (c++)"pkgCache::PrvIterator::IsMultiArchImplicit() const@Base" 0.9.6
 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::PackageArchitectureMatchesSpecification(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.9.7
 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::~PackageArchitectureMatchesSpecification()@Base" 0.9.7
 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(pkgCache::PkgIterator const&)@Base" 0.9.7
 + (c++)"APT::CacheFilter::PackageArchitectureMatchesSpecification::operator()(char const* const&)@Base" 0.9.7
 + (c++)"APT::Configuration::checkLanguage(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.9.7.5
 + (c++)"pkgCdrom::DropTranslation(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.9.7.5
 + (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::PrvIterator const&) const@Base" 0.9.8
 + (c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::VerIterator const&) const@Base" 0.9.8
 + (c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, GlobalError::Item)@Base" 0.9.9
 + (c++)"pkgDepCache::IsDeleteOkProtectInstallRequests(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1
 + (c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1
 + (c++)"pkgDPkgPM::SendPkgsInfo(_IO_FILE*, unsigned int const&)@Base" 0.9.9.1
 + (c++)"pkgCache::VerIterator::MultiArchType() const@Base" 0.9.9.1
 + (c++)"AutoDetectProxy(URI&)@Base" 0.9.10
 + (c++)"CommandLine::GetCommand(CommandLine::Dispatch const*, unsigned int, char const* const*)@Base" 0.9.11
 + (c++)"CommandLine::MakeArgs(char, char const*, char const*, unsigned long)@Base" 0.9.11
 + (c++)"Configuration::Clear()@Base" 0.9.11
 + (c++)"Glob(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0.9.11
 + (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::GrpIterator const&)@Base" 0.9.11
 + (c++)"APT::CacheFilter::PackageNameMatchesFnmatch::operator()(pkgCache::PkgIterator const&)@Base" 0.9.11
 + (c++)"pkgTagSection::pkgTagSection()@Base" 0.9.11
 + (c++)"strv_length(char const**)@Base" 0.9.11
 + (c++)"StringSplit(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)@Base" 0.9.11.3
 + (c++)"pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState)@Base" 0.9.12
 + (c++)"APT::String::Endswith(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.9.13.1
 + (c++)"ExecFork(std::set<int, std::less<int>, std::allocator<int> >)@Base" 0.9.13.1
 + (c++)"MergeKeepFdsFromConfiguration(std::set<int, std::less<int>, std::allocator<int> >&)@Base" 0.9.13.1
 + (c++)"HashString::FromFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13.1
 + (c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1
 + (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2
 + (c++)"GetTempDir()@Base" 0.9.14.2
 + (c++)"APT::Configuration::getBuildProfiles()@Base" 0.9.16
 + (c++)"APT::Configuration::getBuildProfilesString()@Base" 0.9.16
 + (c++)"Configuration::FindVector(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.9.16
 + (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&)@Base" 0.9.16
 + (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&)@Base" 0.9.16
 + (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&, bool const&)@Base" 0.9.16
 + (c++)"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.9.16
 + (c++)"pkgDepCache::IsInstallOkDependenciesSatisfiableByCandidates(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 1.0
 + (c++)"APT::Progress::PackageManagerFancy::GetTerminalSize()@Base" 1.0
 + (c++)"APT::Progress::PackageManagerFancy::GetTextProgressStr(float, int)@Base" 1.0
 + (c++)"pkgCdromStatus::GetOpProgress()@Base" 1.0
 + (c++)"pkgCdromStatus::SetTotal(int)@Base" 1.0
 + (c++)"EDSP::ExecuteSolver(char const*, int*, int*, bool)@Base" 1.0.4
 + (c++)"pkgPackageManager::EarlyRemove(pkgCache::PkgIterator, pkgCache::DepIterator const*)@Base" 1.0.4
 + (c++)"pkgSrcRecords::Step()@Base" 1.0.4
++ (c++)"debTranslationsParser::Architecture()@Base" 1.0.4
++ (c++)"debTranslationsParser::~debTranslationsParser()@Base" 1.0.4
++ (c++)"debTranslationsParser::Version()@Base" 1.0.4
++ (c++)"typeinfo for debTranslationsParser@Base" 1.0.4
++ (c++)"typeinfo name for debTranslationsParser@Base" 1.0.4
++ (c++)"vtable for debTranslationsParser@Base" 1.0.4
 + (c++)"pkgDPkgPM::SetupSlavePtyMagic()@Base" 1.0.8
++ (c++)"HashStringList::find(char const*) const@Base" 1.0.9.4
++ (c++)"HashStringList::operator==(HashStringList const&) const@Base" 1.0.9.4
++ (c++)"HashStringList::operator!=(HashStringList const&) const@Base" 1.0.9.4
++ (c++)"HashStringList::push_back(HashString const&)@Base" 1.0.9.4
++ (c++)"HashStringList::supported(char const*)@Base" 1.0.9.4
++ (c++)"HashStringList::VerifyFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 1.0.9.4
++ (c++)"HashString::operator==(HashString const&) const@Base" 1.0.9.4
++ (c++)"HashString::operator!=(HashString const&) const@Base" 1.0.9.4
++ (c++)"pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2, std::allocator<pkgSrcRecords::File2> >&)@Base" 1.0.9.4
++ (c++)"debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2, std::allocator<pkgSrcRecords::File2> >&)@Base" 1.0.9.4
 + (c++)"APT::Progress::PackageManager::PackageManager()@Base" 1.1~exp1
 + (c++)"pkgDPkgPM::Go(APT::Progress::PackageManager*)@Base" 1.1~exp1
 + (c++)"pkgPackageManager::DoInstall(APT::Progress::PackageManager*)@Base" 1.1~exp1
 + (c++)"pkgPackageManager::DoInstallPostFork(APT::Progress::PackageManager*)@Base" 1.1~exp1
 + (c++)"pkgPackageManager::Go(APT::Progress::PackageManager*)@Base" 1.1~exp1
 + (c++)"pkgTagFile::Init(FileFd*, unsigned long long)@Base" 1.1~exp1
 + (c++)"pkgTagSection::Count() const@Base" 1.1~exp1
 + (c++)"pkgTagSection::Exists(char const*) const@Base" 1.1~exp1
 + (c++)"pkgTagSection::FindB(char const*, bool const&) const@Base" 1.1~exp1
 + (c++)"pkgTagSection::Scan(char const*, unsigned long, bool)@Base" 1.1~exp1
 + (c++)"StartsWithGPGClearTextSignature(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp1
 + (c++)"Popen(char const**, FileFd&, int&, FileFd::OpenMode)@Base" 1.1~exp1
 + (c++)"APT::String::Startswith(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" 1.1~exp2
 + (c++)"APT::Upgrade::Upgrade(pkgDepCache&, int, OpProgress*)@Base" 1.1~exp4
 + (c++)"pkgProblemResolver::Resolve(bool, OpProgress*)@Base" 1.1~exp4
 + (c++)"pkgProblemResolver::ResolveByKeep(OpProgress*)@Base" 1.1~exp4
 + (c++)"pkgCache::PkgIterator::Section() const@Base" 1.1~exp4
 + (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::iterator::getPkg() const@Base" 1.1~exp4
 + (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::iterator@Base" 1.1~exp4
 + (c++)"typeinfo name for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::iterator@Base" 1.1~exp4
 + (c++)"vtable for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::iterator@Base" 1.1~exp4
 + (c++)"DropPrivileges()@Base" 1.1~exp4
 + (c++)"FileFd::FileFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned long)@Base" 1.1~exp4
 + (c++)"indexRecords::indexRecords(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp5
 + (c++)"indexRecords::IsAlwaysTrusted() const@Base" 1.1~exp5
 + (c++)"indexRecords::IsNeverTrusted() const@Base" 1.1~exp5
 + (c++)"indexRecords::SetTrusted(bool)@Base" 1.1~exp5
 + (c++)"metaIndex::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&, char const*)@Base" 1.1~exp9
 + (c++)"pkgTagSection::Get(char const*&, char const*&, unsigned int) const@Base" 1.1~exp9
++### 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.6 artefacts
 +# (c++|optional=implicit)"HashString::operator=(HashString const&)@Base" 0.8.0
 +# (c++|optional=implicit)"HashString::HashString(HashString const&)@Base" 0.8.0
 +# (c++|optional=inline)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator std::max_element<APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders>(APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders)@Base" 0.8.0
 +# (c++|optional=inline)"pkgCache::VerIterator::ParentPkg() const@Base" 0.8.0
 +### empty destructors included in the .h file
 +# (c++|optional=inline)"pkgVersioningSystem::~pkgVersioningSystem()@Base" 0.8.0
 +# (c++|optional=inline)"pkgSystem::~pkgSystem()@Base" 0.8.0
 +# (c++|optional=inline)"pkgRecords::Parser::~Parser()@Base" 0.8.0
 +# (c++|optional=inline)"pkgSrcRecords::Parser::~Parser()@Base" 0.8.0
 +# (c++|optional=inline)"pkgIndexFile::Type::~Type()@Base" 0.8.0
 +# (c++|optional=inline)"pkgSourceList::Type::~Type()@Base" 0.8.0
 +# (c++|optional=inline)"pkgIndexFile::~pkgIndexFile()@Base" 0.8.0
 +# (c++|optional=inline)"metaIndex::~metaIndex()@Base" 0.8.0
 +### std library artefacts
 + (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0
 + (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<__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> > >, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0
 + (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<__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> > >, __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0
 + (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<char const*>(char const*, char const*, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0
 + (c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<char*>(char*, char*, std::allocator<char> const&, std::forward_iterator_tag)@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)"^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++|optional=std)"std::ctype<char>::do_widen(char) const@Base" 1.0.3

diff --cc doc/apt-verbatim.ent
index 14314534493c5e5c772f2e89dfde34d88616243b,e88d393323dda45082940de52212ef1f204a845b..dbec857905525cea95dcc3ac7e729423b251932d
--- 1/doc/apt-verbatim.ent
--- 2/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@@ -225,13 -225,13 +225,13 @@@
  ">
  
  <!-- this will be updated by 'prepare-release' -->
- <!ENTITY apt-product-version "1.1~exp7">
 -<!ENTITY apt-product-version "1.0.9.6">
++<!ENTITY apt-product-version "1.0.9.7">
  
  <!-- (Code)names for various things used all over the place -->
- <!ENTITY oldstable-codename "squeeze">
- <!ENTITY stable-codename "wheezy">
- <!ENTITY testing-codename "jessie">
- <!ENTITY stable-version "7">
+ <!ENTITY oldstable-codename "wheezy">
+ <!ENTITY stable-codename "jessie">
+ <!ENTITY testing-codename "stretch">
+ <!ENTITY stable-version "8">
  <!ENTITY ubuntu-codename "trusty">
  
  <!-- good and bad just refers to matching and not matching a pattern…

diff --cc doc/po/apt-doc.pot
Simple merge

diff --cc ftparchive/cachedb.cc
Simple merge

diff --cc ftparchive/writer.cc
Simple merge

diff --cc methods/https.cc
index 23b3a10d48f0ef3c46b7488bb7f8fcb44462bc07,3a5981b5824511a4cc9d9d74eb2f2bc3fbf475cd..37a8ff5fd46a54067146279434a8eeabe936728c
--- 1/methods/https.cc
--- 2/methods/https.cc
+++ b/methods/https.cc
@@@ -95,24 -85,21 +95,33 @@@ HttpsMethod::write_data(void *buffer, s
     if (me->Server->JunkSize != 0)
        return buffer_size;
  
-    if (me->Res.Size == 0)
 -   if (me->ReceivedData == false)
++   if (me->Server->ReceivedData == false)
+    {
        me->URIStart(me->Res);
 -      me->ReceivedData = true;
++      me->Server->ReceivedData = true;
+    }
+ 
     if(me->File->Write(buffer, buffer_size) != true)
--      return false;
++      return 0;
 +
-    if(me->Queue->MaximumSize > 0 && me->File->Tell() > me->Queue->MaximumSize)
++   if(me->Queue->MaximumSize > 0)
 +   {
-       me->SetFailReason("MaximumSizeExceeded");
-       _error->Error("Writing more data than expected (%llu > %llu)",
-                            me->TotalWritten, me->Queue->MaximumSize);
-       return 0;
++      unsigned long long const TotalWritten = me->File->Tell();
++      if (TotalWritten > me->Queue->MaximumSize)
++      {
++       me->SetFailReason("MaximumSizeExceeded");
++       _error->Error("Writing more data than expected (%llu > %llu)",
++             TotalWritten, me->Queue->MaximumSize);
++       return 0;
++      }
 +   }
+ 
     return buffer_size;
  }
  
  int
  HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/,
-                             double /*ultotal*/, double /*ulnow*/)
 -                             double /*ultotal*/, double /*ulnow*/)
++                             double /*ultotal*/, double /*ulnow*/)
  {
     HttpsMethod *me = (HttpsMethod *)clientp;
     if(dltotal > 0 && me->Res.Size == 0) {
@@@ -125,6 -112,6 +134,7 @@@
  HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL)
  {
     TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
++   ReceivedData = false;
     Reset();
  }
                                                                        /*}}}*/
@@@ -192,7 -179,7 +202,7 @@@ void HttpsMethod::SetupProxy()                                     /*
  bool HttpsMethod::Fetch(FetchItem *Itm)
  {
     struct stat SBuf;
--   struct curl_slist *headers=NULL;  
++   struct curl_slist *headers=NULL;
     char curl_errorstr[CURL_ERROR_SIZE];
     URI Uri = Itm->Uri;
     string remotehost = Uri.Host;

diff --cc methods/https.h
index 9df18e83a261ef489231ee65c468b6fcd91d6a5e,411b71440119146e78166f94566437b510cb739f..6917a6ff68981d311168ec85ae45ed1f9935b2bb
--- 1/methods/https.h
--- 2/methods/https.h
+++ b/methods/https.h
@@@ -50,6 -50,6 +50,8 @@@ class HttpsServerState : public ServerS
  
     HttpsServerState(URI Srv, HttpsMethod *Owner);
     virtual ~HttpsServerState() {Close();};
++
++   bool ReceivedData;
  };
  
  class HttpsMethod : public pkgAcqMethod
@@@ -58,23 -58,22 +60,22 @@@
     static const int DL_MIN_SPEED = 10;
  
     virtual bool Fetch(FetchItem *);
 +   virtual bool Configuration(std::string Message);
 +
     static size_t parse_header(void *buffer, size_t size, size_t nmemb, void *userp);
     static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
--   static int progress_callback(void *clientp, double dltotal, double dlnow, 
--                              double ultotal, double ulnow);
++   static int progress_callback(void *clientp, double dltotal, double dlnow,
++                               double ultotal, double ulnow);
     void SetupProxy();
     CURL *curl;
     FetchResult Res;
     HttpsServerState *Server;
-    unsigned long long TotalWritten;
 -   bool ReceivedData;
  
     public:
     FileFd *File;
--      
-    HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), Server(NULL), TotalWritten(0), File(NULL)
 -   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), File(NULL)
++
++   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), Server(NULL), File(NULL)
     {
 -      File = 0;
        curl = curl_easy_init();
     };
  

diff --cc methods/server.cc
Simple merge

diff --cc po/apt-all.pot
index 90ed92e3a2fdff70bbb676ab5339cebcaf5e49b4,3822dd9dbc6fa0d9372a3bb27a52ceb3f3a2e6e4..4e91a8e33b9e89b399768beabd22b6d103cec4c7
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -899,8 -900,8 +900,8 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -911,11 -912,11 +912,11 @@@ msgid "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 +msgid "Unknown error executing apt-key"
  msgstr ""
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr ""
  
@@@ -1532,6 -1514,14 +1514,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
+ msgstr ""
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr ""
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr ""
@@@ -2559,17 -2342,17 +2342,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr ""
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr ""
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
++msgid "Unable to parse package file %s (%d)"
  msgstr ""
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr ""

diff --cc po/ar.po
index e93ae6810c66cea0655d7dbe0606e5536eb1ff6a,a22a38f33872b636267b8144fe80490e0d316f24..1a64f460629be4137eedf8091d2125b4cc787444
--- 1/po/ar.po
--- 2/po/ar.po
+++ b/po/ar.po
@@@ -912,8 -913,8 +913,8 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -924,11 -925,11 +925,11 @@@ msgid "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 +msgid "Unknown error executing apt-key"
  msgstr ""
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr ""
  
@@@ -1558,6 -1540,14 +1540,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "حساب الترقية..."
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "حساب الترقية"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "تمّ"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr ""
@@@ -2597,17 -2378,17 +2378,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
 -msgstr ""
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
++msgid "Unable to parse package file %s (%d)"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr ""
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"

diff --cc po/ast.po
index 04ca3911b4175414ebb04e8e684dc6335aac4153,0e013f9fe944eda6524ac66004314daacd3c2b5b..1da4e6ebab97b80a2d7e15c899369080e6b455a5
--- 1/po/ast.po
--- 2/po/ast.po
+++ b/po/ast.po
@@@ -1019,24 -1020,23 +1020,23 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Atopóse polo menos una robla mala."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr ""
- "Nun pudo executase 'apt-key' pa verificar la robla (¿ta instaláu gnupg?)"
++msgstr "Nun pudo executase 'apt-key' pa verificar la robla (¿ta instaláu gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Fallu desconocíu al executar gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Fallu desconocíu al executar apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Les siguientes robles nun valieron:\n"
  
@@@ -1687,6 -1668,14 +1668,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Calculando l'anovamientu... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Calculando l'anovamientu"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Fecho"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Oxe "
@@@ -2829,17 -2534,17 +2534,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Nun se pudo tratar el ficheru de paquetes %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Nun se pudo parchear el ficheru release %s"

diff --cc po/bg.po
index d32f737899da72fdc960ed1d7cc4b630c3d7f2b1,fc1d7b08a4172e773fdb321b3aa154e3628fad25..4b6c30793c02a4e7609f7f4aaaa0de14884f8416
--- 1/po/bg.po
--- 2/po/bg.po
+++ b/po/bg.po
@@@ -1049,25 -1050,25 +1050,25 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Намерен е поне един невалиден подпис."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
 -"Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е "
 -"gpgv?)"
 +"Неуспех при изпълнение на „apt-key“ за проверка на подписа (инсталиран ли е "
 +"gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Неизвестна грешка при изпълнението на gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Неизвестна грешка при изпълнението на apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Следните подписи са невалидни:\n"
  
@@@ -1723,6 -1705,14 +1705,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Изчисляване на актуализацията..."
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Изчисляване на актуализацията"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Готово"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Поп "
@@@ -2877,17 -2579,17 +2579,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Неуспех при анализирането на пакетен файл %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Неуспех при анализирането на пакетен файл %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Неуспех при анализирането на пакетен файл %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Неуспех при анализирането на пакетен файл %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Неуспех при анализиране на файл Release %s"

diff --cc po/bs.po
index 807af53cd6d57dc8371287ca5f770d3347b59be5,5bbec432a902f813d9dce074433a9aa7b8fa0e05..e32f2353fe90f9a8b854e0033f2663254a6fadb7
--- 1/po/bs.po
--- 2/po/bs.po
+++ b/po/bs.po
@@@ -918,8 -919,8 +919,8 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -930,11 -931,11 +931,11 @@@ msgid "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 +msgid "Unknown error executing apt-key"
  msgstr ""
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "Slijedeći dodatni paketi će biti instalirani:"
@@@ -1558,6 -1540,14 +1540,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Računam nadogradnju..."
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Računam nadogradnju"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Urađeno"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr ""
@@@ -2593,17 -2373,17 +2373,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
 -msgstr ""
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
++msgid "Unable to parse package file %s (%d)"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr ""
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Ne mogu otvoriti DB datoteku %s"

diff --cc po/ca.po
index 375fac71e23288d151884e606fc64f99c08f2bb4,d916d73e180df732eaf40e1b6e773c2cb6db0afb..ea0f2fe3510b37889fb3d9c2161bbfcb1934f682
--- 1/po/ca.po
--- 2/po/ca.po
+++ b/po/ca.po
@@@ -1032,25 -1033,25 +1033,25 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "S'ha trobat almenys una signatura invàlida."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
 -"No s'ha pogut executar el «gpgv» per a verificar la signatura (està "
 -"instaŀlat el gpgv?)"
 +"No s'ha pogut executar el «apt-key» per a verificar la signatura (està "
 +"instaŀlat el gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "S'ha produït un error desconegut en executar el gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "S'ha produït un error desconegut en executar el apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Les signatures següents són invàlides:\n"
  
@@@ -1711,6 -1693,14 +1693,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "S'està calculant l'actualització… "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "S'està calculant l'actualització"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Fet"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Obj "
@@@ -2866,17 -2574,17 +2574,12 @@@ msgstr "El resoledor extern ha fallat s
  msgid "Execute external solver"
  msgstr "Executa un resoledor extern"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "No es pot analitzar el fitxer del paquet %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "No es pot analitzar el fitxer del paquet %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "No es pot analitzar el fitxer del paquet %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "No es pot analitzar el fitxer del paquet %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "No es pot analitzar el fitxer Release %s"

diff --cc po/cs.po
index a98c0bcc6c9e9823a8229597765a3220a5fb5e9b,e90f98d2846d54aace8eb454d934f6f17974bab6..05d07af6356c30e539347f7d67a190601bd771ef
--- 1/po/cs.po
--- 2/po/cs.po
+++ b/po/cs.po
@@@ -1060,13 -1061,12 +1061,12 @@@ msgstr "Vnitřní chyba: Dobrý podpis
  msgid "At least one invalid signature was encountered."
  msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
  
- #: methods/gpgv.cc:185
- #, fuzzy
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)"
++msgstr "Nelze spustit „apt-key“ pro ověření podpisu (je gnupg nainstalováno?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
@@@ -1075,12 -1075,11 +1075,11 @@@ msgstr "
  "Podepsaný soubor není platný, obdrženo „%s“ (vyžaduje přístup na síť "
  "ověření?)"
  
- #: methods/gpgv.cc:195
- #, fuzzy
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Neznámá chyba při spouštění gpgv"
 +msgid "Unknown error executing apt-key"
- msgstr "Neznámá chyba při spouštění gpgv"
++msgstr "Neznámá chyba při spouštění apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Následující podpisy jsou neplatné:\n"
  
@@@ -1739,6 -1719,14 +1719,14 @@@ msgstr "Soubor „%s“ se změnil, spu
  msgid "Full Text Search"
  msgstr "Fulltextové hledání"
  
 -msgid "Calculating upgrade... "
 -msgstr "Propočítává se aktualizace… "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Propočítává se aktualizace"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Hotovo"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Cíl "
@@@ -2868,17 -2577,17 +2577,12 @@@ msgstr "Externí Å\99eÅ¡itel selhal, aniÅ
  msgid "Execute external solver"
  msgstr "Spuštění externího řešitele"
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Nelze zpracovat soubor %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "Nelze zpracovat soubor %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Nelze zpracovat soubor %s (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "Nelze zpracovat soubor %s (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Nelze zpracovat Release soubor %s"

diff --cc po/cy.po
index a25e4be089edb3e700f16994dec35d8f2669bd6b,0f2fd4c146ce9d55023ba0f8e615249011f2cf11..8c4121ae71bb0f77d7f93ba29309561fe997ed41
--- 1/po/cy.po
--- 2/po/cy.po
+++ b/po/cy.po
@@@ -1039,8 -1041,8 +1041,8 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -1051,11 -1053,11 +1053,11 @@@ msgid "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 +msgid "Unknown error executing apt-key"
  msgstr ""
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
@@@ -1709,6 -1692,15 +1692,15 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Yn Cyfrifo'r Uwchraddiad... "
+ #: apt-private/private-upgrade.cc:25
+ #, fuzzy
++msgid "Calculating upgrade"
++msgstr "Yn Cyfrifo'r Uwchraddiad"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Wedi Gorffen"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Presennol "
@@@ -2865,19 -2575,19 +2575,13 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
--# FIXME: number?
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
  
  # FIXME: number?
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"

diff --cc po/da.po
index eefea50453ab5071e78cc9013920964eb03dab42,2f6f9982d7dc36d707226f308ed3f92683c2017e..712dec981c880bd27c37655b2c05111223615dd8
--- 1/po/da.po
--- 2/po/da.po
+++ b/po/da.po
@@@ -1073,14 -1074,13 +1074,13 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Stødte på mindst én ugyldig signatur."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Kunne ikke køre »apt-key« for at verificere signaturen (er gnupg "
- "installeret?)"
 -"Kunne ikke køre »gpgv« for at verificere signaturen (er gpgv installeret?)"
++"Kunne ikke køre »apt-key« for at verificere signaturen (er gnupg installeret?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
@@@ -1089,11 -1089,11 +1089,11 @@@ msgstr "
  "Clearsigned-fil er ikke gyldig, fik »%s« (kræver netværket ikke "
  "autentificering?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Ukendt fejl ved kørsel af gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Ukendt fejl ved kørsel af apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Følgende signaturer var ugyldige:\n"
  
@@@ -1752,6 -1733,14 +1733,14 @@@ msgstr "Din »%s« fil blev ændret, kÃ
  msgid "Full Text Search"
  msgstr "Fuldtekst-søgning"
  
 -msgid "Calculating upgrade... "
 -msgstr "Beregner opgraderingen ... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Beregner opgraderingen"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Færdig"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Havde "
@@@ -2891,17 -2600,17 +2600,12 @@@ msgstr "Ekstern problemløser fejlede u
  msgid "Execute external solver"
  msgstr "Kør ekstern problemløser"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Kunne ikke tolke pakkefilen %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Kunne ikke tolke pakkefilen %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Kunne ikke tolke pakkefilen %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Kunne ikke tolke pakkefilen %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Kunne ikke fortolke udgivelsesfil %s"

diff --cc po/de.po
index 2eec382d223fd202fe15b26b6a59d2e91d1ef2c6,733739ce137d3a04376213913e17876874218258..bc74e184c7460ff4f472f0044e987bce8e3f3eb1
--- 1/po/de.po
--- 2/po/de.po
+++ b/po/de.po
@@@ -1111,14 -1112,14 +1112,14 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "»apt-key« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist "
- "gnupg installiert?)"
 -"»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv "
++"»apt-key« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gnupg "
+ "installiert?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
@@@ -1127,11 -1128,11 +1128,11 @@@ msgstr "
  "Durch Clearsign signierte Datei ist nicht gültig, »%s« erhalten (erfordert "
  "das Netzwerk eine Authentifizierung?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Unbekannter Fehler beim Ausführen von gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Unbekannter Fehler beim Ausführen von apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Die folgenden Signaturen waren ungültig:\n"
  
@@@ -1813,6 -1795,14 +1795,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr "Volltextsuche"
  
 -msgid "Calculating upgrade... "
 -msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Paketaktualisierung (Upgrade) wird berechnet"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Fertig"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "OK   "
@@@ -2987,17 -2687,17 +2687,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr "Externen Problemlöser ausführen"
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
++msgid "Unable to parse package file %s (%d)"
++msgstr "Paketdatei %s konnte nicht verarbeitet werden (%d)."
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Release-Datei %s kann nicht verarbeitet werden."

diff --cc po/dz.po
index ed74e44001c6ecc95d5bd6a824b40fe853b13569,76723a58997cb3dc8b30b162976860f6a2db7481..fa842efc7a5112109fdcfafc1f9d726caaa943bd
--- 1/po/dz.po
--- 2/po/dz.po
+++ b/po/dz.po
@@@ -1013,25 -1014,25 +1014,25 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
  #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
--"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
++"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gnupg་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
 +msgid "Unknown error executing apt-key"
 +msgstr "apt-key་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
  
@@@ -1676,6 -1658,14 +1658,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "འབད་ཚར་ཡི།"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "ཨེབ།"
@@@ -2817,17 -2520,17 +2520,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
--
- #: apt-pkg/tagfile.cc:269
 -#: apt-pkg/tagfile.cc:237
--#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
++msgid "Unable to parse package file %s (%d)"
++msgstr "%s (%d)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"

diff --cc po/el.po
index d9bca293a2e973d149f36a1fa507896782ea6575,4c7e0263410ed4aab83112007f490bd4216e6195..393d5ceef7369d563cd6a56982fa880337484682
--- 1/po/el.po
--- 2/po/el.po
+++ b/po/el.po
@@@ -1025,26 -1026,26 +1026,26 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
  #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
  "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
 -"εγκατεστημένο το gpgv;)"
 +"εγκατεστημένο το gnupg;)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
  
@@@ -1698,6 -1680,14 +1680,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Υπολογισμός της αναβάθμισης... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Υπολογισμός της αναβάθμισης"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Ετοιμο"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Hit "
@@@ -2843,17 -2547,17 +2547,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
++msgid "Unable to parse package file %s (%s)"
++msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (%s)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"

diff --cc po/es.po
index 7e06fb2bd3720f05fd87d3aef08178c30c28694d,3384c0e7da4216186a7645e0a28242fb57ec61a3..8ef8006a0237838e89cad51d6290416b833bec9a
--- 1/po/es.po
--- 2/po/es.po
+++ b/po/es.po
@@@ -1084,29 -1147,30 +1147,30 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Se encontró al menos una firma inválida."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "No se pudo ejecutar «apt-key»  para verificar la firma (¿está instalado "
- "gnupg?)"
 -"No se pudo ejecutar «gpgv»  para verificar la firma (¿está instalado gpgv?)"
++"No se pudo ejecutar «apt-key»  para verificar la firma (¿está instalado gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
+ "El fichero firmado en claro no es válido, «%s» obtenido (¿la red requiere "
+ "autenticación?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Error desconocido ejecutando «gpgv»"
 +msgid "Unknown error executing apt-key"
- msgstr "Error desconocido ejecutando apt-key"
++msgstr "Error desconocido ejecutando «apt-key»"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
- msgstr "Las siguientes firms fueron inválidas:\n"
+ msgstr "Las siguientes firmas no fueron válidas:\n"
  
- #: methods/gpgv.cc:242
+ #: methods/gpgv.cc:231
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1759,7 -1802,15 +1802,15 @@@ msgstr "El fichero «%s» cambió, ejec
  
  #: apt-private/private-search.cc:69
  msgid "Full Text Search"
- msgstr ""
+ msgstr "Buscar en todo el texto"
+ 
+ #: apt-private/private-upgrade.cc:25
 -msgid "Calculating upgrade... "
 -msgstr "Calculando la actualización... "
++msgid "Calculating upgrade"
++msgstr "Calculando la actualización"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Listo"
  
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
@@@ -2902,35 -2667,35 +2667,30 @@@ msgstr "
  
  #: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
  msgid "Send scenario to solver"
- msgstr ""
+ msgstr "Enviar situación al solucionador"
  
- #: apt-pkg/edsp.cc:237
+ #: apt-pkg/edsp.cc:241
  msgid "Send request to solver"
- msgstr ""
+ msgstr "Enviar petición al solucionador"
  
- #: apt-pkg/edsp.cc:316
+ #: apt-pkg/edsp.cc:320
  msgid "Prepare for receiving solution"
- msgstr ""
+ msgstr "Preparar para recibir una solución"
  
- #: apt-pkg/edsp.cc:323
+ #: apt-pkg/edsp.cc:327
  msgid "External solver failed without a proper error message"
- msgstr ""
+ msgstr "Falló solucionador externo sin un mensaje de error apropiado"
  
- #: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
+ #: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
  msgid "Execute external solver"
- msgstr ""
- 
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "No se pudo tratar el archivo de paquetes %s (1)"
+ msgstr "Ejecutar solucionador externo"
  
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "No se pudo tratar el archivo de paquetes %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "No se pudo tratar el archivo de paquetes %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "No se pudo leer el archivo «Release» %s"

diff --cc po/eu.po
index e84be37a106d02b7ba2e438d917564695ba97699,5271613efcf4d72160723c5072665a0cd1272b40..943d81b7840235bc949479bba460eda8bec4e0ec
--- 1/po/eu.po
--- 2/po/eu.po
+++ b/po/eu.po
@@@ -1014,24 -1015,24 +1015,24 @@@ msgstr "Barne errorea: Sinadura zuzena
  msgid "At least one invalid signature was encountered."
  msgstr "Beintza sinadura baliogabe bat aurkitu da."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
+ #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr ""
- "Ezin da apt-key abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
++msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Errore ezezaguna gpgv exekutatzean"
 +msgid "Unknown error executing apt-key"
 +msgstr "Errore ezezaguna apt-key exekutatzean"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Ondorengo sinadurak baliogabeak dira:\n"
  
@@@ -1680,6 -1662,14 +1662,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Berriketak kalkulatzen... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Berriketak kalkulatzen"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Eginda"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Atzituta "
@@@ -2808,17 -2518,17 +2518,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Ezin da %s pakete fitxategia analizatu (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Ezin da %s pakete fitxategia analizatu (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Ezin da %s pakete fitxategia analizatu (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Ezin da %s pakete fitxategia analizatu (1)"

diff --cc po/fi.po
index f68aaa864c972d3a2ec59a26de4818300803f39c,bf4994788a19abbb890471ae8ad22878d1715ffb..532f8be588178e8b1a4d2502ddcefaf81317dca3
--- 1/po/fi.po
--- 2/po/fi.po
+++ b/po/fi.po
@@@ -1005,25 -1006,25 +1006,25 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
+ #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Ei käynnistynyt \"apt-key\" allekirjoitusta tarkistamaan (onko gnupg "
- "asennettu?)"
 -"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
++"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gnupg asennettu?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Tapahtui tuntematon virhe suoritettaessa apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
  
@@@ -1672,6 -1654,14 +1654,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Käsitellään päivitystä ... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Käsitellään päivitystä"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Valmis"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Löytyi "
@@@ -2806,17 -2512,17 +2512,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Pakettitiedostoa %s ei voi jäsentää (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"

diff --cc po/fr.po
index 18eef326888063e4bb2850ca3be5f9bde7e149d8,6c3d7f20e6025a8c4666bb3963b9e324487e19e0..8f49987f11c00eae507e65ce79d865d1a2cb18f2
--- 1/po/fr.po
--- 2/po/fr.po
+++ b/po/fr.po
@@@ -1075,14 -1087,14 +1087,14 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Au moins une signature non valable a été rencontrée."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
 -"Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez "
 -"vérifier si gpgv est installé)."
 +"Impossible d'exécuter « apt-key » pour contrôler la signature (veuillez "
 +"vérifier si gnupg est installé)."
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
@@@ -1091,11 -1103,11 +1103,11 @@@ msgstr "
  "Le fichier signé en clair n'est pas valable, ce qui a été reçu est « %s ». "
  "Peut-être le réseau nécessite-t-il une authentification."
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Erreur inconnue à l'exécution de gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Erreur inconnue à l'exécution de apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Les signatures suivantes ne sont pas valables :\n"
  
@@@ -1766,7 -1757,15 +1757,15 @@@ msgstr "Votre fichier « %s » a chan
  
  #: apt-private/private-search.cc:69
  msgid "Full Text Search"
- msgstr ""
+ msgstr "Recherche en texte intégral"
+ 
+ #: apt-private/private-upgrade.cc:25
 -msgid "Calculating upgrade... "
 -msgstr "Calcul de la mise à jour... "
++msgid "Calculating upgrade"
++msgstr "Calcul de la mise à jour"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Fait"
  
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
@@@ -2940,21 -2651,21 +2651,16 @@@ msgstr "Préparation à la réception d
  msgid "External solver failed without a proper error message"
  msgstr "Échec du solveur externe sans message d'erreur adapté"
  
- #: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
+ #: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
  msgid "Execute external solver"
- msgstr "Exécu tion du solveur externe"
- 
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Impossible de traiter le fichier %s (1)"
+ msgstr "Exécution du solveur externe"
  
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Impossible de traiter le fichier %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Impossible de traiter le fichier %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Impossible de traiter le fichier %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Impossible d'analyser le fichier Release %s"

diff --cc po/gl.po
index 83cd3075dfc2fedd6d1f6b654ca50ce1b61c86d6,3311b9382953426d8494e20512255f8ae3ceb8f5..9ae0dd5a39938593080d1e053dcfaeae71d2c5be
--- 1/po/gl.po
--- 2/po/gl.po
+++ b/po/gl.po
@@@ -1030,25 -1031,25 +1031,25 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Atopouse polo menos unha sinatura incorrecta."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
 -"Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado "
 -"gpgv?)"
 +"Non é posíbel executar «apt-key» para verificar a sinatura (Está instalado "
 +"gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Produciuse un erro descoñecido ao executar gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Produciuse un erro descoñecido ao executar apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "As seguintes sinaturas non eran correctas:\n"
  
@@@ -1709,6 -1691,14 +1691,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Calculando a anovación... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Calculando a anovación"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Feito"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Teño "
@@@ -2860,17 -2564,17 +2564,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Non é posíbel analizar o ficheiro de paquetes %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Non se puido analizar o ficheiro de publicación %s"

diff --cc po/he.po
index 8175d0ebbb49cad17b6643f984b6fb48fd7ea6f6,adc738becbe966e8580cc1fb50e29d6a1e00f010..b3ef8f8310d09b0bd5bc7442c840b01741296280
--- 1/po/he.po
--- 2/po/he.po
+++ b/po/he.po
@@@ -2259,12 -2259,12 +2259,7 @@@ msgstr "כשלון בפענוח %s
  
  #: apt-pkg/tagfile.cc:102
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr ""
--
--#: apt-pkg/tagfile.cc:189
--#, c-format
--msgid "Unable to parse package file %s (2)"
++msgid "Unable to parse package file %s (%d)"
  msgstr ""
  
  #: apt-pkg/sourcelist.cc:90

diff --cc po/hu.po
index c07c21c8408592cbaba65a0aac7f15d057ee598b,3b5865600b5f006995bbf39972150d671f0f2da7..e65d9789f8d15ff17faf7f188be096ac26fdc36d
--- 1/po/hu.po
--- 2/po/hu.po
+++ b/po/hu.po
@@@ -1048,25 -1049,24 +1049,24 @@@ msgstr "Belső hiba: Jó aláírás, d
  msgid "At least one invalid signature was encountered."
  msgstr "Legalább egy aláírás érvénytelen."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Nem indítható el a „apt-key” az aláírás ellenőrzéséhez (telepítve van a "
- "gnupg?)"
 -"Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)"
++"Nem indítható el a „apt-key” az aláírás ellenőrzéséhez (telepítve van a gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Ismeretlen gpgv futtatási hiba"
 +msgid "Unknown error executing apt-key"
 +msgstr "Ismeretlen apt-key futtatási hiba"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
  
@@@ -1717,6 -1698,14 +1698,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Frissítés kiszámítása... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Frissítés kiszámítása"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Kész"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Találat "
@@@ -2862,17 -2566,17 +2566,12 @@@ msgstr "A külső solver megfelelő hib
  msgid "Execute external solver"
  msgstr "Külső solver végrehajtása"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "A(z) %s Release fájl nem dolgozható fel"

diff --cc po/it.po
index 3a8c2140349a41b2891a14ee353e0ee0d8c53184,b382fd2af032d5137b99d190d6227e2c3cc561a8..6a096bf62f92a94328b2bb6a7d2a794860d00aa0
--- 1/po/it.po
--- 2/po/it.po
+++ b/po/it.po
@@@ -1091,10 -1092,10 +1092,10 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "È stata trovata almeno una firma non valida."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
 -"Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è "
 +"Impossibile eseguire \"apt-key\" per verificare la firma (forse gnupg non è "
  "installato)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -1107,11 -1108,11 +1108,11 @@@ msgstr "
  "Il file con la firma in chiaro non è valido, ottenuto \"%s\" (la rete "
  "richiede autenticazione?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Errore sconosciuto durante l'esecuzione di apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Le seguenti firme non erano valide:\n"
  
@@@ -1775,6 -1757,14 +1757,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr "Ricerca sul testo"
  
 -msgid "Calculating upgrade... "
 -msgstr "Calcolo dell'aggiornamento... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Calcolo dell'aggiornamento"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Eseguito"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Trovato "
@@@ -2937,17 -2645,17 +2645,12 @@@ msgstr "Il solver esterno è terminato 
  msgid "Execute external solver"
  msgstr "Esecuzione solver esterno"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Impossibile analizzare il file di pacchetto %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Impossibile analizzare il file di pacchetto %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Impossibile analizzare il file di pacchetto %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Impossibile analizzare il file di pacchetto %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Impossibile analizzare il file Release %s"

diff --cc po/ja.po
index 774d842af21360d4afa81ec5236905e93ae479a1,9da59c1cf20b1a7633152f7e4a5c26bf47dfb18a..10263ade79bbc7de3d560bcef7e1f5df1f7edbf5
--- 1/po/ja.po
--- 2/po/ja.po
+++ b/po/ja.po
@@@ -1082,14 -1083,14 +1083,14 @@@ msgstr "å\86\85é\83¨ã\82¨ã\83©ã\83¼: æ­£ã\81\97ã\81\84ç½²å\90
  msgid "At least one invalid signature was encountered."
  msgstr "少なくとも 1 つの不正な署名が発見されました。"
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "署名を検証するための 'apt-key' の実行ができませんでした (gnupg はインストール"
- "されていますか?)"
 -"署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ"
++"署名を検証するための 'apt-key' の実行ができませんでした (gnupg はインストールされ"
+ "ていますか?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
@@@ -1098,11 -1099,11 +1099,11 @@@ msgstr "
  "クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク"
  "が必要?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "gpgv の実行中に未知のエラーが発生"
 +msgid "Unknown error executing apt-key"
 +msgstr "apt-key の実行中に未知のエラーが発生"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "以下の署名が無効です:\n"
  
@@@ -1753,6 -1735,14 +1735,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr "全文検索"
  
 -msgid "Calculating upgrade... "
 -msgstr "アップグレードパッケージを検出しています ... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "アップグレードパッケージを検出しています"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "完了"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "ヒット "
@@@ -2898,17 -2608,17 +2608,12 @@@ msgstr "å¤\96é\83¨ã\82½ã\83«ã\83\90ã\81\8cé\81©å\88\87ã\81ªã\82¨ã
  msgid "Execute external solver"
  msgstr "外部ソルバを実行"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "パッケージファイル %s を解釈することができません (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "パッケージファイル %s を解釈することができません (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "パッケージファイル %s を解釈することができません (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "パッケージファイル %s を解釈することができません (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Release ファイル %s を解釈することができません"

diff --cc po/km.po
index 12cd1690b9503458782c209a5fa4f66950570162,d57d7def996f77f9ca0b3f5b46810634261036bf..e8ac36e7b8a6b6321345f0a7cfb9b21d8ece8b46
--- 1/po/km.po
--- 2/po/km.po
+++ b/po/km.po
@@@ -1002,24 -1003,24 +1003,24 @@@ msgstr "á\9e\80á\9f\86á\9e á\9e»á\9e\9fâ\80\8bá\9e\81á\9e¶á\9e\84á\9e\80á
  msgid "At least one invalid signature was encountered."
  msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
  #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr "មិន​អាច​ប្រតិបត្តិ 'apt-key' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gnupg ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
++msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gnupg ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
  
@@@ -1655,6 -1637,14 +1637,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "ធ្វើរួច​"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "វាយ​"
@@@ -2779,17 -2487,17 +2487,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
--
- #: apt-pkg/tagfile.cc:269
 -#: apt-pkg/tagfile.cc:237
--#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
++msgid "Unable to parse package file %s (%d)"
++msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (%d) បានឡើយ"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"

diff --cc po/ko.po
index b234a46c734e533b0818cb97d80527063239d372,3d7c36109abf3a36550b50ea10568eb990a620d6..4c00e7627f87da1e0fd619093c45321a64df5dcd
--- 1/po/ko.po
--- 2/po/ko.po
+++ b/po/ko.po
@@@ -1009,25 -1010,24 +1010,24 @@@ msgstr "내부 오류: 서명은 올바
  msgid "At least one invalid signature was encountered."
  msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "서명을 확인하는 'apt-key' 프로그램을 실행할 수 없습니다. (gnupg를 설치했습니"
- "까?)"
 -"서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)"
++"서명을 확인하는 'apt-key' 프로그램을 실행할 수 없습니다. (gnupg를 설치했습니까?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
 +msgid "Unknown error executing apt-key"
 +msgstr "apt-key 실행 도중 알 수 없는 오류 발생"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "다음 서명이 올바르지 않습니다:\n"
  
@@@ -1669,6 -1650,14 +1650,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "업그레이드를 계산하는 중입니다... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "업그레이드를 계산하는 중입니다"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "완료"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "기존 "
@@@ -2800,17 -2505,17 +2505,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"

diff --cc po/ku.po
index 11e68f30167a99454a17e5997a28876cd73248b4,4dbe31fbb779227f1f2304b8ab73190880774cd5..bc4e14204814ef97d6f163a3141e9b3ad55cbe18
--- 1/po/ku.po
--- 2/po/ku.po
+++ b/po/ku.po
@@@ -921,8 -922,8 +922,8 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -933,11 -934,11 +934,11 @@@ msgid "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Di xebitandina gpgv de çewtiya nenas"
 +msgid "Unknown error executing apt-key"
 +msgstr "Di xebitandina apt-key de çewtiya nenas"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "Ev pakêtên NÛ dê werine sazkirin:"
@@@ -1561,6 -1543,14 +1543,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Bilindkirin tê hesibandin..."
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Bilindkirin tê hesibandin"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Temam"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr ""
@@@ -2605,17 -2376,17 +2376,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, fuzzy, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Pakêt nehate dîtin %s"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, fuzzy, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Pakêt nehate dîtin %s"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, fuzzy, c-format
--msgid "Unable to parse package file %s (2)"
++msgid "Unable to parse package file %s (%d)"
  msgstr "Pakêt nehate dîtin %s"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Pakêt nehate dîtin %s"

diff --cc po/lt.po
index b910a16b82dd4d4930f3e5d09ff9eb8a971d39c5,42959db622b026de39408b5be5cf6a8ef4d4def4..821c28db7a06571bab9897a80d31382140cafba7
--- 1/po/lt.po
--- 2/po/lt.po
+++ b/po/lt.po
@@@ -926,8 -927,8 +927,8 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -938,11 -939,11 +939,11 @@@ msgid "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Nežinoma klaida kviečiant gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Nežinoma klaida kviečiant apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Šie parašai buvo nevalidūs:\n"
  
@@@ -1580,6 -1562,14 +1562,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Skaičiuojami atnaujinimai... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Skaičiuojami atnaujinimai"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Įvykdyta"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Imamas "
@@@ -2707,17 -2407,17 +2407,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr ""
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr ""
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
++msgid "Unable to parse package file %s (%d)"
  msgstr ""
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Nepavyko atverti DB failo %s: %s"

diff --cc po/mr.po
index 98de1af6f1eedc0636fbd95bf47603032c1a5fca,ffc91baf67fb7909b28124b1cde834c5763a1ec4..afc83c869026a4fbe5fea0728f06b317fb52acc2
--- 1/po/mr.po
--- 2/po/mr.po
+++ b/po/mr.po
@@@ -999,26 -1000,25 +1000,25 @@@ msgstr "अंतर्गत त्र
  msgid "At least one invalid signature was encountered."
  msgstr "किमान एक अवैध सही सापडली."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
  #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "सहीची खात्री करण्यासाठी 'apt-key' कार्यान्वित करू शकत नाही (gnupg संस्थापित केले आहे "
- "का?)"
 -"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
++"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gnupg संस्थापित केले आहे का?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
 +msgid "Unknown error executing apt-key"
 +msgstr "apt-key कार्यान्वित होत असताना अपरिचित त्रुटी"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "खालील सह्या अवैध आहेत:\n"
  
@@@ -1660,6 -1641,14 +1641,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "पुढिल आवृत्तीची गणती करीत आहे"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "झाले"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "दाबा"
@@@ -2793,17 -2499,17 +2499,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
--
- #: apt-pkg/tagfile.cc:269
 -#: apt-pkg/tagfile.cc:237
--#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
++msgid "Unable to parse package file %s (%d)"
++msgstr "%s पॅकेज फाईल पार्स करण्यात असमर्थ (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"

diff --cc po/nb.po
index de39803201427dc4771c6d2bc8d8b323e2c8334f,d096e9a69df2a4c9d6048452b6bb1d6dd8bee8c7..088f17fa8bb54a0c7edef8239403e59b6a379922
--- 1/po/nb.po
--- 2/po/nb.po
+++ b/po/nb.po
@@@ -1015,25 -1016,24 +1016,24 @@@ msgstr "Intern feil: God signatur, men 
  msgid "At least one invalid signature was encountered."
  msgstr "Minst en ugyldig signatur ble funnet."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Klarte ikke kjøre «apt-key» for å verifisere signaturen (er gnupg "
- "installert?)"
 -"Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)"
++"Klarte ikke kjøre «apt-key» for å verifisere signaturen (er gnupg installert?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Ukjent feil ved kjøring av gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Ukjent feil ved kjøring av apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "De følgende signaturene var ugyldige:\n"
  
@@@ -1687,6 -1668,14 +1668,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Beregner oppgradering... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Beregner oppgradering"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Utført"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Funnet "
@@@ -2823,17 -2528,17 +2528,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "Klarer ikke å fortolke pakkefila %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Klarer ikke å fortolke pakkefila %s (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "Klarer ikke å fortolke pakkefila %s (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Klarer ikke å fortolke Release-fila %s"

diff --cc po/ne.po
index e21c70f4da802211074c2a29206e4490331e0664,6743a9bdb8c52df2b7b7ff8400416d7314126271..09b9858f7e14f6caaa312366717012aa730f3f88
--- 1/po/ne.po
--- 2/po/ne.po
+++ b/po/ne.po
@@@ -1000,23 -1001,24 +1001,24 @@@ msgstr "आन्तरिक त्र
  msgid "At least one invalid signature was encountered."
  msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
+ #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr "हस्ताक्षर रूजू गर्न 'apt-key' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
++msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
 +msgid "Unknown error executing apt-key"
 +msgstr "apt-key कार्यन्वयन गर्दा अज्ञात त्रुटि"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
  
@@@ -1654,6 -1637,14 +1637,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "स्तर वृद्धि गणना गरिदैछ..."
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "स्तर वृद्धि गणना गरिदैछ"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "काम भयो"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "हान्नुहोस्"
@@@ -2780,17 -2490,17 +2490,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"

diff --cc po/nl.po
index 8660e5d4a18f683aae89ea6a77dde1125979ceaa,74e839b78b3708556012d42037d94f733babd30b..eaae16e517e3e638a3474fbf9c9f719e89cfadd6
--- 1/po/nl.po
--- 2/po/nl.po
+++ b/po/nl.po
@@@ -1030,10 -1094,10 +1094,10 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Er is tenminste één ongeldige ondertekening gevonden."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
 -"Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv "
 +"Kon 'apt-key' niet uitvoeren om ondertekening te verifiëren (is gnupg "
  "geïnstalleerd?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -1043,12 -1107,14 +1107,14 @@@ msgid "
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
+ "Bestand met niet-versleutelde ondertekening is ongeldig; kreeg '%s' (vereist "
+ "het netwerk authenticatie?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Onbekende fout bij het uitvoeren van gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Onbekende fout bij het uitvoeren van apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "De volgende ondertekeningen waren ongeldig:\n"
  
@@@ -1708,7 -1759,15 +1759,15 @@@ msgstr "Uw bestand '%s' is gewijzigd. V
  
  #: apt-private/private-search.cc:69
  msgid "Full Text Search"
- msgstr ""
+ msgstr "Volledige tekst doorzoeken"
+ 
+ #: apt-private/private-upgrade.cc:25
 -msgid "Calculating upgrade... "
 -msgstr "Opwaardering wordt doorgerekend... "
++msgid "Calculating upgrade"
++msgstr "Opwaardering wordt doorgerekend"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Klaar"
  
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
@@@ -2851,35 -2633,35 +2633,30 @@@ msgstr "Kan problemen niet verhelpen, 
  
  #: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
  msgid "Send scenario to solver"
- msgstr ""
+ msgstr "Scenario naar de oplosser sturen"
  
- #: apt-pkg/edsp.cc:237
+ #: apt-pkg/edsp.cc:241
  msgid "Send request to solver"
- msgstr ""
+ msgstr "Verzoek naar de oplosser sturen"
  
- #: apt-pkg/edsp.cc:316
+ #: apt-pkg/edsp.cc:320
  msgid "Prepare for receiving solution"
- msgstr ""
+ msgstr "Instellen op het ontvangen van een oplossing"
  
- #: apt-pkg/edsp.cc:323
+ #: apt-pkg/edsp.cc:327
  msgid "External solver failed without a proper error message"
- msgstr ""
+ msgstr "Externe oplosser faalde zonder passende foutmelding"
  
- #: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
+ #: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
  msgid "Execute external solver"
- msgstr ""
+ msgstr "Externe oplosser uitvoeren"
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Kon pakketbestand %s niet ontleden (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "Kon pakketbestand %s niet ontleden (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Kon pakketbestand %s niet ontleden (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "Kon pakketbestand %s niet ontleden (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Kon Release-bestand %s niet ontleden"

diff --cc po/nn.po
index 7d6972d5d2a990b6363d227fc09b9f48d47be7ec,070feb567b891629ead7001dd52ab72185fd14eb..dcb3d55d656e02e0a07a1f2b4f4010c4aaec6165
--- 1/po/nn.po
--- 2/po/nn.po
+++ b/po/nn.po
@@@ -1010,8 -1011,8 +1011,8 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -1022,11 -1023,11 +1023,11 @@@ msgid "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 +msgid "Unknown error executing apt-key"
  msgstr ""
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
@@@ -1671,6 -1653,14 +1653,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Reknar ut oppgradering ... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Reknar ut oppgradering"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Ferdig"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Treff "
@@@ -2798,17 -2510,17 +2510,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Klarte ikkje tolka pakkefila %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Klarte ikkje tolka pakkefila %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Klarte ikkje tolka pakkefila %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Klarte ikkje tolka pakkefila %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Klarte ikkje tolka pakkefila %s (1)"

diff --cc po/pl.po
index 2a014c89d3f5325f3f345332e9ca9e89583aa1da,32173ad87ec23529cd87e5640da50feff2b042ce..f1df0ee4a98366838018450cdd0cbbc8c504ff94
--- 1/po/pl.po
--- 2/po/pl.po
+++ b/po/pl.po
@@@ -1058,10 -1059,10 +1059,10 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
 -"Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest "
 +"Nie udało się uruchomić apt-key by zweryfikować podpis (czy gnupg jest "
  "zainstalowane?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@@ -1072,11 -1073,11 +1073,11 @@@ msgid "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Nieznany błąd podczas uruchamiania gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Nieznany błąd podczas uruchamiania apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Następujące podpisy były błędne:\n"
  
@@@ -1751,6 -1733,14 +1733,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Obliczanie aktualizacji..."
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Obliczanie aktualizacji"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Gotowe"
+ 
  # Ujednolicono z aptitude
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
@@@ -2900,17 -2606,17 +2606,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Nie udało się zanalizować pliku pakietu %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Nie udało się przeanalizować pliku Release %s"

diff --cc po/pt.po
index 6219d8cd8d0e6e367675aa4dba660d10fdc35878,8e21e97ef5ccfef375c237c416af3588a2a71f26..e35b146e923f56d055dbbd556d14d58ee92974fc
--- 1/po/pt.po
--- 2/po/pt.po
+++ b/po/pt.po
@@@ -1048,25 -1049,25 +1049,25 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Pelo menos uma assinatura inválida foi encontrada."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Não foi possível executar 'apt-key' para verificar a assinatura  (o gnupg "
- "está instalado?)"
 -"Não foi possível executar 'gpgv' para verificar a assinatura  (o gpgv está "
++"Não foi possível executar 'apt-key' para verificar a assinatura  (o gnupg está "
+ "instalado?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Erro desconhecido ao executar gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Erro desconhecido ao executar apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "As seguintes assinaturas eram inválidas:\n"
  
@@@ -1721,6 -1703,14 +1703,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "A calcular a actualização... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "A calcular a actualização"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Pronto"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Hit "
@@@ -2882,17 -2589,17 +2589,12 @@@ msgstr "O resolvedor externo falhou se
  msgid "Execute external solver"
  msgstr "Executar resolvedor externo"
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Não foi possível fazer parse ao ficheiro Release %s"

diff --cc po/pt_BR.po
index 4d637702b30974688928450e288c89b8d2ef8fe4,f50171edcbe9186e49fc9301de8c26177ffc8bd1..96bbf0a6528cb6d9b57a144af70600beb394179e
--- 1/po/pt_BR.po
--- 2/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -1020,25 -1021,26 +1021,26 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Ao menos uma assinatura inválida foi encontrada."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
+ #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Não foi possível executar 'apt-key' para verificar a assinatura (o gnupg "
- "está instalado?)"
 -"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
++"Não foi possível executar '%s' para verificar a assinatura (o gnupg está "
+ "instalado?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Erro desconhecido executando gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Erro desconhecido executando apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "As seguintes assinaturas eram inválidas:\n"
  
@@@ -1689,6 -1672,14 +1672,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Calculando atualização... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Calculando atualização"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Pronto"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Atingido "
@@@ -2839,17 -2544,17 +2544,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Impossível analisar arquivo de pacote %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Impossível analisar arquivo de pacote %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Impossível analisar arquivo de pacote %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Impossível analisar arquivo de pacote %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Impossível analisar arquivo de pacote %s (1)"

diff --cc po/ro.po
index b06fe9dfa0838a97fbdbe0de738ada621eac21ca,522ba61f352c39daa6ada4489580d738786140e0..eb66192ad9535cabb2497db4ac11b8d21b09b5a2
--- 1/po/ro.po
--- 2/po/ro.po
+++ b/po/ro.po
@@@ -1021,25 -1022,25 +1022,25 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
+ #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Nu s-a putut executa „apt-key” pentru verificarea semnăturii (gnupg este "
- "instalat?)"
 -"Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
++"Nu s-a putut executa „%s” pentru verificarea semnăturii (gnupg este instalat?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Eroare necunoscută în timp ce se execută gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Eroare necunoscută în timp ce se execută apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Următoarele semnături nu au fost valide:\n"
  
@@@ -1697,6 -1679,14 +1679,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Calculez înnoirea... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Calculez înnoirea"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Terminat"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Atins "
@@@ -2849,17 -2552,17 +2552,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
--
- #: apt-pkg/tagfile.cc:269
 -#: apt-pkg/tagfile.cc:237
--#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Nu s-a putut analiza fișierul pachet %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Nu s-a putut analiza fișierul pachet %s (1)"

diff --cc po/ru.po
index c00fc3bdb08a9c57f4fd1adc7a3349554ecb8296,38276c0c216ac71b4dd1f83c86d588868b8ea8b2..6381e783958627284cec8d046104bdfa58eaf865
--- 1/po/ru.po
--- 2/po/ru.po
+++ b/po/ru.po
@@@ -1057,24 -1058,23 +1058,23 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Найдена как минимум одна неправильная подпись."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr ""
- "Не удалось выполнить «apt-key» для проверки подписи (gnupg установлена?)"
++msgstr "Не удалось выполнить «apt-key» для проверки подписи (gnupg установлена?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Неизвестная ошибка при выполнении gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Неизвестная ошибка при выполнении apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Следующие подписи неверные:\n"
  
@@@ -1745,6 -1726,14 +1726,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Расчёт обновлений…"
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Расчёт обновлений"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Готово"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "В кэше "
@@@ -2897,17 -2598,17 +2598,12 @@@ msgstr "Ð\92неÑ\88ний Ñ\80еÑ\88аÑ\82елÑ
  msgid "Execute external solver"
  msgstr "Запустить внешний решатель"
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Невозможно разобрать содержимое пакета %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "Невозможно разобрать содержимое пакета %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Невозможно разобрать содержимое пакета %s (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "Невозможно разобрать содержимое пакета %s (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Невозможно разобрать содержимое файла Release (%s)"

diff --cc po/sk.po
index e99246bee2b35c945d9ddbb3a9571ef0cddb42cc,4c40d4f2d4ee789ba613c25f45aa55dab370f032..4dfeab746e37ad752b50aa6b5ce78d6e26d49d18
--- 1/po/sk.po
--- 2/po/sk.po
+++ b/po/sk.po
@@@ -1037,24 -1038,23 +1038,23 @@@ msgstr "Vnútorná chyba: Správna sign
  msgid "At least one invalid signature was encountered."
  msgstr "Bola zistená aspoň jedna nesprávna signatúra."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr ""
- "Nedá sa spustiť „apt-key“ kvôli overeniu podpisu (je nainštalované gnupg?)"
++msgstr "Nedá sa spustiť „apt-key“ kvôli overeniu podpisu (je nainštalované gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Neznáma chyba pri spustení gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Neznáma chyba pri spustení apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Nasledovné signatúry sú neplatné:\n"
  
@@@ -1719,6 -1700,14 +1700,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Prepočítava sa aktualizácia... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Prepočítava sa aktualizácia"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Hotovo"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Už existuje "
@@@ -2852,17 -2561,17 +2561,12 @@@ msgstr "Externý riešiteľ zlyhal bez 
  msgid "Execute external solver"
  msgstr "Spustiť externého riešiteľa"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Súbor %s sa nedá spracovať (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Súbor %s sa nedá spracovať (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Súbor %s sa nedá spracovať (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Súbor %s sa nedá spracovať (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Nedá spracovať súbor Release %s"

diff --cc po/sl.po
index 85e060046238736183218bd1d3a3da0cc11d7572,20d2db3175d0e2d13743be96694249dbf86d17d7..16a39656a23413ae8dcf713df3a080382d2d4f73
--- 1/po/sl.po
--- 2/po/sl.po
+++ b/po/sl.po
@@@ -1034,24 -1035,23 +1035,23 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Najden je bil vsaj en neveljaven podpis."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr ""
- "Ni mogoče izvesti 'apt-key' za preverjanje podpisa (je gnupg nameščen?)"
++msgstr "Ni mogoče izvesti 'apt-key' za preverjanje podpisa (je gnupg nameščen?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Neznana napaka med izvajanjem gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Neznana napaka med izvajanjem apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Naslednji podpisi so bili neveljavni:\n"
  
@@@ -1720,6 -1701,14 +1701,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Preračunavanje nadgradnje ... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Preračunavanje nadgradnje"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Opravljeno"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Zadetek "
@@@ -2858,17 -2565,17 +2565,12 @@@ msgstr "Zunanji reševalnik je spodlete
  msgid "Execute external solver"
  msgstr "Izvedi zunanji reševalnik"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Ni mogoče razčleniti datoteke paketa %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Ni mogoče razčleniti Release datoteke %s"

diff --cc po/sv.po
index e29e91a6e1ce98c641496d8785e77243c41d06ea,995de163000068f47a57eee0d523302cb1e6db9a..55afb20d8d022fae6081d26c98316decde85a609
--- 1/po/sv.po
--- 2/po/sv.po
+++ b/po/sv.po
@@@ -1023,25 -1024,24 +1024,24 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Minst en ogiltig signatur träffades på."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Kunde inte köra \"apt-key\" för att verifiera signatur (är gnupg "
- "installerad?)"
 -"Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)"
++"Kunde inte köra \"apt-key\" för att verifiera signatur (är gnupg installerad?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Okänt fel vid körning av gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Okänt fel vid körning av apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Följande signaturer är ogiltiga:\n"
  
@@@ -1699,6 -1680,14 +1680,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Beräknar uppgradering... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Beräknar uppgradering"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Färdig"
+ 
  # Måste vara tre bokstäver(?)
  # "Hit" = aktuell version är fortfarande giltig
  #: apt-private/acqprogress.cc:66
@@@ -2852,17 -2554,17 +2554,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Kunde inte tolka paketfilen %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Kunde inte tolka paketfilen %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Kunde inte tolka paketfilen %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Kunde inte tolka paketfilen %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Kunde inte tolka \"Release\"-filen %s"

diff --cc po/th.po
index df4c5b65c30ae077c58972029756a66fd77ae17b,c9577c01f077549bc552437b0718f05bbc1c4d26..1dee18de7d58253a959c3ae1106f766fd331ffd4
--- 1/po/th.po
--- 2/po/th.po
+++ b/po/th.po
@@@ -1050,12 -1051,12 +1051,12 @@@ msgstr "à¸\82à¹\89อà¸\9cิà¸\94à¸\9eลาà¸\94à
  msgid "At least one invalid signature was encountered."
  msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 +msgstr "ไม่สามารถเรียก 'apt-key' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gnupg ไว้หรือไม่?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
@@@ -1064,11 -1065,11 +1065,11 @@@ msgstr "
  "แฟ้มที่เซ็นกำกับครอบข้อความมีเนื้อหาไม่ถูกต้อง ได้รับผลลัพธ์ "
  "'%s' (เครือข่ายต้องยืนยันตัวบุคคลหรือไม่?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
  
@@@ -1698,6 -1681,14 +1681,14 @@@ msgstr "à¹\81à¸\9fà¹\89ม '%s' à¸\82อà¸\87à¸\84à
  msgid "Full Text Search"
  msgstr "ค้นทั่วทั้งเนื้อความ"
  
 -msgid "Calculating upgrade... "
 -msgstr "กำลังคำนวณการปรับรุ่น... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "กำลังคำนวณการปรับรุ่น"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "เสร็จแล้ว"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "เจอ "
@@@ -2815,17 -2530,17 +2530,12 @@@ msgstr "à¸\81ลà¹\84à¸\81à¸\81ารà¹\81à¸\81à¹\89à
  msgid "Execute external solver"
  msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "ไม่สามารถแจงแฟ้ม Release %s"

diff --cc po/tl.po
index ca1cc94b380b2f746af7925fa2d5ee0af733bd71,1060c582e4f8a7d9121f5e38e74713fc202985c4..2bf076a03d92f757a10747e1ef6dedbbc3d4b9b2
--- 1/po/tl.po
--- 2/po/tl.po
+++ b/po/tl.po
@@@ -1015,25 -1016,25 +1016,25 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
+ #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Hindi maitakbo ang 'apt-key' upang maberipika ang lagda (nakaluklok ba ang "
- "gnupg?)"
 -"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
++"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Hindi kilalang error sa pag-execute ng apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
  
@@@ -1680,6 -1662,14 +1662,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Sinusuri ang pag-upgrade... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Sinusuri ang pag-upgrade"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Tapos"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Tumama "
@@@ -2828,17 -2531,17 +2531,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Hindi ma-parse ang talaksang pakete %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, fuzzy, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Hindi ma-parse ang talaksang pakete %s (1)"

diff --cc po/tr.po
index fb50d6089d9ae6187267e8db0a213e67662423d7,47f8b914bbafaae62a146457e690552fb4427ff5..621d4610873cc5e1558ffb11a4cdf22ff0458e15
--- 1/po/tr.po
--- 2/po/tr.po
+++ b/po/tr.po
@@@ -1075,12 -1076,12 +1076,12 @@@ msgstr "İç hata: İmza iyi, ancak ana
  msgid "At least one invalid signature was encountered."
  msgstr "En az bir geçersiz imza ile karşılaşıldı."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "İmza doğrulama için 'gpgv' çalıştırılamadı (gpgv kurulu mu?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 +msgstr "İmza doğrulama için 'apt-key' çalıştırılamadı (gnupg kurulu mu?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
@@@ -1089,11 -1090,11 +1090,11 @@@ msgstr "
  "Temiz-imzalı dosya geçerli değil, '%s' hatası alındı (ağ kimlik doğrulama "
  "gerektiriyor mu?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "gpgv çalıştırılırken bilinmeyen hata"
 +msgid "Unknown error executing apt-key"
 +msgstr "apt-key çalıştırılırken bilinmeyen hata"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Aşağıdaki imzalar geçersiz:\n"
  
@@@ -1756,6 -1738,14 +1738,14 @@@ msgstr "'%s' dosyası değişti, lütfe
  msgid "Full Text Search"
  msgstr "Tam Metin Arama"
  
 -msgid "Calculating upgrade... "
 -msgstr "Yükseltme hesaplanıyor... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Yükseltme hesaplanıyor"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Bitti"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Bağlandı  "
@@@ -2900,17 -2605,17 +2605,12 @@@ msgstr "Harici çözücü düzgün bir 
  msgid "Execute external solver"
  msgstr "Harici çözücüyü çalıştır"
  
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "Paket dosyası %s ayrıştırılamadı (1)"
- 
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "Paket dosyası %s ayrıştırılamadı (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "Paket dosyası %s ayrıştırılamadı (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Paket dosyası %s ayrıştırılamadı (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "'Release' dosyası (%s) ayrıştırılamadı"

diff --cc po/uk.po
index 4c2b88120e8489f25ca1c0fc6a4fb8c177e5877a,493c9002ca6a902f72e07285f089bc7c40bd6f3c..92f07bb1502ad49ee180eb7166864d24be11256d
--- 1/po/uk.po
--- 2/po/uk.po
+++ b/po/uk.po
@@@ -1054,24 -1056,23 +1056,23 @@@ msgstr "
  msgid "At least one invalid signature was encountered."
  msgstr "Знайдено як мінімум один невірний підпис."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr ""
- "Неможливо виконати 'apt-key' для перевірки підпису (чи встановлено gnupg?)"
++msgstr "Неможливо виконати 'apt-key' для перевірки підпису (чи встановлено gnupg?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Невідома помилка виконання gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Невідома помилка виконання apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Наступні підписи були невірними:\n"
  
@@@ -1739,6 -1721,14 +1721,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "Обчислення оновлень... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Обчислення оновлень"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Виконано"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "В кеші "
@@@ -2897,17 -2598,17 +2598,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr "Виконати зовнішній розв'язувач"
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Неможливо проаналізувати файл пакунку %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "Неможливо проаналізувати файл пакунку %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Неможливо проаналізувати файл пакунку %s (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "Неможливо проаналізувати файл пакунку %s (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Неможливо проаналізувати 'Release' файл %s"

diff --cc po/vi.po
index 3280a74248f56e09d4a553cd1b5eed554f05546e,1c36fcef32c02ef9d718284d9229f67c08bc68b2..fb80076f9a81cb56ad93c5f38f9e862e69cb0a7b
--- 1/po/vi.po
--- 2/po/vi.po
+++ b/po/vi.po
@@@ -1090,14 -1091,13 +1091,13 @@@ msgstr "Lá»\97i ná»\99i bá»\99: Chữ ký Ä\91Ã
  msgid "At least one invalid signature was encountered."
  msgstr "Gặp ít nhất một chữ ký không hợp lệ."
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
  msgstr ""
- "Không thể thực hiện “apt-key” để thẩm tra chữ ký (gnupg đã được cài đặt "
- "chưa?)"
 -"Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)"
++"Không thể thực hiện “apt-key” để thẩm tra chữ ký (gnupg đã được cài đặt chưa?)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
@@@ -1106,11 -1106,11 +1106,11 @@@ msgstr "
  "Tập tin Clearsigned không hợp lệ, nhận được “%s” (mạng yêu cầu xác nhận phải "
  "không?)"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "Gặp lỗi không rõ khi thực hiện gpgv"
 +msgid "Unknown error executing apt-key"
 +msgstr "Gặp lỗi không rõ khi thực hiện apt-key"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "Những chữ ký theo đây không hợp lệ:\n"
  
@@@ -1755,6 -1736,14 +1736,14 @@@ msgstr "Tập tin “%s” của bạn 
  msgid "Full Text Search"
  msgstr "Tìm kiếm toàn văn"
  
 -msgid "Calculating upgrade... "
 -msgstr "Đang tính toán nâng cấp... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "Đang tính toán nâng cấp"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "Xong"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "Tìm thấy "
@@@ -2916,17 -2603,17 +2603,12 @@@ msgstr "Bộ phân giải bên ngoài g
  msgid "Execute external solver"
  msgstr "Thi hành bộ phân giải từ bên ngoài"
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "Không thể phân tích tập tin gói %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "Không thể phân tích tập tin gói %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "Không thể phân tích tập tin gói %s (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "Không thể phân tích tập tin gói %s (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"

diff --cc po/zh_CN.po
index db316aebe21756ba5b87f04eeaf1b990fbebaefb,5022016b2b21f79e654517f9e5175543de0f493f..661d8f92c7c46ebbec450c424b999715f98f606f
--- 1/po/zh_CN.po
--- 2/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -1004,23 -1055,23 +1055,23 @@@ msgstr "å\86\85é\83¨é\94\99误ï¼\9aç­¾å\90\8d正确æ\97 è
  msgid "At least one invalid signature was encountered."
  msgstr "至少发现一个无效的签名。"
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 +msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗？)"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
- msgstr ""
+ msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "运行 gpgv 时发生未知错误"
 +msgid "Unknown error executing apt-key"
 +msgstr "运行 apt-key 时发生未知错误"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "下列签名无效：\n"
  
@@@ -1647,7 -1676,15 +1676,15 @@@ msgstr "您的 %s 文件有过改动，
  
  #: apt-private/private-search.cc:69
  msgid "Full Text Search"
- msgstr ""
+ msgstr "全文搜索"
+ 
+ #: apt-private/private-upgrade.cc:25
 -msgid "Calculating upgrade... "
 -msgstr "正在对升级进行计算... "
++msgid "Calculating upgrade"
++msgstr "正在对升级进行计算"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "完成"
  
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
@@@ -2755,35 -2512,35 +2512,30 @@@ msgstr "
  
  #: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
  msgid "Send scenario to solver"
- msgstr ""
+ msgstr "向solver发送情景"
  
- #: apt-pkg/edsp.cc:237
+ #: apt-pkg/edsp.cc:241
  msgid "Send request to solver"
- msgstr ""
+ msgstr "向solver发送请求"
  
- #: apt-pkg/edsp.cc:316
+ #: apt-pkg/edsp.cc:320
  msgid "Prepare for receiving solution"
- msgstr ""
+ msgstr "准备接收解决方案"
  
- #: apt-pkg/edsp.cc:323
+ #: apt-pkg/edsp.cc:327
  msgid "External solver failed without a proper error message"
- msgstr ""
+ msgstr "外部solver出错，错误信息不恰当"
  
- #: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
+ #: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
  msgid "Execute external solver"
- msgstr ""
- 
- #: apt-pkg/tagfile.cc:169
- #, c-format
- msgid "Unable to parse package file %s (1)"
- msgstr "无法解析软件包文件 %s (1)"
+ msgstr "执行外部solver"
  
- #: apt-pkg/tagfile.cc:269
+ #: apt-pkg/tagfile.cc:140
  #, c-format
 -msgid "Unable to parse package file %s (1)"
 -msgstr "无法解析软件包文件 %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
--msgid "Unable to parse package file %s (2)"
--msgstr "无法解析软件包文件 %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "无法解析软件包文件 %s (%d)"
  
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "无法解析软件包仓库 Release 文件 %s"

diff --cc po/zh_TW.po
index a1ced2f71117c9b7ef7e018c552c8276fd32fe2a,b240111511540b6ca28672f400b0fa4c92884209..c9a134b625b6245c09752cdc396cf998602ee42d
--- 1/po/zh_TW.po
--- 2/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -996,23 -997,24 +997,24 @@@ msgstr "å\85§é\83¨é\8c¯èª¤ï¼\9aç°½ç« ç\84¡èª¤ï¼\8cä
  msgid "At least one invalid signature was encountered."
  msgstr "至少發現一個無效的簽章。"
  
- #: methods/gpgv.cc:185
+ #: methods/gpgv.cc:174
+ #, fuzzy
 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 -msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）"
 +msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
- msgstr "無法執行 'apt-key' 來驗證簽章（gnupg 是否安裝了？）"
++msgstr "無法執行 '%s' 來驗證簽章（gnupg 是否安裝了？）"
  
  #. TRANSLATORS: %s is a single techy word like 'NODATA'
- #: methods/gpgv.cc:191
+ #: methods/gpgv.cc:180
  #, c-format
  msgid ""
  "Clearsigned file isn't valid, got '%s' (does the network require "
  "authentication?)"
  msgstr ""
  
- #: methods/gpgv.cc:195
+ #: methods/gpgv.cc:184
 -msgid "Unknown error executing gpgv"
 -msgstr "在執行 gpgv 時發生未知的錯誤"
 +msgid "Unknown error executing apt-key"
 +msgstr "在執行 apt-key 時發生未知的錯誤"
  
- #: methods/gpgv.cc:228 methods/gpgv.cc:235
+ #: methods/gpgv.cc:217 methods/gpgv.cc:224
  msgid "The following signatures were invalid:\n"
  msgstr "以下簽名無效：\n"
  
@@@ -1648,6 -1631,14 +1631,14 @@@ msgstr "
  msgid "Full Text Search"
  msgstr ""
  
 -msgid "Calculating upgrade... "
 -msgstr "籌備升級中... "
+ #: apt-private/private-upgrade.cc:25
++msgid "Calculating upgrade"
++msgstr "籌備升級中"
+ 
+ #: apt-private/private-upgrade.cc:28
+ msgid "Done"
+ msgstr "完成"
+ 
  #: apt-private/acqprogress.cc:66
  msgid "Hit "
  msgstr "已有 "
@@@ -2761,17 -2475,17 +2475,12 @@@ msgstr "
  msgid "Execute external solver"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:169
+ #: apt-pkg/tagfile.cc:140
  #, c-format
--msgid "Unable to parse package file %s (1)"
--msgstr "無法辨識套件檔 %s (1)"
 -
 -#: apt-pkg/tagfile.cc:237
 -#, c-format
 -msgid "Unable to parse package file %s (2)"
 -msgstr "無法辨識套件檔 %s (2)"
++msgid "Unable to parse package file %s (%d)"
++msgstr "無法辨識套件檔 %s (%d)"
  
- #: apt-pkg/tagfile.cc:269
- #, c-format
- msgid "Unable to parse package file %s (2)"
- msgstr "無法辨識套件檔 %s (2)"
- 
- #: apt-pkg/indexrecords.cc:83
+ #: apt-pkg/indexrecords.cc:78
  #, c-format
  msgid "Unable to parse Release file %s"
  msgstr "無法辨別 Release 檔 %s"

diff --cc test/integration/framework
index 2c794d1f37877bc8e1cf8e27d3a3415ddb429a1f,70ad381e980814efb3476106ef2cc21b8ce1f1d0..5f13df1c056334abed41b26e8be97cb4b64ef06d
--- 1/test/integration/framework
--- 2/test/integration/framework
+++ b/test/integration/framework
@@@ -231,41 -219,17 +231,40 @@@ setupenvironment() 
                cp "${TESTDIRECTORY}/${SOURCESSFILE}" aptarchive/Sources
        fi
        cp $(find $TESTDIRECTORY -name '*.pub' -o -name '*.sec') keys/
 +      chmod 644 $(find keys -name '*.pub' -o -name '*.sec')
        ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
 +
        echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
        echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
 -      echo "Debug::NoLocking \"true\";" >> aptconfig.conf
        echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
        echo "Dir::Bin::Methods \"${METHODSDIR}\";" >> aptconfig.conf
 -      echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
 -      echo "DPKG::options:: \"dpkg\";" >> aptconfig.conf
 -      echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
 -      echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
 -      echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
 +      # store apt-key were we can access it, even if we run it as a different user
 +      # destroys coverage reporting though, so just do it for root for now
 +      if [ "$(id -u)" = '0' ]; then
 +              cp "${BUILDDIRECTORY}/apt-key" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/"
 +              chmod o+rx "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key"
 +              echo "Dir::Bin::apt-key \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key\";" >> aptconfig.conf
 +      else
 +              echo "Dir::Bin::apt-key \"${BUILDDIRECTORY}/apt-key\";" >> aptconfig.conf
 +      fi
 +
-       cat > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF
++      cat << EOF > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
 +#!/bin/sh
 +set -e
 +if [ -r "${TMPWORKINGDIRECTORY}/noopchroot.so" ]; then
 +      if [ -n "\$LD_PRELOAD" ]; then
 +              export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so \${LD_PRELOAD}"
 +      else
 +              export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so"
 +      fi
 +fi
 +exec fakeroot dpkg --root="${TMPWORKINGDIRECTORY}/rootdir" \\
 +      --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log \\
 +      --force-not-root --force-bad-path "\$@"
 +EOF
-       cat "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
 +      chmod +x "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
 +      echo "Dir::Bin::dpkg \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg\";" > rootdir/etc/apt/apt.conf.d/99dpkg
 +
        if ! command dpkg --assert-multi-arch >/dev/null 2>&1; then
                echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
        fi
@@@ -827,10 -780,10 +826,10 @@@ buildaptarchivefromincoming() 
        [ -e ftparchive.conf ] || createaptftparchiveconfig
        [ -e dists ] || buildaptftparchivedirectorystructure
        msgninfo "\tGenerate Packages, Sources and Contents files… "
-       aptftparchive -qq generate ftparchive.conf
+       testsuccess aptftparchive generate ftparchive.conf
        cd - > /dev/null
        msgdone "info"
 -      generatereleasefiles
 +      generatereleasefiles "$@"
  }
  
  buildaptarchivefromfiles() {

diff --cc test/integration/test-allow-scores-for-all-dependency-types
index d1bcf1130d67ec7a6baef3d618ccc5726f8f48cd,d60cb8dafbba71bbc68636d5329d0cb8218bc84e..e1d805ce91dbab8d2183790b9786a0973b0f678a
--- 1/test/integration/test-allow-scores-for-all-dependency-types
--- 2/test/integration/test-allow-scores-for-all-dependency-types
+++ b/test/integration/test-allow-scores-for-all-dependency-types
@@@ -148,3 -147,26 +153,27 @@@ Inst foo [1] (2 versioned [amd64]
  Inst baz (2 versioned [amd64])
  Conf foo (2 versioned [amd64])
  Conf baz (2 versioned [amd64])' aptget install baz -st versioned
+ 
+ # recreating the exact situation is hard, so we pull tricks to get the score
+ cp -f rootdir/var/lib/dpkg/status-backup rootdir/var/lib/dpkg/status
+ insertinstalledpackage 'gdm3' 'amd64' '1' 'Depends: libaudit0, libaudit0'
+ insertinstalledpackage 'login' 'amd64' '1' 'Essential: yes'
+ insertinstalledpackage 'libaudit0' 'amd64' '1'
+ testequal 'Reading package lists...
+ Building dependency tree...
++Calculating upgrade...
+ The following packages will be REMOVED:
+   gdm3 libaudit0
+ The following NEW packages will be installed:
+   libaudit-common libaudit1
+ The following packages will be upgraded:
+   login
+ 1 upgraded, 2 newly installed, 2 to remove and 0 not upgraded.
+ Remv gdm3 [1]
+ Remv libaudit0 [1]
+ Inst libaudit-common (2 jessie [amd64])
+ Conf libaudit-common (2 jessie [amd64])
+ Inst libaudit1 (2 jessie [amd64])
+ Conf libaudit1 (2 jessie [amd64])
+ Inst login [1] (2 jessie [amd64])
+ Conf login (2 jessie [amd64])' aptget dist-upgrade -st jessie

diff --cc test/integration/test-apt-download-progress
index 0000000000000000000000000000000000000000,0a9020bece02556d8f32f66ae1e733353f124d3f..b2c9effe6832e88f5d292ceaa69ec6f0cb76673d
mode 000000,100755..100755
--- /dev/null
--- 2/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@@ -1,0 -1,43 +1,40 @@@
 -    if ! egrep -q "dlstatus:1:[0-9]{1,2}\.(.*):Retrieving file 1 of 1" "$T"; then
+ #!/bin/sh
+ #
+ # ensure downloading sends progress as a regression test for commit 9127d7ae
+ #
+ set -e
+ 
+ TESTDIR=$(readlink -f $(dirname $0))
+ . $TESTDIR/framework
+ 
+ setupenvironment
+ changetohttpswebserver
+ 
+ assertprogress() {
+     T="$1"
+     testsuccess grep "dlstatus:1:0:Retrieving file 1 of 1" "$T"
 -    #cat $T
++    if ! egrep -q "dlstatus:1:[1-9][0-9](\..*)?:Retrieving file 1 of 1" "$T"; then
+         cat "$T"
+         msgfail "Failed to detect download progress"
+     fi
+     testsuccess grep "dlstatus:1:100:Retrieving file 1 of 1" "$T"
 -printf '\n'
+ }
+ 
+ # we need to ensure the file is reasonable big so that apt has a chance to
+ # actually report progress - but not too big to ensure its not delaying the
+ # test too much
+ TESTFILE=testfile.big
+ testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1 
+ 
+ msgtest 'download progress works via' 'http'
 -testsuccess apthelper download-file "http://localhost:8080/$TESTFILE" http-$TESTFILE -o APT::Status-Fd=3 -o Acquire::http::Dl-Limit=800
+ exec 3> apt-progress.log
 -printf '\n'
++testsuccess --nomsg apthelper download-file "http://localhost:8080/$TESTFILE" http-$TESTFILE -o APT::Status-Fd=3 -o Acquire::http::Dl-Limit=800
+ assertprogress apt-progress.log
+ 
+ msgtest 'download progress works via' 'https'
 -testsuccess apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE -o APT::Status-Fd=3 -o Acquire::https::Dl-Limit=800
+ exec 3> apt-progress.log
++testsuccess --nomsg apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE -o APT::Status-Fd=3 -o Acquire::https::Dl-Limit=800
+ assertprogress apt-progress.log
+ 
+ # cleanup
+ rm -f apt-progress*.log

diff --cc test/integration/test-apt-ftparchive-src-cachedb
index 6e857c0cb8b591a32f4bf7eacb87c9163bebbd62,0ac4d558f364e82e86fece37aab81a0a42fba4ea..28321e3c57095dd8fd25abf0588ac1d829b9f5ed
--- 1/test/integration/test-apt-ftparchive-src-cachedb
--- 2/test/integration/test-apt-ftparchive-src-cachedb
+++ b/test/integration/test-apt-ftparchive-src-cachedb
@@@ -180,15 -180,10 +180,11 @@@ testequal 
  E: Could not find a Source entry in the DSC 'aptarchive/pool/invalid/invalid_1.0.dsc'" aptftparchive sources aptarchive/pool/invalid
  rm -f aptarchive/pool/invalid/invalid_1.0.dsc
  
- dd if=/dev/zero of="aptarchive/pool/invalid/toobig_1.0.dsc" bs=1k count=129 2>/dev/null
- testequal "
- E: DSC file 'aptarchive/pool/invalid/toobig_1.0.dsc' is too large!" aptftparchive sources aptarchive/pool/invalid
- 
  # ensure clean works
  rm -f aptarchive/pool/main/*
 -aptftparchive clean apt-ftparchive.conf -o Debug::APT::FTPArchive::Clean=1 > clean-out.txt 2>&1 
 -testequal "0  Number of unique keys in the tree" grep unique clean-out.txt
 -testequal "sources-main.db" grep sources-main.db clean-out.txt
 -
 -
 +testsuccess aptftparchive clean apt-ftparchive.conf -q=0 -o Debug::APT::FTPArchive::Clean=1
 +cp rootdir/tmp/testsuccess.output clean-out.txt
 +testsuccess grep unique clean-out.txt
 +testfileequal 'rootdir/tmp/testsuccess.output' "0     Number of unique keys in the tree"
 +testsuccess grep sources-main.db clean-out.txt
 +testfileequal 'rootdir/tmp/testsuccess.output' "sources-main.db"

diff --cc test/integration/test-apt-get-install-deb
index 700009da524556ca6915aed031b27eab98699582,0000000000000000000000000000000000000000..f2e5229cd7a974146867e0b2a62c883bbdc6dba0
mode 100755,000000..100755
--- 1/test/integration/test-apt-get-install-deb
--- /dev/null
+++ b/test/integration/test-apt-get-install-deb
@@@ -1,30 -1,0 +1,27 @@@
- testequal 'E: Sub-process Popen returned an error code (100)
- E: Encountered a section with no Package: header
 +#!/bin/sh
 +set -e
 +
 +TESTDIR=$(readlink -f $(dirname $0))
 +. $TESTDIR/framework
 +
 +setupenvironment
 +configarchitecture "i386"
 +
 +# regression test for #754904
 +testequal 'E: Unable to locate package /dev/null' aptget install -qq /dev/null
 +
 +# and ensure we fail for invalid debs
 +cat > foo.deb <<EOF
 +I'm not a deb, I'm a teapot.
 +EOF
- E: The package lists or status file could not be parsed or opened.' aptget install -qq ./foo.deb
++testfailure aptget install ./foo.deb
++testsuccess grep '^E: Sub-process Popen returned an error code' rootdir/tmp/testfailure.output
++testequal 'E: Encountered a section with no Package: header
 +E: Problem with MergeLister for ./foo.deb
- #
- #buildsimplenativepackage 'foo' 'all' '1.0' 
- #
- #testequal 'Selecting previously unselected package foo.
- #(Reading database ... 0 files and directories currently installed.)
- # Preparing to unpack .../incoming/foo_1.0_all.deb ...
- #Unpacking foo (1.0) ...
- #Setting up foo (1.0) ...' aptget install -qq ./incoming/foo_1.0_all.deb
++E: The package lists or status file could not be parsed or opened.' tail -n 3 rootdir/tmp/testfailure.output
 +
 +# fakeroot is currently not found, framwork needs updating
++buildsimplenativepackage 'foo' 'all' '1.0'
++testdpkgnotinstalled 'foo'
++testsuccess aptget install ./incoming/foo_1.0_all.deb
++testdpkginstalled 'foo'

diff --cc test/integration/test-apt-helper
Simple merge

diff --cc test/integration/test-kernel-helper-autoremove
index 22c36890be4fa61690abc2a6c9faf296482fe871,c51caa7581f345971281f3b01283aca1fcaeb739..1524ed4c7d51358078f6f5b08508957467ad2220
--- 1/test/integration/test-kernel-helper-autoremove
--- 2/test/integration/test-kernel-helper-autoremove
+++ b/test/integration/test-kernel-helper-autoremove
@@@ -26,13 -26,13 +26,6 @@@ insertinstalledpackage 'linux-headers-1
  
  testsuccess aptmark auto "$CURRENTKERNEL" 'linux-image-1.0.0-2-generic' 'linux-image-100.0.0-1-generic' 'linux-headers-1000000-1-generic'
  
--cat > ./fake-dpkg <<EOF
--#!/bin/sh
--exec $(aptconfig dump --no-empty --format='%v ' 'DPKG::options') "\$@"
--EOF
--chmod +x ./fake-dpkg
--echo 'Dir::Bin::dpkg "./fake-dpkg";' > rootdir/etc/apt/apt.conf.d/99fakedpkg
--
  # install fake-dpkg into it
  catfail() {
        echo >&2

diff --cc test/interactive-helper/aptwebserver.cc
index ca6f88c581f9032f73b457f7ca37510ce22f22dd,cd52da692a8339cffdbab68ff61b039ea72275a8..3403bbdd284f963f6d4e436bbd7304a2adb05d20
--- 1/test/interactive-helper/aptwebserver.cc
--- 2/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@@ -861,7 -792,7 +861,8 @@@ int main(int const argc, const char * a
  
     std::clog << "Serving ANY file on port: " << port << std::endl;
  
--   int const slaves = _config->FindB("aptwebserver::slaves", SOMAXCONN);
++   int const slaves = _config->FindI("aptwebserver::slaves", SOMAXCONN);
++   std::cerr << "SLAVES: " << slaves << std::endl;
     listen(sock, slaves);
     /*}}}*/