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

notmuch Debian 0.26-1 upload (same as 0.26)

7 files changed, 122 insertions, 62 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
index e8c2e82a..cd0decc2 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,14 +1,14 @@
-tmp/
-libnotmuch-dev/
-libnotmuch*/
-notmuch-emacs/
-notmuch/
-notmuch-dbg/
-notmuch-mutt/
-notmuch-vim/
-ruby-notmuch/
-python*-notmuch/
-*.debhelper
-*.debhelper.log
-*.substvars
-files
+/tmp/
+/libnotmuch-dev/
+/libnotmuch*/
+/notmuch-emacs/
+/elpa-notmuch/
+/notmuch/
+/notmuch-mutt/
+/notmuch-vim/
+/ruby-notmuch/
+/python*-notmuch/
+/*.debhelper
+/*.debhelper.log
+/*.substvars
+/files
diff --git a/debian/NEWS b/debian/NEWS
index 174c1303..bf661fe4 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,54 +1,54 @@
 notmuch (0.21~rc1-1) experimental; urgency=medium
 
-  * This release of notmuch requires a non-reversible database upgrade
-    to support database revision tracking. This upgrade will happen on
-    the first run of 'notmuch-new' after updating. Notmuch will backup
-    your tags for your before doing the upgrade, but it never hurts to
-    make your own backup with notmuch dump.
+  This release of notmuch requires a non-reversible database upgrade
+  to support database revision tracking. This upgrade will happen on
+  the first run of 'notmuch-new' after updating. Notmuch will backup
+  your tags for your before doing the upgrade, but it never hurts to
+  make your own backup with notmuch dump.
 
  -- David Bremner <bremner@debian.org>  Thu, 15 Oct 2015 08:13:04 -0300
 
 notmuch (0.19-1) experimental; urgency=medium
 
-  * This release of notmuch again requires a non-reversable database
-    upgrade to support database features. This upgrade will happen on
-    the first run of 'notmuch-new' after updating. Notmuch will backup
-    your tags for your before doing the upgrade, but it never hurts to
-    make your own backup with notmuch dump.
+  This release of notmuch again requires a non-reversable database
+  upgrade to support database features. This upgrade will happen on
+  the first run of 'notmuch-new' after updating. Notmuch will backup
+  your tags for your before doing the upgrade, but it never hurts to
+  make your own backup with notmuch dump.
 
  -- David Bremner <bremner@debian.org>  Fri, 14 Nov 2014 20:34:55 +0100
 
 notmuch (0.18~rc0-1) experimental; urgency=low
 
-  * This release of notmuch requires a non-reversable database upgrade
-    to support the new path: and updated folder: prefixes. Notmuch
-    will backup your tags for your before doing the upgrade, but it
-    never hurts to make your own backup with notmuch dump before
-    next running 'notmuch new'
+  This release of notmuch requires a non-reversable database upgrade
+  to support the new path: and updated folder: prefixes. Notmuch
+  will backup your tags for your before doing the upgrade, but it
+  never hurts to make your own backup with notmuch dump before
+  next running 'notmuch new'
 
  -- David Bremner <bremner@debian.org>  Tue, 22 Apr 2014 09:32:11 +0900
 
 notmuch (0.17-1) unstable; urgency=low
 
-  * Previously on big endian architectures like sparc and powerpc the
-    computation of SHA1 hashes was incorrect. This meant that messages
-    with overlong or missing message-ids were given different computed
-    message-ids than on more common little endian architectures like
-    i386 and amd64.  If you use notmuch on a big endian architecture,
-    you are strongly advised to make a backup of your tags using
-    `notmuch dump` before this upgrade.  You can locate the affected
-    files using something like:
+  Previously on big endian architectures like sparc and powerpc the
+  computation of SHA1 hashes was incorrect. This meant that messages
+  with overlong or missing message-ids were given different computed
+  message-ids than on more common little endian architectures like
+  i386 and amd64.  If you use notmuch on a big endian architecture,
+  you are strongly advised to make a backup of your tags using
+  `notmuch dump` before this upgrade.  You can locate the affected
+  files using something like:
 
-    notmuch dump | \
-      awk '/^notmuch-sha1-[0-9a-f]{40} / \
-        {system("notmuch search --exclude=false --output=files id:" $1)}'
+  notmuch dump | \
+    awk '/^notmuch-sha1-[0-9a-f]{40} / \
+      {system("notmuch search --exclude=false --output=files id:" $1)}'
 
  -- David Bremner <bremner@debian.org>  Mon, 30 Dec 2013 20:31:16 -0400
 
 notmuch (0.16-1) unstable; urgency=low
 
-  * The vim interface has been rewritten from scratch. In particular
-    it requires a version of vim with ruby support.
+  The vim interface has been rewritten from scratch. In particular
+  it requires a version of vim with ruby support.
 
  -- David Bremner <bremner@debian.org>  Sat, 16 Feb 2013 08:12:02 -0400
 
diff --git a/debian/changelog b/debian/changelog
index 5749b916..e0b35352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,62 @@
-notmuch (0.25-6~bpo9+1) stretch-backports; urgency=medium
+notmuch (0.26-1) unstable; urgency=medium
 
-  * Rebuild for stretch-backports.
-  * drop dependency on libgmime-3.0, not yet in backports
+  [ Daniel Kahn Gillmor ]
+  * build against python3-sphinx instead of python-sphinx
+  * d/changelog: strip trailing whitespace
+  * move to debhelper 10
+  * Standards-Version: bump to 4.1.3 (drop priority: extra
+    from transitional packages)
+
+  [ David Bremner ]
+  * New upstream release (see /usr/share/doc/notmuch/NEWS.gz)
+    - new command 'notmuch reindex'
+    - optional indexing of encrypted emails.
+    - indexing of files with duplicate message-id
+  * update symbols
+
+ -- David Bremner <bremner@debian.org>  Tue, 09 Jan 2018 07:13:21 -0400
+
+notmuch (0.26~rc2-1) experimental; urgency=medium
+
+  * Third upstream release candidate
 
- -- David Bremner <bremner@debian.org>  Sun, 27 Aug 2017 16:00:45 -0300
+ -- David Bremner <bremner@debian.org>  Tue, 09 Jan 2018 07:13:11 -0400
+
+notmuch (0.26~rc1-1) experimental; urgency=medium
+
+  * Second upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Mon, 01 Jan 2018 21:17:39 -0400
+
+notmuch (0.26~rc0-1) experimental; urgency=medium
+
+  * Upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Thu, 28 Dec 2017 10:21:08 -0400
+
+notmuch (0.25.3-1) unstable; urgency=medium
+
+  * Upstream bugfix release. Fix for OpenPGP UID validity reporting,
+    and build failure with GMime 3.0.3+.
+  * Bug fix: "notmuch FTBFS on Alpha due to broken gdb", thanks to
+    Michael Cree (Closes: #881028).
+
+ -- David Bremner <bremner@debian.org>  Fri, 08 Dec 2017 21:08:00 -0400
+
+notmuch (0.25.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release: fix for segfault when compiled
+    against gmime-2.6
+
+ -- David Bremner <bremner@debian.org>  Sun, 05 Nov 2017 20:05:49 -0400
+
+notmuch (0.25.1-1) unstable; urgency=medium
+
+  * new upstream bugfix release: mitigation for emacs bug 28350
+  * remove obsolete lintian override
+  * reformat debian/NEWS
+
+ -- David Bremner <bremner@debian.org>  Mon, 11 Sep 2017 22:20:48 -0300
 
 notmuch (0.25-6) unstable; urgency=medium
 
@@ -834,7 +887,7 @@ notmuch (0.9~rc2-1) experimental; urgency=low
     - New SONAME for libnotmuch
     - bindings changes for ruby and python
   * Less non-text parts reported in replies.
-  * emacs: provide button action to fetch unknown gpg keys 
+  * emacs: provide button action to fetch unknown gpg keys
 
  -- David Bremner <bremner@debian.org>  Fri, 07 Oct 2011 18:53:04 -0300
 
@@ -843,7 +896,7 @@ notmuch (0.9~rc1-1) experimental; urgency=low
   * Upstream release candidate
     - Atomicity improvements, thanks to Austin Clements
     - Add missing call to g_type_init, thanks to Aaron Ecay
-  * notmuch-emacs: add versioned dependency on notmuch.  
+  * notmuch-emacs: add versioned dependency on notmuch.
     (Closes: #642240).
 
  -- David Bremner <bremner@debian.org>  Sun, 25 Sep 2011 11:26:01 -0300
@@ -852,7 +905,7 @@ notmuch (0.8-1) unstable; urgency=low
 
   * New upstream version.
     - Improved handling of message/rfc822 parts
-    - Improved Build system portability 
+    - Improved Build system portability
     - Documentation update for Ruby bindings
     - Unicode, iterator, PEP8 changes for python bindings
 
@@ -934,7 +987,7 @@ notmuch (0.6~254) experimental; urgency=low
 
   [ Jameson Rollins ]
   * Bump standards version to 3.9.2 (No changes).
-  
+
  -- David Bremner <bremner@debian.org>  Thu, 23 Jun 2011 07:50:05 -0300
 
 notmuch (0.6~237) experimental; urgency=low
@@ -979,8 +1032,8 @@ notmuch (0.6~171) experimental; urgency=low
   * notmuch reply: Avoid segmentation fault when printing multiple parts
   * notmuch show: New part output handling.
   * emacs: Show cleaner `From:' addresses in the summary line.
-  * emacs: Add custom `notmuch-show-elide-same-subject', 
-    `notmuch-show-always-show-subject' 
+  * emacs: Add custom `notmuch-show-elide-same-subject',
+    `notmuch-show-always-show-subject'
   * emacs: Render text/x-vcalendar parts.
   * emacs: Add `notmuch-show-multipart/alternative-discouraged'.
   * vim: parse 'from' address, use sendmail directly, implement archive in
@@ -1112,7 +1165,7 @@ notmuch (0.2) unstable; urgency=low
   * Fix headers to be properly decoded in "notmuch reply"
   * emacs: Show the last few lines of citations as well as the first few lines.
   * emacs: The '+' and '-' commands can now add and remove tags by region.
-  * emacs: More meaningful buffer names for thread-view buffers. 
+  * emacs: More meaningful buffer names for thread-view buffers.
   * emacs: Customized colors of threads in search view based on tags.
 
  -- Carl Worth <cworth@debian.org>  Fri, 16 Apr 2010 10:20:23 -0700
diff --git a/debian/compat b/debian/compat
index ec635144..f599e28b 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index faa499cd..c3fe710a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,27 +8,27 @@ Uploaders:
 Build-Conflicts: ruby1.8, gdb-minimal, gdb [s390x ia64 armel ppc64el mips mipsel mips64el]
 Build-Depends:
  dpkg-dev (>= 1.17.14),
- debhelper (>= 9),
+ debhelper (>= 10~),
  pkg-config,
  libxapian-dev,
- libgmime-2.6-dev (>= 2.6.7~),
+ libgmime-3.0-dev (>= 3.0.3~) | libgmime-2.6-dev (>= 2.6.7~),
  libtalloc-dev,
  libz-dev,
  python-all (>= 2.6.6-3~),
  python3-all (>= 3.1.2-7~),
  dh-python,
  dh-elpa (>= 1.3),
- python-sphinx (>= 1.0),
+ python3-sphinx,
  ruby, ruby-dev (>>1:1.9.3~),
  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],
+ gdb [!s390x !ia64 !armel !ppc64el !mips !mipsel !mips64el !kfreebsd-any !alpha],
  dtach (>= 0.8),
  gpgsm <!nocheck>,
  gnupg <!nocheck>,
  bash-completion (>=1.9.0~)
-Standards-Version: 4.0.0
+Standards-Version: 4.1.3
 Homepage: https://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
 Vcs-Browser: https://git.notmuchmail.org/git/notmuch
@@ -113,7 +113,6 @@ Description: Ruby interface to the notmuch mail search and index library
 
 Package: notmuch-emacs
 Section: oldlibs
-Priority: extra
 Architecture: all
 Depends: elpa-notmuch, ${misc:Depends}
 Description: thread-based email index, search and tagging (transitional package)
diff --git a/debian/libnotmuch5.symbols b/debian/libnotmuch5.symbols
index 716d3b86..5e408213 100644
--- a/debian/libnotmuch5.symbols
+++ b/debian/libnotmuch5.symbols
@@ -18,10 +18,12 @@ libnotmuch.so.5 libnotmuch5 #MINVER#
  notmuch_database_get_all_tags@Base 0.3
  notmuch_database_get_config@Base 0.23~rc0
  notmuch_database_get_config_list@Base 0.23~rc0
+ notmuch_database_get_default_indexopts@Base 0.26~rc0
  notmuch_database_get_directory@Base 0.3
  notmuch_database_get_path@Base 0.3
  notmuch_database_get_revision@Base 0.21~rc1
  notmuch_database_get_version@Base 0.3
+ notmuch_database_index_file@Base 0.26~rc0
  notmuch_database_needs_upgrade@Base 0.3
  notmuch_database_open@Base 0.3
  notmuch_database_open_verbose@Base 0.20~rc1
@@ -39,8 +41,12 @@ libnotmuch.so.5 libnotmuch5 #MINVER#
  notmuch_filenames_get@Base 0.3
  notmuch_filenames_move_to_next@Base 0.3
  notmuch_filenames_valid@Base 0.3
+ notmuch_indexopts_destroy@Base 0.26~rc0
+ notmuch_indexopts_get_decrypt_policy@Base 0.26~rc0
+ notmuch_indexopts_set_decrypt_policy@Base 0.26~rc0
  notmuch_message_add_property@Base 0.23~rc0
  notmuch_message_add_tag@Base 0.3
+ notmuch_message_count_files@Base 0.26~rc0
  notmuch_message_destroy@Base 0.3
  notmuch_message_freeze@Base 0.3
  notmuch_message_get_date@Base 0.3
@@ -54,13 +60,16 @@ libnotmuch.so.5 libnotmuch5 #MINVER#
  notmuch_message_get_replies@Base 0.3
  notmuch_message_get_tags@Base 0.3
  notmuch_message_get_thread_id@Base 0.3
+ notmuch_message_has_maildir_flag@Base 0.26~rc0
  notmuch_message_maildir_flags_to_tags@Base 0.5
  notmuch_message_properties_destroy@Base 0.23~rc0
  notmuch_message_properties_key@Base 0.23~rc0
  notmuch_message_properties_move_to_next@Base 0.23~rc0
  notmuch_message_properties_valid@Base 0.23~rc0
  notmuch_message_properties_value@Base 0.23~rc0
+ notmuch_message_reindex@Base 0.26~rc0
  notmuch_message_remove_all_properties@Base 0.23~rc0
+ notmuch_message_remove_all_properties_with_prefix@Base 0.26~rc0
  notmuch_message_remove_all_tags@Base 0.3
  notmuch_message_remove_property@Base 0.23~rc0
  notmuch_message_remove_tag@Base 0.3
@@ -103,6 +112,7 @@ libnotmuch.so.5 libnotmuch5 #MINVER#
  notmuch_thread_get_tags@Base 0.3
  notmuch_thread_get_thread_id@Base 0.3
  notmuch_thread_get_toplevel_messages@Base 0.3
+ notmuch_thread_get_total_files@Base 0.26~rc0
  notmuch_thread_get_total_messages@Base 0.3
  notmuch_threads_destroy@Base 0.3
  notmuch_threads_get@Base 0.3
diff --git a/debian/notmuch.lintian-overrides b/debian/notmuch.lintian-overrides
deleted file mode 100644
index fb5bc076..00000000
--- a/debian/notmuch.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# this document uses iff in the mathematical sense of "if and only if"
-spelling-error-in-manpage usr/share/man/man3/notmuch.3.gz iff if