From: David Bremner Date: Tue, 20 Mar 2012 01:48:24 +0000 (-0300) Subject: Merge branch 'release' X-Git-Tag: 0.13_rc1~127 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2ee1d8e1c70ce20728bc3faada389a4802636352;hp=eb82b4551ad0c5e808a677d886f58ba2c41f970d Merge branch 'release' Conflicts: NEWS Conflicts resolved by hand for date of 0.12 release. --- diff --git a/NEWS b/NEWS index 5cfe2220..631cf1d5 100644 --- 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 8f7eb87c..24e1d4c9 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.12~rc2' +__VERSION__ = '0.12' diff --git a/debian/changelog b/debian/changelog index 9cf58ae7..f2db1a7a 100644 --- 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 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 a8c17d81..395cb9c4 100644 --- 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 302a7fa7..35ecc532 100644 --- 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 7cfe08e1..f479e8bf 100644 --- 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 1158bb28..613658d2 100644 --- 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 7ee3cebc..8666549b 100644 --- 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 333f4882..db0b697e 100644 --- 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 1b0c415f..06d81a6f 100644 --- 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 1215f919..b81cce69 100644 --- 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 8a010e4d..aa4546e4 100644 --- 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 3984314c..2afcc771 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-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 2397c7e3..9662bdeb 100644 --- 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 a2dde704..37ba9bb1 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-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 d8850353..c43e1055 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.12~rc2 +0.12