From 15fc8636b3e48eab5f3bc6f2e8c61c0409246909 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 9 Nov 2011 17:22:57 +0100
Subject: * apt-pkg/cacheset.cc:   - make the cachesets real containers which
 can embedding any container     to be able to use the same interface
 regardless of set or list usage

---
 apt-pkg/edsp.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'apt-pkg/edsp.h')

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index c14309422..07bbbdd03 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -10,13 +10,11 @@
 #define PKGLIB_EDSP_H
 
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheset.h>
 
 #include <list>
 #include <string>
 
-namespace APT {
-	class PackageSet;
-};
 class pkgDepCache;
 class OpProgress;
 
-- 
cgit v1.2.3


From b9dadc24b9477b466bc8058c765d76c65ecc7125 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 13 Dec 2011 01:22:38 +0100
Subject: revert 2184.1.3: forward declaration instead of headers

The breakage is just to big for now, so guard the change with
#ifndef APT_8_CLEANER_HEADERS and be nice to library users
---
 apt-pkg/edsp.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'apt-pkg/edsp.h')

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 07bbbdd03..12b06d143 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -15,6 +15,11 @@
 #include <list>
 #include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/progress.h>
+#endif
+
 class pkgDepCache;
 class OpProgress;
 
-- 
cgit v1.2.3