Merge branch 'release'

[notmuch] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e6cfc7a4c86e59fbc32916eb972abbeb3b0db53e..44d65504154164ddcb10f4b28cc7903ba6035eeb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+notmuch (0.21-3) unstable; urgency=medium
+
+  * Add mips and mips64el to gdb build-dep blacklist
+
+ -- David Bremner <bremner@debian.org>  Sat, 14 Nov 2015 19:07:06 -0400
+
+notmuch (0.21-2) unstable; urgency=medium
+
+  * Build-conflict with gdb on ppc64el and mipsel. Workaround gdb breakage on those
+    architectures (Closes: #804792).
+
+ -- David Bremner <bremner@debian.org>  Thu, 12 Nov 2015 08:54:23 -0400
+
 notmuch (0.21-1) unstable; urgency=medium
 
   * New upstream release. Highlights include