commit eb88cd977bcfecfc2d4eb16547d21deb839fbae0 (patch)
parent 8efdc051 test: create dtach's session socket in $TEST_TMPDIR
tree 426f4c0850d80a23348d4ebfcc45e2f05570a4d2
author David Bremner <bremner@debian.org> 2011-11-19 08:23:40 -0400
committer David Bremner <bremner@debian.org> 2011-11-19 08:24:30 -0400
version: update version info for 0.10~rc2
Arguably editing debian/changelog violates the "do one thing at a
time" rule, but all of these versions need to be kept in sync.
---
bindings/python/notmuch/version.py | 2 +-
debian/changelog | 7 +++++++
notmuch.1 | 2 +-
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.
diff --git a/notmuch.1 b/notmuch.1
index 57612b98..bb20c220 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-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 bdc34446..7eee7719 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.10~rc1
+0.10~rc2
glossary
--------
Commit objects reference one tree, and zero or more parents.
Single parent commits can typically generate a patch in
unified diff format via `git format-patch'.
Multiple parents means the commit is a merge.
Root commits have no ancestor. Note that it is
possible to have multiple root commits when merging independent histories.
Every commit references one top-level tree object.
git clone https://yhetil.org/notmuch.git