merge with debian-experimental-ma to get the public policy back

diff --combined apt-pkg/cachefile.h
index c68f06ed89aff3fded670a7f87098455d6ec3aad,63bc3de471c833d1215c2b5068d67330de4dc06c..09d3ec2676675c3063f32f5cc016b11eb7d245fe
--- 1/apt-pkg/cachefile.h
--- 2/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@@ -20,9 -20,10 +20,9 @@@
  
  #include <apt-pkg/depcache.h>
  #include <apt-pkg/acquire.h>
 +#include <apt-pkg/policy.h>
  #include <apt-pkg/sourcelist.h>
  
 -class pkgPolicy;
 -class pkgSourceList;
  class pkgCacheFile
  {
     protected:
@@@ -30,10 -31,10 +30,10 @@@
     MMap *Map;
     pkgCache *Cache;
     pkgDepCache *DCache;
-    pkgPolicy *Policy;
     pkgSourceList *SrcList;
  
     public:
+    pkgPolicy *Policy;
  
     // We look pretty much exactly like a pointer to a dep cache
     inline operator pkgCache &() {return *Cache;};
@@@ -64,11 -65,6 +64,11 @@@
     inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; };
     inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; };
  
 +   inline bool IsPkgCacheBuilt() const { return (Cache != NULL); };
 +   inline bool IsDepCacheBuilt() const { return (DCache != NULL); };
 +   inline bool IsPolicyBuilt() const { return (Policy != NULL); };
 +   inline bool IsSrcListBuilt() const { return (SrcList != NULL); };
 +
     pkgCacheFile();
     virtual ~pkgCacheFile();
  };

diff --combined debian/changelog
index edea3400a0fef368a5203291848376c08ffc8e34,d29705d24d3a2c8bb63adfba0450d5298a052e3f..9367c174342728db6a356d57a01b82709aa97071
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,12 +1,24 @@@
- apt (0.7.26~exp7) UNRELEASED; urgency=low
++apt (0.7.26~exp8) UNRELEASED; urgency=low
 +
 +  * apt-pkg/cacheset.cc:
 +    - get the candidate either from an already built depcache
 +      or use the policy which is a bit faster than depcache generation
 +  * apt-pkg/orderlist.cc:
 +    - untouched packages are never missing
 +  * apt-pkg/packagemanager.cc:
 +    - packages that are not touched doesn't need to be unpacked
 +
-  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 10 Jun 2010 13:04:47 +0200
++ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 10 Jun 2010 16:36:58 +0200
 +
- apt (0.7.26~exp6) UNRELEASED; urgency=low
+ apt (0.7.26~exp7) experimental; urgency=low
+ 
+   * apt-pkg/cachefile.h:
+     - make pkgPolicy public again, libapt-pkg-perl (and probably
+       others) get unhappy without that
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 10 Jun 2010 15:33:24 +0200
+ 
+ apt (0.7.26~exp6) experimental; urgency=low
  
    [ Michael Vogt ]
    * merge the remaining Ubuntu change:
@@@ -100,7 -96,7 +108,7 @@@
    * apt-pkg/indexcopy.cc:
      - move the gpg codecopy to a new method and use it also in methods/gpgv.cc
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 09 Jun 2010 21:15:46 +0200
+  -- Michael Vogt <mvo@debian.org>  Thu, 10 Jun 2010 14:02:22 +0200
  
  apt (0.7.26~exp5) experimental; urgency=low