aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2016-12-07 07:28:46 -0400
committerDavid Bremner <david@tethera.net>2016-12-07 07:30:12 -0400
commit71f1228a518f08e94dc1ea4e2147f80d3484c615 (patch)
treecfc88070f6c172511d51134045101b38fcda1b65 /debian
parente682c8f8f84fe5f7af30280bd8ea437772e154fa (diff)
parentd74c5345704136611f993ca38e0d035b1da798b6 (diff)
Merge branch 'release'
Merge changes for notmuch-insert error handling, debian bugfix release
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7c1a5303..9c2ebf75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.23.3-3) unstable; urgency=medium
+
+ * Disable gdb using tests on kfreebsd-*, due to apparent gdb breakage
+
+ -- David Bremner <bremner@debian.org> Mon, 05 Dec 2016 08:25:32 -0400
+
notmuch (0.23.3-2) unstable; urgency=medium
* Add missing depends to notmuch-emacs. Thanks to micah for the
diff --git a/debian/control b/debian/control
index ba8642b4..e71a6716 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
ruby, ruby-dev (>>1:1.9.3~),
emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
- gdb [!s390x !ia64 !armel !ppc64el !mips !mipsel !mips64el],
+ gdb [!s390x !ia64 !armel !ppc64el !mips !mipsel !mips64el !kfreebsd-any],
dtach (>= 0.8),
gpgsm <!nocheck>,
gnupg <!nocheck>,