Merge branch 'release'

[notmuch] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5f02d7a7b266a954cd14ae4ff48b889f04cda6cf..2a05152f5dbc92900d2315e4e532ccb42835f54e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+notmuch (0.26.2-1) UNRELEASED; urgency=medium
+
+  * Break reference loops when indexing, fixes INTERNAL_ERROR in "notmuch show"
+  * Don't call get_mset(0,0,X), fixes crash on some gcc8 using distros
+
+ -- David Bremner <bremner@debian.org>  Thu, 26 Apr 2018 22:41:37 -0300
+
+notmuch (0.26.1-1) unstable; urgency=medium
+
+  * 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 ]
@@ -529,7 +542,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
 
@@ -950,7 +963,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).