From c92e2bcd1c8808a64eac8068d88f0e62cd8c12a6 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 1 Jun 2012 10:16:49 -0400 Subject: notmuch-deliver: Update to new notmuch_database_open API Commit 5fddc07 changed this API, but missed this use of it. --- contrib/notmuch-deliver/src/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c index 37d2919..032b9d6 100644 --- 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; -- cgit v1.2.3 From 9d5f73db7a948ddbed710309e7dc2f7d65d0f7d4 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 2 Jun 2012 18:10:55 -0300 Subject: version: update to 0.13.2 --- 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 cb1d625..90bcadb 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.13.1' +__VERSION__ = '0.13.2' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 8192b9d..4f7985c 100644 --- 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 dd906f3..8029174 100644 --- 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 0a72f98..9c7dd84 100644 --- 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 4127632..cd83a88 100644 --- 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 895f389..fb5114c 100644 --- 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 86e23fd..3156af7 100644 --- 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 25e6a86..5c72c4b 100644 --- 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 928e03c..efd30a0 100644 --- 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 17e0310..27e682e 100644 --- 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 7465fbd..ebea4aa 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 -.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 e6ea3b2..b914a29 100644 --- 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 eae7c75..c559ed6 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-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 c317a91..9beb74d 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.13.1 +0.13.2 -- cgit v1.2.3 From b9effbba387924d51d9437ea8186d78d7825f5a7 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 2 Jun 2012 18:15:06 -0300 Subject: NEWS: update for 0.13.2 --- NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/NEWS b/NEWS index 0106722..fb55efb 100644 --- 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) =========================== -- cgit v1.2.3 From 2ef24acf03fdd73e39d2c233016e71f194affbcf Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 2 Jun 2012 18:17:42 -0300 Subject: debian: changelog stanza for 0.13.2-1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d00f238..0a57e7d 100644 --- 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 Sat, 02 Jun 2012 18:16:01 -0300 + notmuch (0.13.1-1) unstable; urgency=low * Upstream bugfix release. -- cgit v1.2.3