summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-06-10 16:37:18 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-06-10 16:37:18 +0200
commit6d7b4a91f3ebb0f1ff98eddf0bc48a502cc323a8 (patch)
tree3643ef60ea0ae8cc85711f21c45072c636b08707 /debian
parentc0ba35fc916d2adf0ba1fbd8cca62a83ce83d789 (diff)
parent6b2f7a60c3d7d22d1d6b0e300ef526d48ff20048 (diff)
merge with debian-experimental-ma to get the public policy back
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog16
1 files changed, 12 insertions, 4 deletions
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