Merge branch 'release'

diff --git a/NEWS b/NEWS
index 668281c55008a72dc8531c754401fa77f9f5332d..01067226aa1cdc2d4c1f40e01b4d53a76bef9329 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+Notmuch 0.13.1 (2012-05-29)
+===========================
+
+Bug-fix release
+---------------
+
+Fix inserting of UTF-8 characters from *text/plain* parts in reply
+
+  While notmuch gained ability to insert content from other than *text/plain*
+  parts of email whenever *text/plain* parts are not available (notably
+  HTML-only emails), replying to mails that do have *text/plain* the
+  non-ASCII characters were incorrectly decoded. This is now fixed.
+
+`notmuch_database_get_directory` and
+`notmuch_database_find_message_by_filename` now work on read-only
+databases
+
+  Previously, these functions attempted to create directory documents
+  that didn't exist and would return an error or abort when given a
+  read-only database.  Now they no longer create directory documents
+  and simply return a `NULL` object if the directory does not exist,
+  as documented.
+
+Fix compilation of ruby bindings.
+
+  Revert to dynamic linking, since the statically linked bindings did
+  not work well.
+
 Notmuch 0.13 (2012-05-15)
 =========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 5945a504079fa3cb5f66dfcf730ebeafa6071757..cb1d625ee20e136df8e3c37c8886804479fe5571 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'
+__VERSION__ = '0.13.1'

diff --git a/debian/changelog b/debian/changelog
index 720573d421f17f40c443901c4e1f42fd0894e4d4..d00f23877b6d0c9cb1d306af82c197d6405c54da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+notmuch (0.13.1-1) unstable; urgency=low
+
+  * Upstream bugfix release.
+    - fix for encoding problems with reply in emacs
+    - notmuch_database_(get_directory|find_message_by_filename) now
+      work for read-only databases.
+
+ -- David Bremner <bremner@debian.org>  Fri, 25 May 2012 21:19:06 -0300
+
 notmuch (0.13-1) unstable; urgency=low
 
   * New upstream release. See /usr/share/doc/notmuch/NEWS.gz for changes.

diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index 8cc9773554dcfe1ade2f5c16dd4f3e5dccd2fa4d..8192b9d553cbe1c3b2a6931962ae226050b05a47 100644 (file)
--- a/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-CONFIG 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-CONFIG 1 2012-05-25 "Notmuch 0.13.1"
 .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 1eb70d15d5178edb7774be51707c3831c85e9105..dd906f30a2525619ab93ee7ac81147962969cf58 100644 (file)
--- a/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-COUNT 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-COUNT 1 2012-05-25 "Notmuch 0.13.1"
 .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 b03f80463a197be88170c6800599c3c999376189..0a72f98367461686a1ffd5a60c8ea1da2da71ccc 100644 (file)
--- a/man/man1/notmuch-dump.1
+++ b/man/man1/notmuch-dump.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-DUMP 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-DUMP 1 2012-05-25 "Notmuch 0.13.1"
 .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 37af1467a4d1d3b9d9503ae29939d6e7a67b5f21..4127632f23916563e86b291c59f50a1102bd03a4 100644 (file)
--- a/man/man1/notmuch-new.1
+++ b/man/man1/notmuch-new.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-NEW 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-NEW 1 2012-05-25 "Notmuch 0.13.1"
 .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 593df3bc60cc0c22a200d794b32d881784894da8..895f38952293bac83a103f2ec67370d93eaf254a 100644 (file)
--- a/man/man1/notmuch-reply.1
+++ b/man/man1/notmuch-reply.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-REPLY 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-REPLY 1 2012-05-25 "Notmuch 0.13.1"
 .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 ec16868ed2aacc59b5fd551c2d7b403d9719603a..86e23fd818820f1de4088187349c44c45639b55b 100644 (file)
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-RESTORE 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-RESTORE 1 2012-05-25 "Notmuch 0.13.1"
 .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 608178c60d959460ecc19e58014b322c1d91ea06..25e6a8610821f1d7f15a28e90b7514e223bd21fb 100644 (file)
--- a/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SEARCH 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-SEARCH 1 2012-05-25 "Notmuch 0.13.1"
 .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 03a99eac307463f2219980e7fb4fc9d211e1d50f..3a6c02e7707f2d0f516d8ebda7dbc1f9d0bc89cd 100644 (file)
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SHOW 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-SHOW 1 2012-05-25 "Notmuch 0.13.1"
 .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 346b188a60ed0e45228458291f0034d4f1d78432..17e031030282ccf2c40db676f16c04055603426e 100644 (file)
--- a/man/man1/notmuch-tag.1
+++ b/man/man1/notmuch-tag.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-TAG 1 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-TAG 1 2012-05-25 "Notmuch 0.13.1"
 .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 465e32423826dd3a72e7637d36052e2ce3772cbf..7465fbd41d5d9a8c6f2dc41d04b15acb90f667f0 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-15 "Notmuch 0.13"
+.TH NOTMUCH 1 2012-05-25 "Notmuch 0.13.1"
 .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 d9a86c775d0fd182881a10abafc7d741d699f9e2..e6ea3b2ffc817948b0570ef617ffd2af19e69715 100644 (file)
--- a/man/man5/notmuch-hooks.5
+++ b/man/man5/notmuch-hooks.5
@@ -1,4 +1,4 @@
-.TH NOTMUCH-HOOKS 5 2012-05-15 "Notmuch 0.13"
+.TH NOTMUCH-HOOKS 5 2012-05-25 "Notmuch 0.13.1"
 
 .SH NAME
 notmuch-hooks \- hooks for notmuch

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

diff --git a/version b/version
index f3040840fd7058ec0e224314c609184fd4ec53f2..c317a91891f97e2fe277f61245ff8a7a6d0bd2c5 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.13
+0.13.1