From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 19 Dec 2006 09:17:54 +0000 (+0100)
Subject: * merged with mainline
X-Git-Tag: 0.7.24ubuntu1~210
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b6f0036a8ed8fb5278d6fb9da601edc254eb03fe

* merged with mainline
---

b6f0036a8ed8fb5278d6fb9da601edc254eb03fe
diff --cc configure.in
index 08b3471a3,ad81a8228..9f3a4e246
--- a/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 ac91df8f9,06cede531..513d409e9
--- a/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