Merge in a few Debian commits.

diff --git a/debian/changelog b/debian/changelog
index 00738a90dcf1f81551e50fe5310796d857cf5cb0..9e590f067642773c14268cd0c402b7e6a2f7b658 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+notmuch (0.18-3) unstable; urgency=medium
+
+  * Disable atomicity tests on armel.
+
+ -- David Bremner <bremner@debian.org>  Thu, 08 May 2014 14:26:45 +0900
+
+notmuch (0.18-2) unstable; urgency=medium
+
+  * Disable atomicity tests on armhf. These should be re-enabled when
+    upstream relases a fix for this (in progress).
+
+ -- David Bremner <bremner@debian.org>  Thu, 08 May 2014 08:28:33 +0900
+
 notmuch (0.18-1) unstable; urgency=medium
 
   * New upstream release. For detailed release notes see

diff --git a/debian/control b/debian/control
index 16231367c2dc16018b4985cd25d77570fde5b408..64539b98dae37e961844ae7f7b743a381e427f2f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  ruby, ruby-dev (>>1:1.9.3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
- gdb [!s390x !ia64],
+ gdb [!s390x !ia64 !armhf !armel],
  dtach (>= 0.8),
  bash-completion (>=1.9.0~)
 Standards-Version: 3.9.4