Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by hand for date of 0.12 release.

diff --git a/NEWS b/NEWS
index 5cfe22202a5c8c6eda87e50fe381705cf86aec54..631cf1d5219b1029fa116467e8c9bc5d658fe1a6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -52,7 +52,7 @@ Reply improvement using the JSON format
   reply body, and it will quote HTML parts if no text/plain parts are
   available.
 
-Notmuch 0.12 (2012-xx-xx)
+Notmuch 0.12 (2012-03-20)
 =========================
 
 Command-Line Interface
@@ -74,6 +74,12 @@ Mail store folder/file ignore
    NOTE: *Every* file/directory that goes by one of those names will
    be ignored, independent of its depth/location in the mail store.
 
+Unified help and manual pages
+
+   The notmuch help command now runs man for the appropriate page.  If
+   you install notmuch somewhere "unusual", you may need to update
+   MANPATH.
+
 Manual page for notmuch configuration options
 
   The notmuch CLI configuration file options are now documented in the
@@ -188,8 +194,10 @@ Build fixes
 Compatibility with GMime 2.6
 
   It is now possible to build notmuch against both GMime 2.4 and 2.6.
-  However, a bug in current GMime 2.6 causes notmuch not to report
-  signatures where the signer key is unavailable (GNOME bug 668085).
+  However, a bug in GMime 2.6 before 2.6.5 causes notmuch not to
+  report signatures where the signer key is unavailable (GNOME bug
+  668085).  For compatibility with GMime 2.4's tolerance of "From "
+  headers we require GMime 2.6 >= 2.6.7.
 
 Notmuch 0.11.1 (2012-02-03)
 ===========================

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 8f7eb87c52e768811c54f4ee2f26218e55b56958..24e1d4c9890d6d78f42ecef4b88fa5c690c92c9b 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.12~rc2'
+__VERSION__ = '0.12'

diff --git a/debian/changelog b/debian/changelog
index 9cf58ae7d7a03dbeb834efd127fa363fe7da7562..f2db1a7ab6c47d1935daacfc84ae6a2127fc4ed5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+notmuch (0.12-1) unstable; urgency=low
+
+  * New upstream release
+    - Python 3.2 support
+    - GMime 2.6 support
+    - Many updates to emacs interface (see /usr/share/doc/notmuch/NEWS)
+    - Ignore files/directories with mail hierarchy
+
+ -- David Bremner <bremner@debian.org>  Mon, 19 Mar 2012 22:41:58 -0300
+
 notmuch (0.12~rc2-1) experimental; urgency=low
 
   * Upstream pre-release

diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index a8c17d811575c77c62318ac825690c6f486de5e0..395cb9c4e1d320ae0bb9dd99e4a6b60c7362d38d 100644 (file)
--- a/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-CONFIG 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-CONFIG 1 2012-03-19 "Notmuch 0.12"
 .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 302a7fa7152db6b8f25e05a04fae2fea855896f4..35ecc5323497306eb60c6491941188260f757924 100644 (file)
--- a/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-COUNT 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-COUNT 1 2012-03-19 "Notmuch 0.12"
 .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 7cfe08e114402f9b928a3e4e266b2ce4ffbc8b9a..f479e8bfe082075b1fea6b118bba29943a61d89d 100644 (file)
--- a/man/man1/notmuch-dump.1
+++ b/man/man1/notmuch-dump.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-DUMP 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-DUMP 1 2012-03-19 "Notmuch 0.12"
 .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 1158bb281b072b16d59ff2522b8d7bd4c0ca7724..613658d2ab80dce85ecad5aa657f5650eb037619 100644 (file)
--- a/man/man1/notmuch-new.1
+++ b/man/man1/notmuch-new.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-NEW 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-NEW 1 2012-03-19 "Notmuch 0.12"
 .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 7ee3cebcd58467c1679f666ff49dc3ead6d70db4..8666549b5aec14b7965f79baf5559d428375a779 100644 (file)
--- a/man/man1/notmuch-reply.1
+++ b/man/man1/notmuch-reply.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-REPLY 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-REPLY 1 2012-03-19 "Notmuch 0.12"
 .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 333f48820f33e683e349f2c87790bcc95b5d3cfd..db0b697e935d58915b1344c85a97ca3cb446b3d0 100644 (file)
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-RESTORE 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-RESTORE 1 2012-03-19 "Notmuch 0.12"
 .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 1b0c415f07352cc25b1a83a57048f30385d8ba86..06d81a6f27889bd7b687c77734dc3eb9258aa239 100644 (file)
--- a/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SEARCH 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-SEARCH 1 2012-03-19 "Notmuch 0.12"
 .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 1215f9197b379d91fe7bc00d02dc8d0fd02a61a5..b81cce698379981b82b36623f98a6af856232b2b 100644 (file)
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SHOW 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-SHOW 1 2012-03-19 "Notmuch 0.12"
 .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 8a010e4df91f68c8d03a36a97bf20305ef1d0927..aa4546e46254749dca2b68b33860650900b350e7 100644 (file)
--- a/man/man1/notmuch-tag.1
+++ b/man/man1/notmuch-tag.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-TAG 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-TAG 1 2012-03-19 "Notmuch 0.12"
 .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 3984314c048a162b01c32d8f8977eef00d763aa3..2afcc771ca06e384fe6ae65791cd3e23eaa2d193 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-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH 1 2012-03-19 "Notmuch 0.12"
 .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 2397c7e395e99ca6b8ad8fde1178289f13ccf4fa..9662bdebf95f608f471e5020a1552be8b84edcb0 100644 (file)
--- a/man/man5/notmuch-hooks.5
+++ b/man/man5/notmuch-hooks.5
@@ -1,4 +1,4 @@
-.TH NOTMUCH-HOOKS 5 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-HOOKS 5 2012-03-19 "Notmuch 0.12"
 
 .SH NAME
 notmuch-hooks \- hooks for notmuch

diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7
index a2dde70439d755e55b770b9dd7e63f828e0d33e9..37ba9bb1df5eb934d56abeb8ef71ca672a484f07 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-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-SEARCH-TERMS 7 2012-03-19 "Notmuch 0.12"
 
 .SH NAME
 notmuch-search-terms \- Syntax for notmuch queries

diff --git a/version b/version
index d885035312feb53e04df7ada89492ad5639e6f28..c43e1055fd3f2e00540c298404934e8097459098 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.12~rc2
+0.12