Merge tag 'debian/0.28-2' into debian/stretch-backports

notmuch release 0.28-2 for unstable (sid) [dgit]
[dgit distro=debian]

diff --combined debian/changelog
index 64ddeb4f75c203c5d195581b2be6dcb6a629034d,8f37ef3abaff0245a488909ec640fef7d3d44341..c1a2e530328d0cf66cfd7681171065e3c54abd90
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,37 +1,52 @@@
+ notmuch (0.28-2) unstable; urgency=medium
+ 
+   * Override location of bash, because /usr/bin/bash might exist
+     thanks to usrmerge.
+ 
+  -- David Bremner <bremner@debian.org>  Fri, 12 Oct 2018 20:54:00 -0300
+ 
+ notmuch (0.28-1) unstable; urgency=medium
+ 
+   * New upstream releases.
+   * Includes threading fixes, support for relative database paths, and
+     rewritten zsh completion.
+ 
+  -- David Bremner <bremner@debian.org>  Fri, 12 Oct 2018 20:17:27 -0300
+ 
+ notmuch (0.28~rc0-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+ 
+  -- David Bremner <bremner@debian.org>  Wed, 03 Oct 2018 20:36:57 -0300
+ 
+ notmuch (0.27-3) unstable; urgency=medium
+ 
+   * Update Vcs-Git to use https and specify correct branch
+   * Update Build-depends for unversioned emacs packages.
+ 
+  -- David Bremner <bremner@debian.org>  Sat, 08 Sep 2018 18:20:10 -0300
+ 
+ notmuch (0.27-2) unstable; urgency=medium
+ 
+   * Add texinfo as a build-dep, build info version of documentation.
+ 
+  -- David Bremner <bremner@debian.org>  Thu, 28 Jun 2018 21:01:29 -0300
+ 
 +notmuch (0.27-1~bpo9+2) stretch-backports; urgency=medium
 +
 +  * Disable test T460-emacs-tree on arm64. The failures seems to be an upstream
 +    emacs heisenbug fixed in unstable.
 +
 + -- David Bremner <bremner@debian.org>  Fri, 22 Jun 2018 21:02:14 -0300
 +
 +notmuch (0.27-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Restore libgmime-3.0 build dependency, preferred upstream, now
 +    available in backports.
 +
 + -- David Bremner <bremner@debian.org>  Mon, 18 Jun 2018 21:23:26 -0300
 +
  notmuch (0.27-1) unstable; urgency=medium
  
    * New upstream feature release
@@@ -58,15 -77,6 +92,15 @@@ notmuch (0.26.1-1) unstable; urgency=me
  
   -- 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 ]
@@@ -201,12 -211,6 +235,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

diff --combined debian/control
index 79073265a5a0b19709dc811b1e1519047c90df85,922f6d8c847a9488ce6ca5cfc409f95c33e3950e..e3e7ef70dd7becd013c039c444ecea429b1fe6ae
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,13 -3,12 +3,13 @@@ 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 [ia64 mips mips64el]
  Build-Depends:
   dpkg-dev (>= 1.17.14),
-  debhelper (>= 10~),
+  debhelper (>= 11~),
   pkg-config,
   libxapian-dev,
   libgmime-3.0-dev (>= 3.0.3~) | libgmime-2.6-dev (>= 2.6.7~),
@@@ -21,17 -20,18 +21,18 @@@
   dh-elpa (>= 1.3),
   python3-sphinx,
   ruby, ruby-dev (>>1:1.9.3~),
+  emacs-nox | emacs-gtk | emacs-lucid |
   emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
-  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
-  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
+  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
   gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
   dtach (>= 0.8) <!nocheck>,
   gpgsm <!nocheck>,
   gnupg <!nocheck>,
-  bash-completion (>=1.9.0~)
+  bash-completion (>=1.9.0~),
+  texinfo
  Standards-Version: 4.1.3
  Homepage: https://notmuchmail.org/
- Vcs-Git: git://notmuchmail.org/git/notmuch -b debian/stretch-backports
+ Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
  Vcs-Browser: https://git.notmuchmail.org/git/notmuch
  
  Package: notmuch

diff --combined debian/rules
index abd5d8cf9cebc6d20e99db2ea18c15b7675b90dc,c8ecb1ac4e890ee4c83ffb4a27d603cb13fa7ce5..4979ec3f659c4317c766312aee6c1a75f350e770
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -2,21 -2,17 +2,22 @@@
  
  python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
  
 +ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),arm64)
 +      NOTMUCH_SKIP_TESTS=T460-emacs-tree
 +      export NOTMUCH_SKIP_TESTS
 +endif
 +
  %:
        dh $@ --with python2,python3,elpa
  
  override_dh_auto_configure:
-       ./configure --prefix=/usr \
+       BASH=/bin/bash  ./configure --prefix=/usr \
                --libdir=/usr/lib/$$(dpkg-architecture -q DEB_TARGET_MULTIARCH) \
                --includedir=/usr/include \
                --mandir=/usr/share/man \
                --infodir=/usr/share/info \
                --sysconfdir=/etc \
+               --zshcompletiondir=/usr/share/zsh/vendor-completions \
                --localstatedir=/var
  
  override_dh_auto_build:
@@@ -36,4 -32,5 +37,5 @@@ override_dh_auto_install
        dh_auto_install
        dh_auto_install --sourcedirectory bindings/python
        cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp
+       $(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install
        dh_auto_install --sourcedirectory bindings/ruby