From ea54c4fdc7d0ed9a4d6ab328d44c10ce5668d587 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Sat, 17 Mar 2012 17:41:27 +0100
Subject: [PATCH 1/4] Fix error reporting in
 notmuch_database_find_message_by_filename

Formerly it was possible for *message_ret to be left
uninitialized. The documentation however clearly states that "[o]n any
failure or when the message is not found, this function initializes
'*message' to NULL".

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
---
 lib/database.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/database.cc b/lib/database.cc
index 8f8df1a1..16c4354f 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1825,6 +1825,9 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch,
     if (message_ret == NULL)
 	return NOTMUCH_STATUS_NULL_POINTER;
 
+    /* return NULL on any failure */
+    *message_ret = NULL;
+
     local = talloc_new (notmuch);
 
     try {

From 3a95f3fbc1602d612aec2b7f1095e40c95723aee Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Fri, 16 Mar 2012 13:56:32 +0100
Subject: [PATCH 2/4] python: fix signature of two wrapped libnotmuch functions

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
---
 bindings/python/notmuch/directory.py | 2 +-
 bindings/python/notmuch/threads.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bindings/python/notmuch/directory.py b/bindings/python/notmuch/directory.py
index 0c5e015e..284cbdce 100644
--- a/bindings/python/notmuch/directory.py
+++ b/bindings/python/notmuch/directory.py
@@ -177,7 +177,7 @@ class Directory(object):
 
     _destroy = nmlib.notmuch_directory_destroy
     _destroy.argtypes = [NotmuchDirectoryP]
-    _destroy.argtypes = None
+    _destroy.restype = None
 
     def __del__(self):
         """Close and free the Directory"""
diff --git a/bindings/python/notmuch/threads.py b/bindings/python/notmuch/threads.py
index 690206ef..225f5246 100644
--- a/bindings/python/notmuch/threads.py
+++ b/bindings/python/notmuch/threads.py
@@ -172,7 +172,7 @@ class Threads(Python3StringMixIn):
 
     _destroy = nmlib.notmuch_threads_destroy
     _destroy.argtypes = [NotmuchThreadsP]
-    _destroy.argtypes = None
+    _destroy.restype = None
 
     def __del__(self):
         """Close and free the notmuch Threads"""

From d71cb5e45b2e27dea30bbca167af54f8403ff8a5 Mon Sep 17 00:00:00 2001
From: David Bremner <bremner@debian.org>
Date: Sun, 18 Mar 2012 08:07:00 -0300
Subject: [PATCH 3/4] bump version to 0.12~rc2

---
 bindings/python/notmuch/version.py | 2 +-
 man/man1/notmuch-config.1          | 2 +-
 man/man1/notmuch-count.1           | 2 +-
 man/man1/notmuch-dump.1            | 2 +-
 man/man1/notmuch-new.1             | 2 +-
 man/man1/notmuch-reply.1           | 2 +-
 man/man1/notmuch-restore.1         | 2 +-
 man/man1/notmuch-search.1          | 2 +-
 man/man1/notmuch-show.1            | 2 +-
 man/man1/notmuch-tag.1             | 2 +-
 man/man1/notmuch.1                 | 2 +-
 man/man5/notmuch-hooks.5           | 2 +-
 man/man7/notmuch-search-terms.7    | 2 +-
 version                            | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index e58a1b53..8f7eb87c 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.12~rc1'
+__VERSION__ = '0.12~rc2'
diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index 2205d288..fb023b8c 100644
--- a/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-CONFIG 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-CONFIG 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-config \- Access notmuch configuration file.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1
index 79dd6a5b..383252e3 100644
--- a/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-COUNT 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-COUNT 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-count \- Count messages matching the given search terms.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1
index 4e24392c..7cfe08e1 100644
--- a/man/man1/notmuch-dump.1
+++ b/man/man1/notmuch-dump.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-DUMP 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-DUMP 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-dump \- Creates a plain-text dump of the tags of each message.
 
diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1
index 19cef3d7..1158bb28 100644
--- a/man/man1/notmuch-new.1
+++ b/man/man1/notmuch-new.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-NEW 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-NEW 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-new \- Incorporate new mail into the notmuch database.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1
index 0fb68b41..deb3ae1d 100644
--- a/man/man1/notmuch-reply.1
+++ b/man/man1/notmuch-reply.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-REPLY 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-REPLY 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-reply \- Constructs a reply template for a set of messages.
 
diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1
index bcb765c1..333f4882 100644
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-RESTORE 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-RESTORE 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-restore \- Restores the tags from the given file (see notmuch dump).
 
diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1
index 72874d01..2cf830aa 100644
--- a/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SEARCH 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-SEARCH 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-search \- Search for messages matching the given search terms.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1
index 27a06b7a..48c7e0b2 100644
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SHOW 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-SHOW 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-show \- Show messages matching the given search terms.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1
index 9f62222b..8a010e4d 100644
--- a/man/man1/notmuch-tag.1
+++ b/man/man1/notmuch-tag.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-TAG 1 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-TAG 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch-tag \- Add/remove tags for all messages matching the search terms.
 
diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1
index 6fd20e0f..3984314c 100644
--- a/man/man1/notmuch.1
+++ b/man/man1/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 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH 1 2012-03-18 "Notmuch 0.12~rc2"
 .SH NAME
 notmuch \- thread-based email index, search, and tagging
 .SH SYNOPSIS
diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5
index ab40443d..2397c7e3 100644
--- a/man/man5/notmuch-hooks.5
+++ b/man/man5/notmuch-hooks.5
@@ -1,4 +1,4 @@
-.TH NOTMUCH-HOOKS 5 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-HOOKS 5 2012-03-18 "Notmuch 0.12~rc2"
 
 .SH NAME
 notmuch-hooks \- hooks for notmuch
diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7
index 1d430429..a2dde704 100644
--- a/man/man7/notmuch-search-terms.7
+++ b/man/man7/notmuch-search-terms.7
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SEARCH-TERMS 7 2012-02-29 "Notmuch 0.12~rc1"
+.TH NOTMUCH-SEARCH-TERMS 7 2012-03-18 "Notmuch 0.12~rc2"
 
 .SH NAME
 notmuch-search-terms \- Syntax for notmuch queries
diff --git a/version b/version
index 0d4c53f1..d8850353 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.12~rc1
+0.12~rc2

From 9325cae5f46e543aedb790cfe62a4faabcba949c Mon Sep 17 00:00:00 2001
From: David Bremner <bremner@debian.org>
Date: Sun, 18 Mar 2012 08:16:55 -0300
Subject: [PATCH 4/4] debian: changelog stanza for 0.12~rc2

mention the two bugfixes
---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 147ae368..9cf58ae7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+notmuch (0.12~rc2-1) experimental; urgency=low
+
+  * Upstream pre-release
+  * New bug fixes since ~rc1
+    - fix for uninitialized variable
+    - fix for python bindings type signatures
+
+ -- David Bremner <bremner@debian.org>  Sun, 18 Mar 2012 08:10:35 -0300
+
 notmuch (0.12~rc1-1) experimental; urgency=low
 
   * Upstream pre-release.