From: David Bremner <david@tethera.net>
Date: Sun, 6 May 2018 12:00:02 +0000 (-0300)
Subject: Merge tag 'debian/0.26.2-2'
X-Git-Tag: 0.27_rc0~34
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=3a747e714c3e99a725619d09d832b9ac683733fe;hp=140e8fb11814038647ee30d01fec2e1bd1368605

Merge tag 'debian/0.26.2-2'

uploaded to unstable
---

diff --git a/debian/changelog b/debian/changelog
index 5052d83a..b2d97614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+notmuch (0.26.2-2) unstable; urgency=medium
+
+  * Mark gdb and dtach as <!nocheck>, meaning they are only needed for
+    the test suite.
+  * Re-enable gdb based tests on s390x, ppc64el, armel, mipsel, they
+    pass on porterbox. Leave disabled on mipsel64 (gdb tests still
+    failing), and mips (many tests fail on porterbox).
+
+ -- David Bremner <bremner@debian.org>  Sun, 06 May 2018 08:36:52 -0300
+
 notmuch (0.26.2-1) unstable; urgency=medium
 
   * Upstream bugfix release
diff --git a/debian/control b/debian/control
index c3fe710a..ae4e6f00 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Carl Worth <cworth@debian.org>
 Uploaders:
  Jameson Graef Rollins <jrollins@finestructure.net>,
  David Bremner <bremner@debian.org>
-Build-Conflicts: ruby1.8, gdb-minimal, gdb [s390x ia64 armel ppc64el mips mipsel mips64el]
+Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]
 Build-Depends:
  dpkg-dev (>= 1.17.14),
  debhelper (>= 10~),
@@ -23,8 +23,8 @@ Build-Depends:
  emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
- gdb [!s390x !ia64 !armel !ppc64el !mips !mipsel !mips64el !kfreebsd-any !alpha],
- dtach (>= 0.8),
+ gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
+ dtach (>= 0.8) <!nocheck>,
  gpgsm <!nocheck>,
  gnupg <!nocheck>,
  bash-completion (>=1.9.0~)