[PATCH 1/9] Drop duplicate Section header for notmuch-vim

[PATCH 1/9] Drop duplicate Section header for notmuch-vim

[Daniel Kahn Gillmor]

Resolves lintian binary-control-field-duplicates-source
---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 4e1feba1..8e55d669 100644
--- a/debian/control
+++ b/debian/control
@@ -130,7 +130,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
-- 
2.13.2

[PATCH 2/9] Bump standards version to 4.0.0 (no changes needed)

[Daniel Kahn Gillmor]

Some things that might be interesting (and are acceptable and
supported under 4.0.0, though not required) are:

 * supporting DEB_BUILD_OPTIONS tag nodoc wihle tagging build-deps (we
   could put python-sphinx into <!nodoc>, for example)

 * splitting out Build-Depends-Arch from Build-Depends
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 8e55d669..3700c04d 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ 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
-- 
2.13.2

[PATCH 3/9] explicitly mark notmuch-emacs as transitional

[Daniel Kahn Gillmor]

---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 3700c04d..a30f4fcc 100644
--- a/debian/control
+++ b/debian/control
@@ -111,6 +111,8 @@ 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
 Description: thread-based email index, search and tagging (transitional package)
-- 
2.13.2

[PATCH 4/9] fix Python capitalization

[Daniel Kahn Gillmor]

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index a30f4fcc..8581b506 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Package: python-notmuch
 Architecture: all
 Section: python
 Depends: ${misc:Depends}, ${python:Depends}, libnotmuch5 (>= ${source:Version})
-Description: python interface to the notmuch mail search and index library
+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
-- 
2.13.2

[PATCH 5/9] Fix orthography

[Daniel Kahn Gillmor]

---
 bindings/python/docs/source/query.rst | 2 +-
 bindings/python/notmuch/thread.py     | 2 +-
 doc/man1/notmuch-address.rst          | 2 +-
 doc/man1/notmuch-insert.rst           | 2 +-
 doc/man1/notmuch-new.rst              | 2 +-
 doc/man1/notmuch.rst                  | 2 +-
 lib/notmuch.h                         | 2 +-
 test/README                           | 6 +++---
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bindings/python/docs/source/query.rst b/bindings/python/docs/source/query.rst
index 044b5735..785e984b 100644
--- a/bindings/python/docs/source/query.rst
+++ b/bindings/python/docs/source/query.rst
@@ -29,7 +29,7 @@
    .. attribute::  sort
 
       Instance attribute :attr:`sort` contains the sort order (see
-      :attr:`Query.SORT`) if explicitely specified via
+      :attr:`Query.SORT`) if explicitly specified via
       :meth:`set_sort`. By default it is set to `None`.
 
    .. automethod:: exclude_tag
diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py
index cc151f7e..ed961885 100644
--- a/bindings/python/notmuch/thread.py
+++ b/bindings/python/notmuch/thread.py
@@ -245,7 +245,7 @@ class Thread(object):
 
         The :class:`Tags` object is owned by the thread and as such, will only
         be valid for as long as this :class:`Thread` is valid (e.g. until the
-        query from which it derived is explicitely deleted).
+        query from which it derived is explicitly deleted).
 
         :returns: A :class:`Tags` iterator.
         :raises: :exc:`NotInitializedError` if query is not initialized
diff --git a/doc/man1/notmuch-address.rst b/doc/man1/notmuch-address.rst
index 446cefbd..cc31cc5a 100644
--- a/doc/man1/notmuch-address.rst
+++ b/doc/man1/notmuch-address.rst
@@ -60,7 +60,7 @@ Supported options for **address** include
         Control the deduplication of results.
 
         **no**
-            Output all occurences of addresses in the matching
+            Output all occurrences of addresses in the matching
             messages. This is not applicable with --output=count.
 
         **mailbox**
diff --git a/doc/man1/notmuch-insert.rst b/doc/man1/notmuch-insert.rst
index 9847e674..f79600d6 100644
--- a/doc/man1/notmuch-insert.rst
+++ b/doc/man1/notmuch-insert.rst
@@ -65,7 +65,7 @@ errors most likely to be temporary in nature, e.g. failure to get a
 database write lock.
 
 ``75 (EX_TEMPFAIL)``
-    A temporary failure occured; the user is invited to retry.
+    A temporary failure occurred; the user is invited to retry.
 
 The exit status of the **post-insert** hook does not affect the exit
 status of the **insert** command.
diff --git a/doc/man1/notmuch-new.rst b/doc/man1/notmuch-new.rst
index 7f0b2237..6acfa112 100644
--- a/doc/man1/notmuch-new.rst
+++ b/doc/man1/notmuch-new.rst
@@ -49,7 +49,7 @@ EXIT STATUS
 This command supports the following special exit status code
 
 ``75 (EX_TEMPFAIL)``
