aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Bremner <david@tethera.net>2014-08-09 13:21:57 -0300
committerGravatar David Bremner <david@tethera.net>2014-08-09 13:21:57 -0300
commitf92342cb76fa3e1fa2f1c2e727f8ddf1a5c21b7d (patch)
tree0bb4a298dea4956151ab65104daba1f070fad5a4
parent748798511d7cb704ee7f9ce98cfbf87ebc41ab0f (diff)
parent01c8bf89a456cae9221bb57a130758a7a6dc005b (diff)
Merge tag 'debian/0.18.1-2'
uploaded to Debian unstable
-rw-r--r--debian/changelog10
-rw-r--r--debian/control6
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index f873b1b2..661aabee 100644
--- 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 e2f2708e..6fa1fa7b 100644
--- 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