Merge tag 'debian/0.27-1' into debian/stretch-backports

notmuch Debian 0.27-1 upload (same as 0.27)

diff --combined debian/changelog
index 8c9688fd5b70a32fb6822c3f92fde1f1f4080455,8bac8a3d6e4d6479f4e8e6593aeca181d954ef11..873e3b5c0fb8eaee10145d5d470849622de6554d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,48 +1,57 @@@
+ notmuch (0.27-1) unstable; urgency=medium
+ 
+   * New upstream feature release
+     - thread subqueries (match terms in different messages of same thread)
+     - notmuch new --full-scan (ignore mtimes)
+     - notmuch show --decrypt=stash (decrypt and stash on first read)
+ 
+  -- David Bremner <bremner@debian.org>  Tue, 12 Jun 2018 22:39:33 -0300
+ 
+ notmuch (0.27~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- David Bremner <bremner@debian.org>  Thu, 31 May 2018 08:19:00 -0300
+ 
+ notmuch (0.27~rc0-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- David Bremner <bremner@debian.org>  Sat, 26 May 2018 09:12:37 -0700
+ 
+ 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
+     - Break reference loops when indexing, fixes INTERNAL_ERROR in "notmuch show"
+     - Don't call get_mset(0,0,X), fixes crash on some gcc8 using distros
+ 
+  -- David Bremner <bremner@debian.org>  Sat, 28 Apr 2018 08:10:24 -0300
+ 
+ notmuch (0.26.1-1) unstable; urgency=medium
+ 
+   * Bump LIBRARY_MINOR_VERSION to 1, for new functions in 0.26
+ 
+  -- David Bremner <bremner@debian.org>  Mon, 02 Apr 2018 08:08:01 -0300
+ 
 +notmuch (0.26-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * add myself to uploaders
 +  * drop dependency on libgmime-3.0, not yet in backports
 +  * note the debian/stretch-backports branch
 +
 + -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sun, 04 Feb 2018 15:21:54 -0500
 +
  notmuch (0.26-1) unstable; urgency=medium
  
    [ Daniel Kahn Gillmor ]
@@@ -141,12 -177,6 +186,12 @@@ notmuch (0.25~rc0-1) experimental; urge
  
   -- David Bremner <bremner@debian.org>  Sun, 16 Jul 2017 08:48:59 -0300
  
 +notmuch (0.24.2-2~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- David Bremner <bremner@debian.org>  Fri, 14 Jul 2017 07:27:04 -0300
 +
  notmuch (0.24.2-2) unstable; urgency=medium
  
    * rebuild for unstable
@@@ -544,7 -574,7 +589,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
  
@@@ -965,7 -995,7 +1010,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).

diff --combined debian/control
index ab5bd4c8a1c5131007273aa7d004de81d41890c4,ae4e6f0052818106ebb6bde8f4e039b9c6cba852..4c317c2242f1de8bce2788e09bfbd5f40e85cbfa
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,16 -3,15 +3,16 @@@ Section: mai
  Priority: optional
  Maintainer: Carl Worth <cworth@debian.org>
  Uploaders:
 + Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
   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~),
   pkg-config,
   libxapian-dev,
 - libgmime-3.0-dev (>= 3.0.3~) | libgmime-2.6-dev (>= 2.6.7~),
 + libgmime-2.6-dev (>= 2.6.7~),
   libtalloc-dev,
   libz-dev,
   python-all (>= 2.6.6-3~),
@@@ -24,14 -23,14 +24,14 @@@
   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~)
  Standards-Version: 4.1.3
  Homepage: https://notmuchmail.org/
 -Vcs-Git: git://notmuchmail.org/git/notmuch
 +Vcs-Git: git://notmuchmail.org/git/notmuch -b debian/stretch-backports
  Vcs-Browser: https://git.notmuchmail.org/git/notmuch
  
  Package: notmuch

diff --combined debian/gbp.conf
index 4f1e94fd05fa8b7e80a8d4416eb2234901aa07b5,a1c8735d82da6b2caea1269f10a78e9427404aaf..3950856fda8bacffcbbb57e3dca9e7fe26e97d58
--- 1/debian/gbp.conf
--- 2/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -5,11 -5,8 +5,8 @@@
  upstream-branch = master
  
  # The default branch for the debian patch (no patch in our case)
 -debian-branch = master
 +debian-branch = debian/stretch-backports
  
- # Directory for performing the build
- export-dir = ./debian-build
- 
  # Format for upstream tags
  upstream-tag = %(version)s