diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-18 12:06:54 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-18 12:06:54 +0100 |
| commit | 3dc863efa5f825a16b46ccba0771e86895459c77 (patch) | |
| tree | 5b43451521c0bc67d5031efc886ba88e649e6c3d | |
| parent | 6a30946d00371ff1fb7f94791364706a4bac0ea2 (diff) | |
| parent | c9b320e8c7c37b47aac3c8af6be990c4cded04c9 (diff) | |
* merged from apt--auto-mark
| -rw-r--r-- | apt-pkg/depcache.cc | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 87443f9f3..81e1eeb33 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1324,6 +1324,11 @@ bool pkgDepCache::Sweep() { StateCache &state=PkgState[p->ID]; + // skip required packages + if (!p.CurrentVer().end() && + (p.CurrentVer()->Priority == pkgCache::State::Required)) + continue; + // if it is not marked and it is installed, it's garbage if(!state.Marked && (!p.CurrentVer().end() || state.Install())) { diff --git a/configure.in b/configure.in index 00f35f75d..08b3471a3 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.4ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index f39b0a073..ac91df8f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -apt (0.6.46.5) unstable; urgency=low +apt (0.6.46.4ubuntu3) feisty; urgency=low * apt-pkg/algorithm.cc: - use clog for all debugging + * apt-pkg/depcache.cc: + - never mark Required package for autoremoval (lp: #75882) - -- + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 11:56:05 +0100 apt (0.6.46.4ubuntu2) feisty; urgency=low |