Merge branch 'release'

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index feb517b50c6d7d2a188ab4b3c8f78ebc38fa636c..85fc38763cf08c8570d90df5ea1e4a4ecb18d25f 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~rc1'
+__VERSION__ = '0.10~rc2'

diff --git a/debian/changelog b/debian/changelog
index 9e70015b27efbbfcbcfed38fd00fac8f0277c368..c4f96edee1fe9ad5cfc52e7189d57eab71a651c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.10~rc2-1) experimental; urgency=low
+
+  * New upstream release candidate
+    - includes patch to avoid long unix domain socket paths in tests
+
+ -- David Bremner <bremner@debian.org>  Sat, 19 Nov 2011 08:21:39 -0400
+
 notmuch (0.10~rc1-1) experimental; urgency=low
 
   * New upstream release candidate.

diff --git a/notmuch.1 b/notmuch.1
index 57612b98fcbec2935d9f78f9e0edb2792ea42b6b..bb20c220b45efc3870fa17a3d5a236bcaa9e3b51 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-21 "Notmuch 0.10"
+.TH NOTMUCH 1 2011-11-17 "Notmuch 0.10~rc2"
 .SH NAME
 notmuch \- thread-based email index, search, and tagging
 .SH SYNOPSIS

diff --git a/version b/version
index bdc34446c22cd97acf77dd3f4036f74c7c653681..7eee7719a2b998f42fa4820a89c2f16875f7c7ce 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.10~rc1
+0.10~rc2