summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-07-14 11:51:40 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-07-14 11:51:40 +0200
commit0dc01623882a8a51416e8635e76c941fc302abec (patch)
tree3d6c3bfb65618fc38473660c1f89e6fd294bd825 /debian
parentefd1da06d60b7ce4192fd3ca1fad55e018b7185e (diff)
parent118192bfd764d03af4cfcfc10eb9c38e7cc98721 (diff)
merged from the debian-sid branch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog17
1 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c1d76a5be..cfb4094a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+apt (0.8.15.2ubuntu1) UNRELEASEDoneiric; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - improve error message for a expired Release file
+ * apt-pkg/algorithms.cc:
+ - Hold back packages that would enter "policy-broken" state on upgrade
+ when doing a "apt-get upgrade"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jul 2011 11:22:54 +0200
+
+apt (0.8.15.2) unstable; urgency=high
+
+ * fix from David Kalnischkies for the InRelease gpg verification
+ code (LP: #784473)
+
+ -- Michael Vogt <mvo@debian.org> Tue, 12 Jul 2011 11:54:47 +0200
+
apt (0.8.15.1ubuntu2) oneiric; urgency=low
[ Brian Murray ]