diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-19 10:17:54 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-19 10:17:54 +0100 |
| commit | b6f0036a8ed8fb5278d6fb9da601edc254eb03fe (patch) | |
| tree | d86eb890f324e028537ecb100d58da427124a98c | |
| parent | 3dc863efa5f825a16b46ccba0771e86895459c77 (diff) | |
| parent | 4172c78468a04078c97146dbc2e2979e63906f5b (diff) | |
* merged with mainline
| -rw-r--r-- | apt-pkg/algorithms.cc | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
3 files changed, 13 insertions, 3 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 58498aa19..5e878ff65 100644 --- 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 08b3471a3..9f3a4e246 100644 --- 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 ac91df8f9..513d409e9 100644 --- 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: |