diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-06-10 16:37:18 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-06-10 16:37:18 +0200 |
| commit | 6d7b4a91f3ebb0f1ff98eddf0bc48a502cc323a8 (patch) | |
| tree | 3643ef60ea0ae8cc85711f21c45072c636b08707 | |
| parent | c0ba35fc916d2adf0ba1fbd8cca62a83ce83d789 (diff) | |
| parent | 6b2f7a60c3d7d22d1d6b0e300ef526d48ff20048 (diff) | |
merge with debian-experimental-ma to get the public policy back
| -rw-r--r-- | apt-pkg/cachefile.h | 2 | ||||
| -rw-r--r-- | debian/changelog | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index c68f06ed8..09d3ec267 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -30,10 +30,10 @@ class pkgCacheFile 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;}; diff --git a/debian/changelog b/debian/changelog index edea3400a..9367c1743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -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 @@ -8,9 +8,17 @@ apt (0.7.26~exp7) UNRELEASED; urgency=low * 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 +108,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * 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 |