Merge tag 'debian/0.25-1'

notmuch Debian 0.25-1 upload (same as 0.25)

diff --git a/NEWS b/NEWS
index f844f1a77d93a95fa346689cd82791d5c3914699..a2498d1a765755a7af97ab1df9f223045e95c654 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.25 (UNRELEASED)
+Notmuch 0.25 (2017-07-25)
 =========================
 
 General
@@ -8,7 +8,7 @@ Add regexp searching for mid, paths, and tags.
 
 Skip HTML tags when indexing
 
-    In particular this avoids indexing large inline images.
+  In particular this avoids indexing large inline images.
 
 Command Line Interface
 ----------------------
@@ -20,6 +20,12 @@ Allow space as separator for keyword arguments.
 Emacs
 -----
 
+Support for stashing message timestamp in show and tree views
+
+  Invoking `notmuch-show-stash-date` with a prefix argument
+  stashes the unix timestamp of the current message instead of
+  the date string.
+
 Don't use 'function' as variable name, workaround emacs bug 26406.
 
 Library Changes
@@ -27,14 +33,14 @@ Library Changes
 
 Add workaround for date parsing of bad input in older GMime
 
-    In certain circumstances, older GMime libraries could return
-    negative numbers when parsing syntactically invalid dates.
+  In certain circumstances, older GMime libraries could return
+  negative numbers when parsing syntactically invalid dates.
 
 Replace deprecated functions with status returning versions
 
-    API of notmuch_query_{search,count}_{messages,threads} has
-    changed.  notmuch_query_add_tag_exclude now returns a status
-    value.
+  API of notmuch_query_{search,count}_{messages,threads} has
+  changed.  notmuch_query_add_tag_exclude now returns a status
+  value.
 
 Add support for building against GMime 3.0.
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 15eeef2093765f4103758929fffd2fb202bb1d6b..62dd1f1923683353a7f7d6417dd7ce1b55d96fd1 100644 (file)
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.25~rc1'
+__VERSION__ = '0.25'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index 905e98f2b54a744b58cfd082ed08ecc76e56b8ac..f29ac210ebbfc55de32e643b2d3629ba5690be2b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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

diff --git a/version b/version
index 8550eaa35d2e934a090bd5380d723ccb05666643..7d385d419cc848ee6394256288edbcd8f4f7522a 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.25~rc1
+0.25