* merged fixes from the debian-sid bzr branch:

* Simplified Chinese (Aron Xu). Closes: #594458
* Bulgarian (Damyan Ivanov). Closes: #594627
* Portuguese (Miguel Figueiredo). Closes: #594668
* Korean (Changwoo Ryu). Closes: #594809
* Portuguese (Américo Monteiro)
* cmdline/apt-cache.cc:
  - remove useless GetInitialize method
* cmdline/apt-get.cc:
  - remove direct calls of ReadMainList and use the wrapper instead
    to protect us from useless re-reads and two-times notice display
  - remove death code by removing unused GetInitialize
* apt-pkg/depcache.cc:
  - now that apt-get purge works on 'rc' packages let the MarkDelete
    pass this purge forward to the non-pseudo package for pseudos
* apt-pkg/contrib/fileutl.cc:
  - apply SilentlyIgnore also on files without an extension
* apt-pkg/contrib/configuration.cc:
  - fix autoremove by using correct config-option name and
    don't make faulty assumptions in error handling (Closes: #594689)
* apt-pkg/versionmatch.cc:
  - let the pin origin actually work as advertised in the manpage
    which means "" are optional and pinning a local archive does
    work - even if it is a non-flat archive (Closes: #594435)

1 files changed, 1 insertions, 1 deletions

diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 45276dc95..08e683558 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -186,7 +186,7 @@ class pkgDepCache : protected pkgCache::Namespace
    class DefaultRootSetFunc : public InRootSetFunc, public Configuration::MatchAgainstConfig
    {
    public:
-     DefaultRootSetFunc() : Configuration::MatchAgainstConfig("APT::NeverRemove") {};
+     DefaultRootSetFunc() : Configuration::MatchAgainstConfig("APT::NeverAutoRemove") {};
      virtual ~DefaultRootSetFunc() {};
 
      bool InRootSet(const pkgCache::PkgIterator &pkg) { return pkg.end() == true && Match(pkg.Name()); };