summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-28 20:29:54 +0100
committerMichael Vogt <mvo@debian.org>2014-02-28 20:29:54 +0100
commitfa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (patch)
treeb879ccfbc9dba7a797ebe3414e1efed6737d6630 /debian/changelog
parent8c55d4d117f1641650cd832c957ccdbf71b04893 (diff)
parenta4a5901577a2b0d72f1c973f036a8198046d937a (diff)
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog18
1 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 162749a25..7ad1bed6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+apt (0.9.15.5ubuntu1) trusty; urgency=low
+
+ * merge with debian/sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 28 Feb 2014 20:29:13 +0100
+
+apt (0.9.15.5) unstable; urgency=medium
+
+ [ Michael Vogt ]
+ * vendor/tanglu/makefile: add missing clean/sources.list
+ * run the acquire tests with the new apt-helper binary, this
+ fixes the autopkgtest failures
+
+ [ Martin Pitt ]
+ * Fix autopkgtest missing dependencies and locale (closes: #739988)
+
+ -- Michael Vogt <mvo@debian.org> Fri, 28 Feb 2014 08:44:25 +0100
+
apt (0.9.15.4ubuntu1) trusty; urgency=low
* merge with debian/sid