* merged with mainline

diff --cc apt-pkg/algorithms.cc
Simple merge

diff --cc configure.in
index 08b3471a385f7c9f39da8d8b17931ac4ddd25605,ad81a8228ee2d261e7d2ed9942bc387891d427b9..9f3a4e2469236343ac2867ef501033cb2d33ad86
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -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.3-0.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu4")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index ac91df8f9bb412240eafac73d7c190b28caa0903,06cede5313f7793702e86b9f2de7b9be5bdc11f7..513d409e90c0904dc514df3f68f2b5fa1b1a48e3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,12 @@@
 -apt (0.6.46.5) UNRELEASED; urgency=low
++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:
      - use clog for all debugging