From 07494f6580dd689c1d82d8dc2f7dbbcfedaf6e52 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@anarres>
Date: Fri, 8 Dec 2006 18:21:59 +0000
Subject: 0.6.46.3ubuntu2 change as uploaded: fix dist-upgrade

---
 apt-pkg/algorithms.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'apt-pkg/algorithms.cc')

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index f50c52a32..723c8ea3a 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -986,6 +986,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 		     }
 		     if (Debug)
 			clog << "  Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() <<endl;
+		     Cache.MarkKeep(I, false, false);
 		     continue;
 		  }
 
-- 
cgit v1.2.3


From 152ab79e05f077440d76c1c423b013eaeb3fe2ff Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 8 Jun 2007 23:04:36 +0200
Subject: * fix FTBFS with gcc 4.3, closes: #417090   (thanks to Martin
 Michlmayr for the patch)

---
 apt-pkg/algorithms.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/algorithms.cc')

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 5fa16e66f..c6583f3b5 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -24,6 +24,8 @@
     
 #include <apti18n.h>
     
+#include <cstdlib>
+#include <algorithm>
 #include <iostream>
 									/*}}}*/
 using namespace std;
-- 
cgit v1.2.3