The modification to orderlist.cc is from a patch DonKult (David) gave me, The modific...

diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index ba43bc7572cde5057b70848b42032e2b1f8cdea1..6dd494027abc547375676731878abaffcc46ca24 100644 (file)
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -1073,6 +1073,12 @@ bool pkgOrderList::CheckDep(DepIterator D)
          just needs one */
       if (D.IsNegative() == false)
       {
          just needs one */
       if (D.IsNegative() == false)
       {

+        // ignore provides by older versions of this package
+        if (((D.Reverse() == false && Pkg == D.ParentPkg()) ||
+             (D.Reverse() == true && Pkg == D.TargetPkg())) &&
+            Cache[Pkg].InstallVer != *I)
+           continue;
+      

         /* Try to find something that does not have the after flag set
            if at all possible */
         if (IsFlag(Pkg,After) == true)
         /* Try to find something that does not have the after flag set
            if at all possible */
         if (IsFlag(Pkg,After) == true)

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index f49df8327fffd49901e14f6a9dd40b0d0d2bae5a..2219f876a857b78d7906c3d1874749335f8b4d18 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -575,6 +575,9 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 }
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
 {
 }
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
 {

+   if (Debug == true)
+      clog << "SmartUnPack " << Pkg.Name() << endl;
+

    // Check if it is already unpacked
    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
        Cache[Pkg].Keep() == true)
    // Check if it is already unpacked
    if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
        Cache[Pkg].Keep() == true)


@@ -674,6 +677,20 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
            }
         }
       }
            }
         }
       }

+      
+      // Check for breaks
+      if (End->Type == pkgCache::Dep::DpkgBreaks) {
+         SPtrArray<Version *> VList = End.AllTargets();
+        for (Version **I = VList; *I != 0; I++)
+        {
+           VerIterator Ver(Cache,*I);
+           PkgIterator Pkg = Ver.ParentPkg();
+           // Found a break, so unpack the package
+           if (List->IsNow(Pkg)) {
+             SmartUnPack(Pkg, false);
+           }
+        }
+      }

    }
 
    // Check for reverse conflicts.
    }
 
    // Check for reverse conflicts.