Merge branch 'release'

16 files changed, 51 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 668281c5..01067226 100644
--- 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 5945a504..cb1d625e 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'
+__VERSION__ = '0.13.1'
diff --git a/debian/changelog b/debian/changelog
index 720573d4..d00f2387 100644
--- 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 8cc97735..8192b9d5 100644
--- 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 1eb70d15..dd906f30 100644
--- 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 b03f8046..0a72f983 100644
--- 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 37af1467..4127632f 100644
--- 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 593df3bc..895f3895 100644
--- 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 ec16868e..86e23fd8 100644
--- 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 608178c6..25e6a861 100644
--- 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 03a99eac..3a6c02e7 100644
--- 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 346b188a..17e03103 100644
--- 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 465e3242..7465fbd4 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 <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 d9a86c77..e6ea3b2f 100644
--- 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 cbbafc11..eae7c752 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-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 f3040840..c317a918 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.13
+0.13.1