-    A temporary failure occured; the user is invited to retry.
+    A temporary failure occurred; the user is invited to retry.
 
 SEE ALSO
 ========
diff --git a/doc/man1/notmuch.rst b/doc/man1/notmuch.rst
index 5e238ae4..cb350d1a 100644
--- a/doc/man1/notmuch.rst
+++ b/doc/man1/notmuch.rst
@@ -123,7 +123,7 @@ If the given command is not known to notmuch, notmuch tries to execute
 the external **notmuch-<subcommand>** in ${PATH} instead. This allows
 users to have their own notmuch related tools to be run via the
 notmuch command. By design, this does not allow notmuch's own commands
-to be overriden using external commands.
+to be overridden using external commands.
 
 OPTION SYNTAX
 -------------
diff --git a/lib/notmuch.h b/lib/notmuch.h
index e1745444..d813612b 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -829,7 +829,7 @@ notmuch_query_get_sort (const notmuch_query_t *query);
  * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured.
  *      Most likely a problem lazily parsing the query string.
  *
- * NOTMUCH_STATUS_IGNORED: tag is explicitely present in the query, so
+ * NOTMUCH_STATUS_IGNORED: tag is explicitly present in the query, so
  *		not excluded.
  */
 notmuch_status_t
diff --git a/test/README b/test/README
index f2499bce..8e06f442 100644
--- a/test/README
+++ b/test/README
@@ -26,7 +26,7 @@ that you know if you break anything.
   - gpg(1)
   - python(1)
 
-If your system lacks these tools or have older, non-upgreable versions
+If your system lacks these tools or have older, non-upgradable versions
 of these, please (possibly compile and) install these to some other
 path, for example /usr/local/bin or /opt/gnu/bin. Then prepend the
 chosen directory to your PATH before running the tests.
@@ -144,9 +144,9 @@ remaining tests to be unaffected.
 
 Currently we do not consider skipped tests as build failures. For
 maximum robustness, when setting up automated build processes, you
-should explicitely skip tests, rather than relying on notmuch's
+should explicitly skip tests, rather than relying on notmuch's
 detection of missing prerequisites. In the future we may treat tests
-unable to run because of missing prerequisites, but not explicitely
+unable to run because of missing prerequisites, but not explicitly
 skipped by the user, as failures.
 
 Writing Tests
-- 
2.13.2

[PATCH 6/9] resolve lintian tag debhelper-but-no-misc-depends notmuch-emacs

[Daniel Kahn Gillmor]

This is likely not strictly necessary given that notmuch-emacs is a
transitional package.  But having a simple consistency until we
eventually remove the transitional notmuch-emacs package seems ok too,
and fewer arbitrary lintian warnings will make real lintian warnings
more visible.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 8581b506..248b2c5f 100644
--- a/debian/control
+++ b/debian/control
@@ -114,7 +114,7 @@ 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
 
-- 
2.13.2

[PATCH 7/9] avoid false lintian warning about "iff"

[Daniel Kahn Gillmor]

---
 debian/notmuch.lintian-overrides | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 debian/notmuch.lintian-overrides

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
-- 
2.13.2

[PATCH 8/9] fix the generated documentation output

[Daniel Kahn Gillmor]

---
 lib/notmuch.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/notmuch.h b/lib/notmuch.h
index d813612b..17f0872e 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -1568,11 +1568,11 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message);
  * its filename ends with the sequence ":2," followed by zero or more
  * of the following single-character flags (in ASCII order):
  *
- *   'D' iff the message has the "draft" tag
- *   'F' iff the message has the "flagged" tag
- *   'P' iff the message has the "passed" tag
- *   'R' iff the message has the "replied" tag
- *   'S' iff the message does not have the "unread" tag
+ *   * flag 'D' iff the message has the "draft" tag
+ *   * flag 'F' iff the message has the "flagged" tag
+ *   * flag 'P' iff the message has the "passed" tag
+ *   * flag 'R' iff the message has the "replied" tag
+ *   * flag 'S' iff the message does not have the "unread" tag
  *
  * Any existing flags unmentioned in the list above will be preserved
  * in the renaming.
-- 
2.13.2

[PATCH 9/9] use modern debian/copyright

[Daniel Kahn Gillmor]

---
 debian/copyright | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

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
-- 
2.13.2

Re: [PATCH 9/9] use modern debian/copyright

[David Bremner]

Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:

> ---
>  debian/copyright | 17 +++++------------
>  1 file changed, 5 insertions(+), 12 deletions(-)

pushed the series, with a changelog amendment for the standards bump