Merge EDSP 0.5 w/ multi-arch support for external solvers

[apt.git] / apt-pkg / pkgsystem.h

diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index 211fd0d5616a5a2ae632f9ee41ff1bd3b02cf2ce..6e33c67ed338944bf6a7c328741621c030b440d8 100644 (file)
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -7,7 +7,7 @@
    
    Instances of this class can be thought of as factories or meta-classes
    for a variety of more specialized classes. Together this class and 
-   it's speciallized offspring completely define the environment and how
+   it's specialized offspring completely define the environment and how
    to access resources for a specific system. There are several sub
    areas that are all orthogonal - each system has a unique combination of
    these sub areas:
@@ -23,7 +23,7 @@
        - Selection of local 'status' indexes that make up the pkgCache.
       
    It is important to note that the handling of index files is not a 
-   function of the system. Index files are handled through a seperate 
+   function of the system. Index files are handled through a separate
    abstraction - the only requirement is that the index files have the
    same idea of versioning as the target system.
    
@@ -38,15 +38,19 @@
 #define PKGLIB_PKGSYSTEM_H
 
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
 #include <vector>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/depcache.h>
+#endif
+
 class pkgDepCache;
 class pkgPackageManager;
 class pkgVersioningSystem;
 class Configuration;
 class pkgIndexFile;
-class PkgFileIterator;
 
 class pkgSystem
 {