summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-07-14 21:28:50 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-07-14 21:28:50 +0200
commit8e7ac74ad9dbd15a874c66632f6da22f6b23d9c6 (patch)
tree9ca19909a123829858c8cb5e236f1b2341f996ed /debian
parent78485ab210b815c21ce55cb0cecb834ba5158e18 (diff)
parent118192bfd764d03af4cfcfc10eb9c38e7cc98721 (diff)
downloadapt-8e7ac74ad9dbd15a874c66632f6da22f6b23d9c6.tar.gz
merge with debian-sid 0.8.15.2
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
1 files changed, 16 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8bf5af2d1..52972e43b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-apt (0.8.15.2) unstable; urgency=low
+apt (0.8.15.3) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * 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"
[ David Kalnischkies ]
* apt-pkg/pkgcachegen.cc:
@@ -13,7 +20,14 @@ apt (0.8.15.2) unstable; urgency=low
* apt-pkg/init.cc:
- use CndSet in pkgInitConfig (Closes: #629617)
- -- David Kalnischkies <kalnischkies@gmail.com> Wed, 06 Jul 2011 13:29:52 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Thu, 14 Jul 2011 21:26:09 +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.1) unstable; urgency=low