Merge tag 'debian/0.25-6' into debian/stretch-backports

12 files changed, 106 insertions, 71 deletions

diff --git a/debian/changelog b/debian/changelog
index 67f1fb02..6d501605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,77 @@
+notmuch (0.25-6) unstable; urgency=medium
+
+  * Bug fix: "deletes shipped file on reinstall:
+    /etc/emacs/site-start.d/50notmuch.el", thanks to Andreas Beckmann
+    (Closes: #872197).
+
+ -- David Bremner <bremner@debian.org>  Tue, 15 Aug 2017 07:52:21 -0300
+
+notmuch (0.25-5) unstable; urgency=medium
+
+  * Bug fix: "dependency on elpa-emacs doesn't seem right", thanks
+    to Jiri Palecek (Closes: #871642).
+
+ -- David Bremner <bremner@debian.org>  Thu, 10 Aug 2017 06:42:50 -0400
+
+notmuch (0.25-4) unstable; urgency=medium
+
+  * Recommend elpa-emacs instead emacs-notmuch
+
+ -- David Bremner <bremner@debian.org>  Fri, 04 Aug 2017 18:11:35 -0400
+
+notmuch (0.25-3) unstable; urgency=medium
+
+  * Remove old startup file /etc/emacs/site-start.d/50notmuch.el
+
+ -- David Bremner <bremner@debian.org>  Thu, 03 Aug 2017 09:26:00 -0400
+
+notmuch (0.25-2) unstable; urgency=medium
+
+  * Drop build-dep on libgmime-2.4-dev, long unsupported upstream
+  * Bug fix: "please transition to gmime 3.0", thanks to Daniel Kahn
+    Gillmor (Closes: #867353).
+
+ -- David Bremner <bremner@debian.org>  Wed, 26 Jul 2017 10:59:14 -0400
+
+notmuch (0.25-1) unstable; urgency=medium
+
+  * New upstream release
+    - regexp search for mid, paths, tags
+    - drop inline images when indexing html
+
+ -- David Bremner <bremner@debian.org>  Tue, 25 Jul 2017 08:28:20 -0300
+
+notmuch (0.25~rc1-2) unstable; urgency=low
+
+  * upload to unstable
+
+ -- David Bremner <bremner@debian.org>  Tue, 18 Jul 2017 19:47:45 -0300
+
+notmuch (0.25~rc1-1) experimental; urgency=medium
+
+  * Bump standards version to 4.0.0 (no changes needed)
+  * New upstream release candidate
+
+ -- David Bremner <bremner@debian.org>  Tue, 18 Jul 2017 07:04:14 -0300
+
+notmuch (0.25~rc0-2) experimental; urgency=medium
+
+  * Fix compilation on 32 bit architectures (time_t vs. gint64)
+
+ -- David Bremner <bremner@debian.org>  Mon, 17 Jul 2017 08:49:32 -0300
+
+notmuch (0.25~rc0-1) experimental; urgency=medium
+
+  * New upstream release candidate
+  * Drop notmuch-dbg, use notmuch-dbgsym if debug symbols are needed.
+  * [lib] Bump SONAME to libnotmuch.so.5
+  * Bug fix: "doesn't check gpg/pgp signatures by default", thanks
+    to Vagrant Cascadian (Closes: #755544).
+  * Bug fix: "allow separation of command-line options and their
+    values: --option foo", thanks to Paul Wise (Closes: #825886).
+
+ -- 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.
@@ -55,6 +129,12 @@ notmuch (0.24~rc0-1) experimental; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Sun, 05 Mar 2017 19:32:08 -0400
 
+notmuch (0.23.7-3) unstable; urgency=medium
+
+  * Cherry pick fixes to dump header from 0.24.1
+
+ -- David Bremner <bremner@debian.org>  Sat, 01 Apr 2017 21:09:36 -0300
+
 notmuch (0.23.7-2) unstable; urgency=medium
 
   * Cherry pick 06adc276, fix use after free in libnotmuch4
diff --git a/debian/control b/debian/control
index e71a6716..20b8a2db 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  debhelper (>= 9),
  pkg-config,
  libxapian-dev,
- libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev,
+ libgmime-3.0-dev | libgmime-2.6-dev (>= 2.6.7~),
  libtalloc-dev,
  libz-dev,
  python-all (>= 2.6.6-3~),
@@ -20,6 +20,7 @@ Build-Depends:
  dh-elpa (>= 1.3),
  python-sphinx (>= 1.0),
  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],
@@ -27,15 +28,15 @@ Build-Depends:
  gpgsm <!nocheck>,
  gnupg <!nocheck>,
  bash-completion (>=1.9.0~)
-Standards-Version: 3.9.6
+Standards-Version: 4.0.0
 Homepage: https://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
 Vcs-Browser: https://git.notmuchmail.org/git/notmuch
 
 Package: notmuch
 Architecture: any
-Depends: libnotmuch4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: notmuch-emacs | notmuch-vim | notmuch-mutt | alot,  gnupg-agent, gpgsm
+Depends: libnotmuch5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: elpa-notmuch | notmuch-vim | notmuch-mutt | alot,  gnupg-agent, gpgsm
 Description: thread-based email index, search and tagging
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
@@ -44,7 +45,7 @@ Description: thread-based email index, search and tagging
  .
  This package contains the notmuch command-line interface
 
-Package: libnotmuch4
+Package: libnotmuch5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -61,7 +62,7 @@ Description: thread-based email index, search and tagging (runtime)
 Package: libnotmuch-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libnotmuch4 (= ${binary:Version})
+Depends: ${misc:Depends}, libnotmuch5 (= ${binary:Version})
 Description: thread-based email index, search and tagging (development)
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
@@ -74,8 +75,8 @@ Description: thread-based email index, search and tagging (development)
 Package: python-notmuch
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python:Depends}, libnotmuch4 (>= ${source:Version})
-Description: python interface to the notmuch mail search and index library
+Depends: ${misc:Depends}, ${python:Depends}, libnotmuch5 (>= ${source:Version})
+Description: Python interface to the notmuch mail search and index library
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
  the Xapian library to provide fast, full-text search with a very
@@ -87,7 +88,7 @@ Description: python interface to the notmuch mail search and index library
 Package: python3-notmuch
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch4 (>= ${source:Version})
+Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch5 (>= ${source:Version})
 Description: Python 3 interface to the notmuch mail search and index library
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
@@ -111,8 +112,10 @@ Description: Ruby interface to the notmuch mail search and index library
  functionality, directly interfacing with a shared notmuch library.
 
 Package: notmuch-emacs
+Section: oldlibs
+Priority: extra
 Architecture: all
-Depends: elpa-notmuch
+Depends: elpa-notmuch, ${misc:Depends}
 Description: thread-based email index, search and tagging (transitional package)
  This dummy package help ease transition to the new package elpa-notmuch
 
@@ -130,7 +133,6 @@ Description: thread-based email index, search and tagging (emacs interface)
 
 Package: notmuch-vim
 Architecture: all
-Section: mail
 Breaks: notmuch (<<0.6~254~)
 Replaces: notmuch (<<0.6~254~)
 Depends: ${misc:Depends}, notmuch, vim-addon-manager, vim-ruby, ruby-notmuch
@@ -162,17 +164,3 @@ Description: thread-based email index, search and tagging (Mutt interface)
  a fresh Maildir containing its search results only. The second one is
  the ability to reconstruct threads on the fly starting from the
  current highlighted mail.
-
-Package: notmuch-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libnotmuch4 (= ${binary:Version})
-Description: thread-based email index, search and tagging - debugging symbols
- Notmuch is a system for indexing, searching, reading, and tagging
- large collections of email messages in maildir or mh format. It uses
- the Xapian library to provide fast, full-text search with a very
- convenient search syntax.
- .
- This package contains the debugging symbols for libnotmuch and the
- notmuch binary. Most people will not need this package.
diff --git a/debian/copyright b/debian/copyright
index 1cc7a155..0931d9b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Debianized-By: Jameson Graef Rollins <jrollins@finestructure.net>
-Debianized-Date: Fri Nov 28 18:00:00 EDT 2009
-Original-Source: git://notmuchmail.org/git/notmuch
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: notmuch
+Source: git://notmuchmail.org/git/notmuch
+Upstream-Contact: Notmuch Mailing List <notmuch@notmuchmail.org>
 
 Files: *
 Copyright:  Copyright 2009 Carl Worth <cworth@cworth.org>
@@ -31,19 +31,12 @@ Copyright:  Copyright 2009 Carl Worth <cworth@cworth.org>
  Holger Freyther <zecke@selfish.org>
  David Bremner <bremner@unb.ca>
  Alexander Botero-Lowry <alexbl@fortitudo.(none)>
-
 License: GPL-3+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 3 can be found in file "/usr/share/common-licenses/GPL-3".
 
 Files: debian/*
 Copyright:  Copyright 2010 Jameson Graef Rollins <jrollins@finestructure.net>
  martin f. krafft <madduck@debian.org>
+License: GPL-3+
 
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
diff --git a/debian/libnotmuch4.install b/debian/libnotmuch5.install
index a513b475..a513b475 100644
--- a/debian/libnotmuch4.install
+++ b/debian/libnotmuch5.install
diff --git a/debian/libnotmuch4.symbols b/debian/libnotmuch5.symbols
index 9bfec1a1..716d3b86 100644
--- a/debian/libnotmuch4.symbols
+++ b/debian/libnotmuch5.symbols
@@ -1,4 +1,4 @@
-libnotmuch.so.4 libnotmuch4 #MINVER#
+libnotmuch.so.5 libnotmuch5 #MINVER#
  notmuch_built_with@Base 0.23~rc0
  notmuch_config_list_destroy@Base 0.23~rc0
  notmuch_config_list_key@Base 0.23~rc0
@@ -116,6 +116,8 @@ libnotmuch.so.4 libnotmuch4 #MINVER#
  (c++)"typeinfo for Xapian::DatabaseError@Base" 0.24~rc0
  (c++)"typeinfo for Xapian::DatabaseModifiedError@Base" 0.24~rc0
  (c++|optional=present with Xapian 1.4)"typeinfo for Xapian::QueryParserError@Base" 0.23~rc0
+ (c++)"typeinfo for Xapian::QueryParser::add_valuerangeprocessor(Xapian::ValueRangeProcessor*)::ShimRangeProcessor@Base" 0.25~rc0
+ (c++)"typeinfo name for Xapian::QueryParser::add_valuerangeprocessor(Xapian::ValueRangeProcessor*)::ShimRangeProcessor@Base" 0.25~rc0
  (c++)"typeinfo name for Xapian::LogicError@Base" 0.6.1
  (c++)"typeinfo name for Xapian::RuntimeError@Base" 0.6.1
  (c++)"typeinfo name for Xapian::DocNotFoundError@Base" 0.6.1
diff --git a/debian/notmuch-emacs.maintscript b/debian/notmuch-emacs.maintscript
new file mode 100644
index 00000000..6f93feb7
--- /dev/null
+++ b/debian/notmuch-emacs.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/emacs/site-start.d/50notmuch.el
diff --git a/debian/notmuch.dirs b/debian/notmuch.dirs
index a23e43d9..e7724817 100644
--- a/debian/notmuch.dirs
+++ b/debian/notmuch.dirs
@@ -1,2 +1 @@
 usr/bin
-etc/bash_completion.d
diff --git a/debian/notmuch.emacsen-startup b/debian/notmuch.emacsen-startup
deleted file mode 100644
index 60bf9968..00000000
--- a/debian/notmuch.emacsen-startup
+++ /dev/null
@@ -1,28 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50notmuch.el
-;; for the Debian notmuch package
-
-;; The notmuch package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...).  The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-
-(cond
- ((not (file-exists-p "/usr/share/emacs/site-lisp/notmuch"))
-  (message "Package notmuch removed but not purged.  Skipping setup."))
- ((not (file-exists-p (concat "/usr/share/"
-			      (symbol-name debian-emacs-flavor)
-			      "/site-lisp/notmuch")))
-  (message "Package notmuch not fully installed.  Skipping setup."))
- (t
-  (debian-pkg-add-load-path-item
-   (concat "/usr/share/"
-	   (symbol-name debian-emacs-flavor)
-	   "/site-lisp/notmuch"))
-  (autoload 'notmuch "notmuch" "Run notmuch and display saved searches, known tags, etc." t)
-  (autoload 'notmuch-hello "notmuch" "Run notmuch and display saved searches, known tags, etc." t)
-  (autoload 'notmuch-search "notmuch" "Run \"notmuch search\" with the given query string and display results." t)
-  (autoload 'notmuch-show "notmuch" "Run \"notmuch show\" with the given thread ID and display results." t)
-
-  ))
diff --git a/debian/notmuch.install b/debian/notmuch.install
index 86e891d4..31b9a37e 100644
--- a/debian/notmuch.install
+++ b/debian/notmuch.install
@@ -1,3 +1,3 @@
 usr/bin
 usr/share/man
-etc/bash_completion.d
+usr/share/bash-completion
diff --git a/debian/notmuch.lintian-overrides b/debian/notmuch.lintian-overrides
new file mode 100644
index 00000000..fb5bc076
--- /dev/null
+++ b/debian/notmuch.lintian-overrides
@@ -0,0 +1,2 @@
+# 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
diff --git a/debian/notmuch.maintscript b/debian/notmuch.maintscript
new file mode 100644
index 00000000..6f93feb7
--- /dev/null
+++ b/debian/notmuch.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/emacs/site-start.d/50notmuch.el
diff --git a/debian/rules b/debian/rules
index a915179b..1ac6498c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,3 @@ override_dh_auto_install:
 	dh_auto_install --sourcedirectory bindings/python
 	cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp
 	dh_auto_install --sourcedirectory bindings/ruby
-
-override_dh_strip:
-	dh_strip --dbg-package notmuch-dbg