Merge tag 'debian/0.26.2-2'

uploaded to unstable

diff --combined debian/changelog
index 5052d83a0948d47c5242982fcb1314e7f4840847,8d13c8d7ff6e2f0600cf4b7e3b2c9365773831d3..b2d976143b88ae4405fe65cea27ae65f416239a7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,13 +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
@@@ -543,7 -553,7 +553,7 @@@ notmuch (0.18-3) unstable; urgency=medi
  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).
 +    upstream releases a fix for this (in progress).
  
   -- David Bremner <bremner@debian.org>  Thu, 08 May 2014 08:28:33 +0900
  
@@@ -964,7 -974,7 +974,7 @@@ notmuch (0.6.1-1) unstable; urgency=lo
  notmuch (0.6) unstable; urgency=low
  
    * New upstream release; see /usr/share/doc/notmuch/NEWS for
 -    details. Hilights include:
 +    details. Highlights include:
      - Folder-based search (Closes: #597222)
      - PGP/MIME decryption and verification
    * Document strict dependency on emacs23 (Closes: #631994).