From 472ff00ef2e48383805d281c6364ec27839e3f4d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 19:14:19 +0200
Subject: use forward declaration in headers if possible instead of includes

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

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

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 40368c91f..919daefef 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -23,6 +23,9 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/edsp.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/progress.h>
 
 #include <sys/types.h>
 #include <cstdlib>
-- 
cgit v1.2.3


From 36a171e1e5b3e6a3baa4be6cfb52dbcd47324abb Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 21:05:00 +0200
Subject: fix foldmarker in algorithms.h

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

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

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 919daefef..2fca0f6af 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1209,7 +1209,6 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
    return true;
 }
 									/*}}}*/
-
 // ProblemResolver::BreaksInstOrPolicy - Check if the given pkg is broken/*{{{*/
 // ---------------------------------------------------------------------
 /* This checks if the given package is broken either by a hard dependency
@@ -1233,7 +1232,7 @@ bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I)
        
    return false;
 }
-
+									/*}}}*/
 // ProblemResolver::ResolveByKeep - Resolve problems using keep		/*{{{*/
 // ---------------------------------------------------------------------
 /* This is the work horse of the soft upgrade routine. It is very gental 
@@ -1439,7 +1438,7 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
    qsort(List,Count,sizeof(*List),PrioComp);
 }
 									/*}}}*/
-// CacheFile::ListUpdate - update the cache files                    	/*{{{*/
+// ListUpdate - update the cache files					/*{{{*/
 // ---------------------------------------------------------------------
 /* This is a simple wrapper to update the cache. it will fetch stuff
  * from the network (or any other sources defined in sources.list)
-- 
cgit v1.2.3


From 87da74517a0defa3450d0f3d8c3275f6963d0f5e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 20 Sep 2011 14:21:23 +0200
Subject: * apt-pkg/algorithms.cc:   - if a package is garbage, don't try to
 save it with FixByInstall

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

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

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2fca0f6af..4c2ea0f2d 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1035,7 +1035,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
 		     if (BrokenFix == false || DoUpgrade(I) == false)
 		     {
 			// Consider other options
-			if (InOr == false)
+			if (InOr == false || Cache[I].Garbage == true)
 			{
 			   if (Debug == true)
 			      clog << "  Removing " << I.FullName(false) << " rather than change " << Start.TargetPkg().FullName(false) << endl;
-- 
cgit v1.2.3