* merged with mainline

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 58498aa19560f6b5993191e17b0f362834cadf58..5e878ff650d85a9a12026fdd2463e4f6fbe5feb0 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -509,8 +509,10 @@ void pkgProblemResolver::MakeScores()
         Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority];
       
       /* This helps to fix oddball problems with conflicting packages
-         on the same level. We enhance the score of installed packages */
-      if (I->CurrentVer != 0)
+         on the same level. We enhance the score of installed packages 
+        if those are not obsolete
+      */
+      if (I->CurrentVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable())
         Score += 1;
    }
 

diff --git a/configure.in b/configure.in
index 08b3471a385f7c9f39da8d8b17931ac4ddd25605..9f3a4e2469236343ac2867ef501033cb2d33ad86 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu3")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu4")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index ac91df8f9bb412240eafac73d7c190b28caa0903..513d409e90c0904dc514df3f68f2b5fa1b1a48e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.6.46.4ubuntu4) feisty; urgency=low
+  
+  * apt-pkg/algorithms.cc:
+    - only increase the score of installed applications if they 
+      are not obsolete (lp: #63680)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
+
 apt (0.6.46.4ubuntu3) feisty; urgency=low
 
   * apt-pkg/algorithm.cc: