summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-05-22 18:08:19 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-05-22 18:08:19 +0200
commitc2e39004370846f465cf60b6fb312664981179d8 (patch)
treef9bfabdf95f3768a9b829327d08c58ffa14e36a9 /debian
parentaccd8215ca9a1cb10e92a059d71eb02aac2f0743 (diff)
parentba95c69681dee8a0ae12ba635e56414820ee9113 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog20
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 769610e52..3f0d78b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+apt (1.0.9.10ubuntu1) unstable; urgency=low
+
+ * merged from debian/sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 22 May 2015 18:08:10 +0200
+
+apt (1.0.9.10) unstable; urgency=medium
+
+ [ Michael Vogt ]
+ * Fix crash in pkgDPkgPM::WriteApportReport(() (LP: #1436626)
+ * Move sysconf(_SC_OPEN_MAX); out of the for() loop to avoid unneeded
+ syscalls
+ * Fix endless loop in apt-get update that can cause disk fillup
+ (LP: #1445239)
+
+ [ Helmut Grohne ]
+ * parse arch-qualified Provides correctly (Closes: 777071)
+
+ -- Michael Vogt <mvo@debian.org> Fri, 22 May 2015 17:38:31 +0200
+
apt (1.0.9.9ubuntu1) wily; urgency=low
* merged from debian/sid