Merge branch 'release'

[notmuch] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f78cd02834556cb99fca812e5039a62d2c733a15..4e6cda69976eaaafe62450fcba1bdbfb7e9900c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,32 @@
-notmuch (0.26-1) UNRELEASED; urgency=medium
+notmuch (0.26.1-1) unstable; urgency=medium
 
-  * New upstream release
+  * Bump LIBRARY_MINOR_VERSION to 1, for new functions in 0.26
+
+ -- David Bremner <bremner@debian.org>  Mon, 02 Apr 2018 08:08:01 -0300
+
+notmuch (0.26-1) unstable; urgency=medium
+
+  [ 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
 
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sun, 07 Jan 2018 09:36:24 -0500
+ -- 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>  Sat, 06 Jan 2018 09:39:17 -0400
+ -- David Bremner <bremner@debian.org>  Tue, 09 Jan 2018 07:13:11 -0400
 
 notmuch (0.26~rc1-1) experimental; urgency=medium
 
@@ -523,7 +535,7 @@ notmuch (0.18-3) unstable; urgency=medium
 notmuch (0.18-2) unstable; urgency=medium
 
   * Disable atomicity tests on armhf. These should be re-enabled when
-    upstream relases a fix for this (in progress).
+    upstream releases a fix for this (in progress).
 
  -- David Bremner <bremner@debian.org>  Thu, 08 May 2014 08:28:33 +0900
 
@@ -944,7 +956,7 @@ notmuch (0.6.1-1) unstable; urgency=low
 notmuch (0.6) unstable; urgency=low
 
   * New upstream release; see /usr/share/doc/notmuch/NEWS for
-    details. Hilights include:
+    details. Highlights include:
     - Folder-based search (Closes: #597222)
     - PGP/MIME decryption and verification
   * Document strict dependency on emacs23 (Closes: #631994).