Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by inserting the 0.10.2 stanza before 0.11

diff --git a/Makefile.local b/Makefile.local
index d699463bc7e35b946efe0aaa6da36686b80fd3d0..15e6d8827661c9d736bb754dbe9422a6942e9c31 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -143,7 +143,7 @@ debian-snapshot: TMPFILE := $(shell mktemp)
 debian-snapshot:
        make VERSION=$(VERSION) clean
        cp debian/changelog $(TMPFILE)
-       EDITOR=/bin/true dch -v $(VERSION)+1 -D UNRELEASED 'test build, not for upload'
+       EDITOR=/bin/true dch -b -v $(VERSION)+1 -D UNRELEASED 'test build, not for upload'
        echo '3.0 (native)' > debian/source/format
        debuild -us -uc
        mv -f $(TMPFILE) debian/changelog

diff --git a/NEWS b/NEWS
index 2b2f08a6b799d5ba51a5577fc0a1f44e0126f68e..bb5e4d55f6415a34c1e4a5231799bd62a3a14c7b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,17 @@ Automatic tag query optimization
   suggested that people do this by hand; this is no longer necessary.
 
 
+Notmuch 0.10.2 (2011-12-04)
+===========================
+
+Bug-fix release.
+----------------
+
+Fix crash in python bindings.
+
+    The python bindings did not call g_type_init, which caused crashes
+    for some, but not all users.
+
 Notmuch 0.10.1 (2011-11-25)
 ===========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index a6a872ebaebf674a0ff3041471e058d68284333b..fd414b0a5baa6eba8737db51e86deae6a0383b3f 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.1'
+__VERSION__ = '0.10.2'

diff --git a/debian/changelog b/debian/changelog
index ac5c3314d10c0f7c5a610b2d61f1e248ef2b7c60..0bcade10fb54db412346186ca5a84bde1bd4c9b0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.10.2-1) unstable; urgency=low
+
+  * Upstream bug fix release
+    - Fix segfault in python bindings due to missing g_type_init call.
+
+ -- David Bremner <bremner@debian.org>  Sun, 04 Dec 2011 22:06:46 -0400
+
 notmuch (0.10.1-1) unstable; urgency=low
 
   * Upstream bug fix release.

diff --git a/lib/database.cc b/lib/database.cc
index e4ef14e0c1ee7d7a748e9116de5a20a11e035860..98f101e6e617a04e9b6c26213f7e35a03dd5c0c3 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -26,6 +26,7 @@
 #include <signal.h>
 
 #include <glib.h> /* g_free, GPtrArray, GHashTable */
+#include <glib-object.h> /* g_type_init */
 
 using namespace std;
 
@@ -600,6 +601,9 @@ notmuch_database_open (const char *path,
        goto DONE;
     }
 
+    /* Initialize the GLib type system and threads */
+    g_type_init ();
+
     notmuch = talloc (NULL, notmuch_database_t);
     notmuch->exception_reported = FALSE;
     notmuch->path = talloc_strdup (notmuch, path);

diff --git a/notmuch.1 b/notmuch.1
index 92931d73a998b3b18725da231830ab6408699b17..147319e5ef377a7f7da0c139303f6851e0ada840 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-25 "Notmuch 0.10.1"
+.TH NOTMUCH 1 2011-12-04 "Notmuch 0.10.2"
 .SH NAME
 notmuch \- thread-based email index, search, and tagging
 .SH SYNOPSIS

diff --git a/test/notmuch-test b/test/notmuch-test
index ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570..53ce355cae1dfeed8bd09ef9ef5df46c82e3ebad 100755 (executable)
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -47,6 +47,7 @@ TESTS="
   symbol-hiding
   search-folder-coherence
   atomicity
+  python
 "
 TESTS=${NOTMUCH_TESTS:=$TESTS}
 

diff --git a/test/python b/test/python
new file mode 100755 (executable)
index 0000000..f737749
--- /dev/null
+++ b/test/python
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+test_description="python bindings"
+. ./test-lib.sh
+
+add_email_corpus
+
+test_begin_subtest "compare thread ids"
+LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib \
+PYTHONPATH=$TEST_DIRECTORY/../bindings/python \
+python <<EOF | sort > OUTPUT
+import notmuch
+db = notmuch.Database(mode=notmuch.Database.MODE.READ_WRITE)
+q_new = notmuch.Query(db, 'tag:inbox')
+for t in q_new.search_threads():
+    print t.get_thread_id()
+EOF
+notmuch search --output=threads tag:inbox | sed s/^thread:// | sort > EXPECTED
+test_expect_equal_file OUTPUT EXPECTED
+test_done

diff --git a/version b/version
index 571215736a666e8d79d7a7958b5ffc400514fb53..5eef0f10e8cd5cac36342fc9b6dc9855e024361f 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.10.1
+0.10.2