aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Bremner <david@tethera.net>2014-05-09 06:38:42 +0900
committerGravatar David Bremner <david@tethera.net>2014-05-09 06:38:42 +0900
commit7d81d700426a76a1ccec107ea2c95d8c47d31465 (patch)
tree25a82dd3d304c6419e488c2fcc253e6e746aeae0
parent8ecc7db3f802835de75150c05f1f8070f4be48f4 (diff)
parentf6b54fbcf6860e687b5b058810c1d17622dbab23 (diff)
Merge in a few Debian commits.
-rw-r--r--debian/changelog13
-rw-r--r--debian/control2
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 00738a90..9e590f06 100644
--- 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 16231367..64539b98 100644
--- 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