Merge tag '0.13.2'

notmuch 0.13.2 release

diff --git a/NEWS b/NEWS
index 01067226aa1cdc2d4c1f40e01b4d53a76bef9329..fb55efb7d30d735dfcab260c3c45d5ac8fd864f6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Notmuch 0.13.2 (2012-06-02)
+===========================
+
+Bug-fix release
+---------------
+
+Update contrib/notmuch-deliver for API changes in 0.13. This fixes a
+compilation error for this contrib package.
+
 Notmuch 0.13.1 (2012-05-29)
 ===========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index cb1d625ee20e136df8e3c37c8886804479fe5571..90bcadbe67ce3a1db0c70cc53b5f8bdb5a4875b9 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.13.1'
+__VERSION__ = '0.13.2'

diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c
index 37d2919a54620e1088fe2100292bb0af3c9d406e..032b9d6297daa14f850b4cccfb83013e53716070 100644 (file)
--- a/contrib/notmuch-deliver/src/main.c
+++ b/contrib/notmuch-deliver/src/main.c
@@ -359,6 +359,7 @@ main(int argc, char **argv)
        GOptionContext *ctx;
        GError *error = NULL;
        notmuch_database_t *db;
+       notmuch_status_t status;
 
        ctx = g_option_context_new("[FOLDER]");
        g_option_context_add_main_entries(ctx, options, PACKAGE);
@@ -429,7 +430,14 @@ main(int argc, char **argv)
                maildir = g_strdup(db_path);
 
        g_debug("Opening notmuch database `%s'", db_path);
-       db = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE);
+       status = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE,
+                                      &db);
+       if (status) {
+           g_critical("Failed to open database `%s': %s",
+                      db_path, notmuch_status_to_string(status));
+           g_free(maildir);
+           return EX_SOFTWARE;
+       }
        g_free(db_path);
        if (db == NULL)
                return EX_SOFTWARE;

diff --git a/debian/changelog b/debian/changelog
index d00f23877b6d0c9cb1d306af82c197d6405c54da..0a57e7d1c00e86fae838043010eba505c94fa107 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.13.2-1) unstable; urgency=low
+
+  * Upstream bugfix release. No changes to binary packages.
+
+ -- David Bremner <bremner@debian.org>  Sat, 02 Jun 2012 18:16:01 -0300
+
 notmuch (0.13.1-1) unstable; urgency=low
 
   * Upstream bugfix release.

diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index 8192b9d553cbe1c3b2a6931962ae226050b05a47..4f7985c37da65418a754e6be03ad3eb4fdb3beb5 100644 (file)
--- a/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-CONFIG 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-CONFIG 1 2012-06-01 "Notmuch 0.13.2"
 .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 dd906f30a2525619ab93ee7ac81147962969cf58..8029174c1dbc45dd2cc38848fe61c6bfd6f4c7e2 100644 (file)
--- a/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-COUNT 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-COUNT 1 2012-06-01 "Notmuch 0.13.2"
 .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 0a72f98367461686a1ffd5a60c8ea1da2da71ccc..9c7dd84b593a54bec43cd7551d2217363c8d5388 100644 (file)
--- a/man/man1/notmuch-dump.1
+++ b/man/man1/notmuch-dump.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-DUMP 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-DUMP 1 2012-06-01 "Notmuch 0.13.2"
 .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 4127632f23916563e86b291c59f50a1102bd03a4..cd83a8835dd20703e906ed2e4e6e1ba87946acbc 100644 (file)
--- a/man/man1/notmuch-new.1
+++ b/man/man1/notmuch-new.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-NEW 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-NEW 1 2012-06-01 "Notmuch 0.13.2"
 .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 895f38952293bac83a103f2ec67370d93eaf254a..fb5114cabf0b499065e3f4c3a1f4af2c6ed43088 100644 (file)
--- a/man/man1/notmuch-reply.1
+++ b/man/man1/notmuch-reply.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-REPLY 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-REPLY 1 2012-06-01 "Notmuch 0.13.2"
 .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 86e23fd818820f1de4088187349c44c45639b55b..3156af762cc0eb7ebcb41feaefed2414e4ccc403 100644 (file)
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-RESTORE 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-RESTORE 1 2012-06-01 "Notmuch 0.13.2"
 .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 25e6a8610821f1d7f15a28e90b7514e223bd21fb..5c72c4ba2ea4149a4ccc48b1c0ecfe7997b781a3 100644 (file)
--- a/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SEARCH 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-SEARCH 1 2012-06-01 "Notmuch 0.13.2"
 .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 3a6c02e7707f2d0f516d8ebda7dbc1f9d0bc89cd..4aab17ca282b0dfc53e5f358d34608de83583de0 100644 (file)
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SHOW 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-SHOW 1 2012-06-01 "Notmuch 0.13.2"
 .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 17e031030282ccf2c40db676f16c04055603426e..27e682ef22dcf63d41e2f9fd17f7c867a94ec820 100644 (file)
--- a/man/man1/notmuch-tag.1
+++ b/man/man1/notmuch-tag.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-TAG 1 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-TAG 1 2012-06-01 "Notmuch 0.13.2"
 .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 7465fbd41d5d9a8c6f2dc41d04b15acb90f667f0..ebea4aa409c165e30c477ce702e1d4f37cb57127 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-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH 1 2012-06-01 "Notmuch 0.13.2"
 .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 e6ea3b2ffc817948b0570ef617ffd2af19e69715..b914a29576c460ac278f02cf655890e5844b56da 100644 (file)
--- a/man/man5/notmuch-hooks.5
+++ b/man/man5/notmuch-hooks.5
@@ -1,4 +1,4 @@
-.TH NOTMUCH-HOOKS 5 2012-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-HOOKS 5 2012-06-01 "Notmuch 0.13.2"
 
 .SH NAME
 notmuch-hooks \- hooks for notmuch

diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7
index eae7c75270cafb9a63edd0b4622a6724415079f4..c559ed68b6573a8c2f24cd86bff80d8689646198 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-05-25 "Notmuch 0.13.1"
+.TH NOTMUCH-SEARCH-TERMS 7 2012-06-01 "Notmuch 0.13.2"
 
 .SH NAME
 notmuch-search-terms \- Syntax for notmuch queries

diff --git a/version b/version
index c317a91891f97e2fe277f61245ff8a7a6d0bd2c5..9beb74d490bcac4ce1c67a584dd97ac4924247ed 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.13.1
+0.13.2