Merge branch 'release'

add in NEWS from 0.15.2

Conflicts:
	NEWS
This commit is contained in:
David Bremner 2013-02-18 20:33:48 -04:00
commit 16aa65ba25
17 changed files with 46 additions and 17 deletions

14
NEWS
View file

@ -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)
=========================

View file

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

8
debian/changelog vendored
View file

@ -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 <bremner@debian.org> 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.

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1 +1 @@
0.15.1
0.15.2