Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by hand for date of 0.12 release.
This commit is contained in:
David Bremner 2012-03-19 22:48:24 -03:00
commit 2ee1d8e1c7
16 changed files with 35 additions and 17 deletions

14
NEWS
View file

@ -52,7 +52,7 @@ Reply improvement using the JSON format
reply body, and it will quote HTML parts if no text/plain parts are reply body, and it will quote HTML parts if no text/plain parts are
available. available.
Notmuch 0.12 (2012-xx-xx) Notmuch 0.12 (2012-03-20)
========================= =========================
Command-Line Interface Command-Line Interface
@ -74,6 +74,12 @@ Mail store folder/file ignore
NOTE: *Every* file/directory that goes by one of those names will NOTE: *Every* file/directory that goes by one of those names will
be ignored, independent of its depth/location in the mail store. 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 Manual page for notmuch configuration options
The notmuch CLI configuration file options are now documented in the The notmuch CLI configuration file options are now documented in the
@ -188,8 +194,10 @@ Build fixes
Compatibility with GMime 2.6 Compatibility with GMime 2.6
It is now possible to build notmuch against both GMime 2.4 and 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 However, a bug in GMime 2.6 before 2.6.5 causes notmuch not to
signatures where the signer key is unavailable (GNOME bug 668085). 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) Notmuch 0.11.1 (2012-02-03)
=========================== ===========================

View file

@ -1,2 +1,2 @@
# this file should be kept in sync with ../../../version # this file should be kept in sync with ../../../version
__VERSION__ = '0.12~rc2' __VERSION__ = '0.12'

10
debian/changelog vendored
View file

@ -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 notmuch (0.12~rc2-1) experimental; urgency=low
* Upstream pre-release * Upstream pre-release

View file

@ -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 .SH NAME
notmuch-config \- Access notmuch configuration file. notmuch-config \- Access notmuch configuration file.
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -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 .SH NAME
notmuch-count \- Count messages matching the given search terms. notmuch-count \- Count messages matching the given search terms.
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -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 .SH NAME
notmuch-dump \- Creates a plain-text dump of the tags of each message. notmuch-dump \- Creates a plain-text dump of the tags of each message.

View file

@ -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 .SH NAME
notmuch-new \- Incorporate new mail into the notmuch database. notmuch-new \- Incorporate new mail into the notmuch database.
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -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 .SH NAME
notmuch-reply \- Constructs a reply template for a set of messages. notmuch-reply \- Constructs a reply template for a set of messages.

View file

@ -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 .SH NAME
notmuch-restore \- Restores the tags from the given file (see notmuch dump). notmuch-restore \- Restores the tags from the given file (see notmuch dump).

View file

@ -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 .SH NAME
notmuch-search \- Search for messages matching the given search terms. notmuch-search \- Search for messages matching the given search terms.
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -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 .SH NAME
notmuch-show \- Show messages matching the given search terms. notmuch-show \- Show messages matching the given search terms.
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -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 .SH NAME
notmuch-tag \- Add/remove tags for all messages matching the search terms. notmuch-tag \- Add/remove tags for all messages matching the search terms.

View file

@ -16,7 +16,7 @@
.\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" along with this program. If not, see http://www.gnu.org/licenses/ .
.\" .\"
.\" Author: Carl Worth <cworth@cworth.org> .\" 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 .SH NAME
notmuch \- thread-based email index, search, and tagging notmuch \- thread-based email index, search, and tagging
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -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 .SH NAME
notmuch-hooks \- hooks for notmuch notmuch-hooks \- hooks for notmuch

View file

@ -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 .SH NAME
notmuch-search-terms \- Syntax for notmuch queries notmuch-search-terms \- Syntax for notmuch queries

View file

@ -1 +1 @@
0.12~rc2 0.12