Merge in a few Debian commits.

This commit is contained in:
David Bremner 2014-05-09 06:38:42 +09:00
commit 7d81d70042
2 changed files with 14 additions and 1 deletions

13
debian/changelog vendored
View file

@ -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 notmuch (0.18-1) unstable; urgency=medium
* New upstream release. For detailed release notes see * New upstream release. For detailed release notes see

2
debian/control vendored
View file

@ -19,7 +19,7 @@ Build-Depends:
ruby, ruby-dev (>>1:1.9.3~), ruby, ruby-dev (>>1:1.9.3~),
emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) | emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~), emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
gdb [!s390x !ia64], gdb [!s390x !ia64 !armhf !armel],
dtach (>= 0.8), dtach (>= 0.8),
bash-completion (>=1.9.0~) bash-completion (>=1.9.0~)
Standards-Version: 3.9.4 Standards-Version: 3.9.4