releasing version 0.8.3ubuntu7

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index ff9233ef263adb1af742121758f5e75814a70aa1..d3e45f76b9489c34176e6614df78e1cdd1555c22 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1192,9 +1192,13 @@ bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge,
         std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << " FU=" << FromUser << std::endl;
       return false;
    }
         std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << " FU=" << FromUser << std::endl;
       return false;
    }

+   // if the removal is not explictely requested by the user, protect
+   // explicit new-install package from accidental removal by the 
+   // problemresolver

    else if (FromUser == false && Pkg->CurrentVer == 0)
    {
       StateCache &P = PkgState[Pkg->ID];
    else if (FromUser == false && Pkg->CurrentVer == 0)
    {
       StateCache &P = PkgState[Pkg->ID];

+      // Status == 2 means this applies for new installs only

       if (P.InstallVer != 0 && P.Status == 2 && (P.Flags & Flag::Auto) != Flag::Auto)
       {
         if (DebugMarker == true)
       if (P.InstallVer != 0 && P.Status == 2 && (P.Flags & Flag::Auto) != Flag::Auto)
       {
         if (DebugMarker == true)

diff --git a/debian/changelog b/debian/changelog
index 8a1f0948129405342ebf14119a0ff46d40f04d3f..8b737cc5caee038a7bd0a2df323938a0f0acc243 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.3ubuntu7) UNRELEASED; urgency=low
+apt (0.8.3ubuntu7) maverick; urgency=low

 
   [ David Kalnischkies ]
   * apt-pkg/depcache.cc:
 
   [ David Kalnischkies ]
   * apt-pkg/depcache.cc:


@@ -7,7 +7,7 @@ apt (0.8.3ubuntu7) UNRELEASED; urgency=low
     Test case: debootstrap, install exim4, run "apt-get install postfix"
     This will result in exim4-heavy instead of postfix
 
     Test case: debootstrap, install exim4, run "apt-get install postfix"
     This will result in exim4-heavy instead of postfix
 

- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 04 Oct 2010 11:57:18 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Oct 2010 14:13:38 +0200

 
 apt (0.8.3ubuntu6) maverick; urgency=low
 
 
 apt (0.8.3ubuntu6) maverick; urgency=low