Merge branch 'release'

merge in debian-only changes

3 files changed, 35 insertions, 30 deletions

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 2fe8bbed..c4b0ca8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.25-7) UNRELEASED; urgency=medium
+
+  * remove obsolete lintian override
+  * reformat debian/NEWS
+
+ -- David Bremner <bremner@debian.org>  Wed, 16 Aug 2017 21:35:44 -0300
+
 notmuch (0.25-6) unstable; urgency=medium
 
   * Bug fix: "deletes shipped file on reinstall:
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