From: David Bremner Date: Tue, 19 Feb 2013 00:33:48 +0000 (-0400) Subject: Merge branch 'release' X-Git-Tag: 0.16_rc1~200 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=16aa65ba2575fd504c31d9671d8c5150f8e8adf1;hp=2bedb0300544bf0603863b372cb605dca40c6b33 Merge branch 'release' add in NEWS from 0.15.2 Conflicts: NEWS --- diff --git a/NEWS b/NEWS index 06ad4b1c..bd2039b5 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,20 @@ has accumulated bugs and gaps in functionality. We recommend that people packaging notmuch no longer provide binary packages for notmuch-vim, but of course that is their decision. +Notmuch 0.15.2 (2013-02-17) +=========================== + +Build fixes +----------- + +Update dependencies to avoid problems when building in parallel. + +Internal test framework changes +------------------------------- + +Adjust Emacs test watchdog mechanism to cope with `process-attributes` +being unimplimented. + Notmuch 0.15.1 (2013-01-24) ========================= diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 6a1b7084..6bfb1f2c 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.15.1' +__VERSION__ = '0.15.2' diff --git a/debian/changelog b/debian/changelog index 943ea91d..e9b1a8bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +notmuch (0.15.2-1) experimental; urgency=low + + * Upstream bug fix release. + - Improve support for parallel building + - Update Emacs tests for portability, fix FTBFS on hurd-i386 + + -- David Bremner Tue, 29 Jan 2013 19:19:25 -0400 + notmuch (0.15.1-1) experimental; urgency=low * Upstream bug fix release: set default TERM for running tests. diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 6204a594..db31166b 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-CONFIG 1 2013-02-17 "Notmuch 0.15.2" .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 7f8bbac7..86a67fe2 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-COUNT 1 2013-02-17 "Notmuch 0.15.2" .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 799fd7b6..3fa51bdd 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-DUMP 1 2013-02-17 "Notmuch 0.15.2" .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 2ee6a8f0..02f79543 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-NEW 1 2013-02-17 "Notmuch 0.15.2" .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 2751e96b..454bdee3 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-REPLY 1 2013-02-17 "Notmuch 0.15.2" .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 52aae41e..4ec4c801 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-RESTORE 1 2013-02-17 "Notmuch 0.15.2" .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 acd8863a..d3391f83 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-SEARCH 1 2013-02-17 "Notmuch 0.15.2" .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 5d4ccfab..8be9eaec 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-SHOW 1 2013-02-17 "Notmuch 0.15.2" .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 a65eb426..0052ca21 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-TAG 1 2013-02-17 "Notmuch 0.15.2" .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 55e2d166..e645a351 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 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH 1 2013-02-17 "Notmuch 0.15.2" .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 a543d5d7..402c0ef6 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-HOOKS 5 2013-02-17 "Notmuch 0.15.2" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index 8916fdad..eb417ba6 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2013-01-24 "Notmuch 0.15.1" +.TH NOTMUCH-SEARCH-TERMS 7 2013-02-17 "Notmuch 0.15.2" .SH NAME notmuch-search-terms \- syntax for notmuch queries diff --git a/test/test-lib.el b/test/test-lib.el index dece811e..d26b49f7 100644 --- a/test/test-lib.el +++ b/test/test-lib.el @@ -77,12 +77,19 @@ invisible text." (setq start next-pos))) str)) -(defun orphan-watchdog (pid) +(defun orphan-watchdog-check (pid) "Periodically check that the process with id PID is still running, quit if it terminated." (if (not (process-attributes pid)) - (kill-emacs) - (run-at-time "1 min" nil 'orphan-watchdog pid))) + (kill-emacs))) + +(defun orphan-watchdog (pid) + "Initiate orphan watchdog check." + ; If process-attributes returns nil right away, that probably means + ; it is unimplimented. So we delay two minutes before killing emacs. + (if (process-attributes pid) + (run-at-time 60 60 'orphan-watchdog-check pid) + (run-at-time 120 60 'orphan-watchdog-check pid))) (defun hook-counter (hook) "Count how many times a hook is called. Increments diff --git a/version b/version index e815b861..4312e0d0 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.15.1 +0.15.2