summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-08-14 21:16:02 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-08-14 21:16:02 +0200
commit8eff320d8061aa7cad48c7eaf834f70e1d3e86b4 (patch)
tree1ff5957588c6c0eabdc3373d12fbd79aa829d4b4
parentca7013a815d076297b16f52798bbe4b2482e9b6f (diff)
* cmdline/apt-get.cc:
- fix the "fix-policy" code * debian/changelog: - new version
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--configure.in2
-rw-r--r--debian/changelog7
3 files changed, 9 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 96e974acb..4bd66383f 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -650,7 +650,7 @@ bool CacheFile::CheckDeps(bool AllowBroken)
// upgrade all policy-broken packages with ForceImportantDeps=True
for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++)
if ((*DCache)[I].NowPolicyBroken() == true)
- DCache->MarkInstall(I,true,0,true);
+ DCache->MarkInstall(I,true,0,false, true);
}
}
diff --git a/configure.in b/configure.in
index d9134f4b1..202a15dc0 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.45ubuntu3")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu4")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 8b8866e7e..0bb679c5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.6.45ubuntu4) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the new --fix-polciy code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200
+
apt (0.6.45ubuntu3) edgy; urgency=low
* ABI break