* cmdline/apt-get.cc:

  - fix the "fix-policy" code
* debian/changelog:
  - new version

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 96e974acb2736e1983bd7c7cb11784744cb92acc..4bd66383f6bc91c40790167bc92a24adb4ea9f4b 100644 (file)
--- 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) 
         // 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 d9134f4b1b1b9577885e544c95e041db74de8058..202a15dc0385d8e94e2042024973a8e73185faa5 100644 (file)
--- 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_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)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 8b8866e7ebb34b9bcc66f36f997d1cb41a43eba1..0bb679c5aa0da251f1fc29640a95da5912f20d3b 100644 (file)
--- 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
 apt (0.6.45ubuntu3) edgy; urgency=low
 
   * ABI break