diff options
author | David Bremner <bremner@debian.org> | 2011-11-21 07:26:11 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2011-11-21 07:26:11 -0400 |
commit | bdf38b5e0fb9674d482c439c1cdb077cd16cdc96 (patch) | |
tree | fca4e1687f14d7e854c4d1eadaaa49d381f0e808 | |
parent | cef4075404e093c91e6135802430a46ae97462ed (diff) | |
parent | eb88cd977bcfecfc2d4eb16547d21deb839fbae0 (diff) |
Merge branch 'release'
-rw-r--r-- | bindings/python/notmuch/version.py | 2 | ||||
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | notmuch.1 | 2 | ||||
-rw-r--r-- | version | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index feb517b5..85fc3876 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~rc1' +__VERSION__ = '0.10~rc2' diff --git a/debian/changelog b/debian/changelog index 9e70015b..c4f96ede 100644 --- 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. @@ -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 @@ -1 +1 @@ -0.10~rc1 +0.10~rc2 |