aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2011-11-23 16:02:47 -0400
committerGravatar David Bremner <bremner@debian.org>2011-11-23 16:02:47 -0400
commitb5803e918dbf772536de2bd1017e8888c01bd5a9 (patch)
tree461d79d97157f76b4df1884d2f6a71c10843a270
parenta467c5f071a1a730adc2bd84635dfc608c26ace9 (diff)
parent9fbc912cc98cfd3977a5ce419ae88948abf8158f (diff)
Merge branch 'release'
-rw-r--r--NEWS7
-rw-r--r--bindings/python/notmuch/version.py2
-rw-r--r--contrib/.gitattributes1
-rw-r--r--debian/changelog11
-rw-r--r--notmuch.12
-rw-r--r--version2
6 files changed, 21 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index abb850e4..18252e4a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.10 (2011-xx-xx)
+Notmuch 0.10 (2011-11-23)
=========================
New build and testing features
@@ -52,6 +52,11 @@ Add keybinding ('c I') for stashing Message-ID's without an id: prefix
Reduces manual labour when stashing them for use outside notmuch.
+Do not query on notmuch-search exit
+
+ It is harmless to kill the external notmuch process, so the user
+ is no longer interrogated when they interrupt a search.
+
Performance
-----------
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 85fc3876..d1e58361 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,2 +1,2 @@
# this file should be kept in sync with ../../../version
-__VERSION__ = '0.10~rc2'
+__VERSION__ = '0.10'
diff --git a/contrib/.gitattributes b/contrib/.gitattributes
new file mode 100644
index 00000000..3d57a081
--- /dev/null
+++ b/contrib/.gitattributes
@@ -0,0 +1 @@
+notmuch-deliver export-ignore
diff --git a/debian/changelog b/debian/changelog
index c4f96ede..d0d144e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+notmuch (0.10-1) unstable; urgency=low
+
+ * New upstream release
+ - search performance improvements
+ - emacs UI improvements
+ - new dump/restore features
+ - new script contrib/nmbug for sharing tags
+ - see /usr/share/doc/notmuch/NEWS for details
+
+ -- David Bremner <bremner@debian.org> Wed, 23 Nov 2011 07:44:01 -0400
+
notmuch (0.10~rc2-1) experimental; urgency=low
* New upstream release candidate
diff --git a/notmuch.1 b/notmuch.1
index bb20c220..d64dd1e7 100644
--- a/notmuch.1
+++ b/notmuch.1
@@ -16,7 +16,7 @@
.\" along with this program. If not, see http://www.gnu.org/licenses/ .
.\"
.\" Author: Carl Worth <cworth@cworth.org>
-.TH NOTMUCH 1 2011-11-17 "Notmuch 0.10~rc2"
+.TH NOTMUCH 1 2011-11-23 "Notmuch 0.10"
.SH NAME
notmuch \- thread-based email index, search, and tagging
.SH SYNOPSIS
diff --git a/version b/version
index 7eee7719..68c123cf 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.10~rc2
+0.10