* apt-pkg/deb/deblistparser.cc:

  - only treat the native apt as essential by default

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 84e6c38c5440c90db4375da3e67ea740a7feb987..00e2bd900db73644c91ac76bcdc3612496ab9151 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -249,8 +249,14 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
       return false;
 
    if (strcmp(Pkg.Name(),"apt") == 0)
-      Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important;
-   
+   {
+      if ((essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()) ||
+         essential == "all")
+        Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important;
+      else
+        Pkg->Flags |= pkgCache::Flag::Important;
+   }
+
    if (ParseStatus(Pkg,Ver) == false)
       return false;
    return true;

diff --git a/debian/changelog b/debian/changelog
index 8eca51cc4d729a571efd7208d85453acddd21b1b..58da9d8de77081aedaad45d30374ca9807ab4906 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.9.1+nmu1) unstable; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/deb/deblistparser.cc:
+    - only treat the native apt as essential by default
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 18 Apr 2012 18:12:07 +0200
+
 apt (0.9.1) unstable; urgency=low
 
   [ David Kalnischkies ]