Merge tag 'debian/0.18.1-2'

uploaded to Debian unstable

diff --git a/debian/changelog b/debian/changelog
index f873b1b2a8f06ca03a336c68853f897ec02b0e85..661aabeecefe43fbc0618f8882abe15457711307 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+notmuch (0.18.1-2) unstable; urgency=medium
+
+  * Update build-deps to use emacs24 on buildd (Closes: #756085)
+  * Disable gdb atomicity test for arm64 as gdb is currently broken on
+    the (unofficial) buildds
+  * Re-enable atomicity test on armhf; upstream fix seems to have
+    worked.
+
+ -- David Bremner <bremner@debian.org>  Sat, 09 Aug 2014 11:48:10 -0300
+
 notmuch (0.18.1-1) unstable; urgency=medium
 
   * New upstream bug fix release

diff --git a/debian/control b/debian/control
index e2f2708e4234b2728c3f84f31d310beeb8bc0b89..6fa1fa7ba6846e084e0199cd4617d76c4e7fac0d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,9 +17,9 @@ Build-Depends:
  python3-all (>= 3.1.2-7~),
  python-sphinx (>= 1.0),
  ruby, ruby-dev (>>1:1.9.3~),
- emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
- emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
- gdb [!s390x !ia64 !armhf !armel],
+ emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
+ emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
+ gdb [!s390x !ia64 !armel !arm64],
  dtach (>= 0.8),
  bash-completion (>=1.9.0~)
 Standards-Version: 3.9.4