Merge branch 'release'

diff --git a/NEWS b/NEWS
index abb850e4bad482ecc82d98803f5329e5d3db39d6..18252e4aef27cd9e79e4146b7939a0e2afd0230e 100644 (file)
--- 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 85fc38763cf08c8570d90df5ea1e4a4ecb18d25f..d1e58361391722986cfcd6dc8332748e56cd8e18 100644 (file)
--- 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 (file)
index 0000000..3d57a08
--- /dev/null
+++ b/contrib/.gitattributes
@@ -0,0 +1 @@
+notmuch-deliver export-ignore

diff --git a/debian/changelog b/debian/changelog
index c4f96edee1fe9ad5cfc52e7189d57eab71a651c2..d0d144e96e7e910ba60f49f324b217b34c6cc4ca 100644 (file)
--- 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 bb20c220b45efc3870fa17a3d5a236bcaa9e3b51..d64dd1e78f3672ebb8be16ce4165c9c814e43bc5 100644 (file)
--- 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 7eee7719a2b998f42fa4820a89c2f16875f7c7ce..68c123cf10e0a36b6036c9fbc30275960d19e749 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.10~rc2
+0.10