Merge tag '0.12_rc2'

notmuch 0.12~rc2 release

diff --git a/bindings/python/notmuch/directory.py b/bindings/python/notmuch/directory.py
index 0c5e015e0e01feb9da330e08c2de951f54ed7797..284cbdced126952587110f71d8e49d38d4bcd8be 100644 (file)
--- 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 690206ef5a9668b6e09ff1b052e7941e373dff75..225f524651a9df3c4f1b22141066ca0631def2c9 100644 (file)
--- 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"""

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index e58a1b536bc088bc86ae5495731f1fec930008e4..8f7eb87c52e768811c54f4ee2f26218e55b56958 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.12~rc1'
+__VERSION__ = '0.12~rc2'

diff --git a/debian/changelog b/debian/changelog
index 147ae36809c13a61650cd72791e9049120641572..9cf58ae7d7a03dbeb834efd127fa363fe7da7562 100644 (file)
--- 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.

diff --git a/lib/database.cc b/lib/database.cc
index 8f8df1a1434ed604ca2fe1a7bdf5f87b7084a28d..16c4354f2448bbc39bff3a1c3f630b4775575cd4 100644 (file)
--- 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 {

diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index d22988a7f9e5c09950c29d6fe87b73ecdff13a06..a8c17d811575c77c62318ac825690c6f486de5e0 100644 (file)
--- 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 f593065a6038bd004f9660a67d445bd7bcba1b1a..302a7fa7152db6b8f25e05a04fae2fea855896f4 100644 (file)
--- 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 4e24392c2eb41067119a055b65dcc9e743b5b9cc..7cfe08e114402f9b928a3e4e266b2ce4ffbc8b9a 100644 (file)
--- 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 19cef3d7bc46e27370f3a53da5e85505573dea35..1158bb281b072b16d59ff2522b8d7bd4c0ca7724 100644 (file)
--- 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 0fb68b41c80f4795bed64e2299218c649ff1619b..deb3ae1d8494de8b7cfba8c162b0a0d7dab59642 100644 (file)
--- 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 bcb765c1a6eedb10e4dbdba0ef2de6b3f3541126..333f48820f33e683e349f2c87790bcc95b5d3cfd 100644 (file)
--- 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 c62ad18511b43eaf2e195fd441e5ccde994da6de..1b0c415f07352cc25b1a83a57048f30385d8ba86 100644 (file)
--- 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 ebdd189fa0980710990ddd42810ba83a7f7e1061..7bf1d569464beac02d47ed1a48592c77f8455ee3 100644 (file)
--- 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 9f62222b90583512fadbd8a802c7f8b44020a216..8a010e4df91f68c8d03a36a97bf20305ef1d0927 100644 (file)
--- 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 6fd20e0f195eb0c57d1bc911d3b666fe598a9e66..3984314c048a162b01c32d8f8977eef00d763aa3 100644 (file)
--- 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 ab40443d68bbfb27d043747dcfd5466f0c937062..2397c7e395e99ca6b8ad8fde1178289f13ccf4fa 100644 (file)
--- 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 1d430429632ad30dc614401b97bbe54168b1092b..a2dde70439d755e55b770b9dd7e63f828e0d33e9 100644 (file)
--- 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 0d4c53f12e33af2e8fe1839b6a828c476afce75f..d885035312feb53e04df7ada89492ad5639e6f28 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.12~rc1
+0.12~rc2