Merge branch 'release'

add in NEWS from 0.15.2

Conflicts:
	NEWS

diff --git a/NEWS b/NEWS
index 06ad4b1c08e1c80abfcaee2ca9db78976a3e8113..bd2039b51c5c4508df454caa38e0e9a6d867004e 100644 (file)
--- 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 6a1b708403eecfc062b9516738bff50a6f3546ee..6bfb1f2c998c0e639603622321509b52878616c6 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.15.1'
+__VERSION__ = '0.15.2'

diff --git a/debian/changelog b/debian/changelog
index 943ea91d781edc88be6fc8e95c265167d5295ae4..e9b1a8bb6e531eae32d9c6e114d0fff1c231645d 100644 (file)
--- 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 <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.

diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index 6204a5944e3dc92940f401a61f9ef541d1ccc3a4..db31166b4ac4d0133972183547a8b2aee9525164 100644 (file)
--- 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 7f8bbac71ba23d5afdcfb62bfac0eeebe5e2f146..86a67fe21f3a4ddfeffb6b5537853adbdf06aa25 100644 (file)
--- 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 799fd7b64bc5ff80d6d6f7359eb7517800b8909b..3fa51bdd69ec360afa4339ff2353de3e91e7c170 100644 (file)
--- 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 2ee6a8f01cfdbc9e0e64efba08a6b80553efed77..02f795434e2494aad5be97a2876f90485cca8a26 100644 (file)
--- 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 2751e96be5871f8a57596a7448951a8e6740bd7a..454bdee35c359abd67445dd671582e5377af81cc 100644 (file)
--- 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 52aae41eca7039fade6468939778ebc1f5eabdca..4ec4c801309529c6d5045a7cf667a1115e4d0712 100644 (file)
--- 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 acd8863a6bc4c11d00236db48e39c4f32a0446f9..d3391f83339dad648a9e3bd4508e2c9a92a0c95e 100644 (file)
--- 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 5d4ccfab3ec7174f6689d73cf31d09320bcba91b..8be9eaec00b5a58cfcbd141355f5953d92836e0e 100644 (file)
--- 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 a65eb426005c29c0d9a6b21ca3086d3bf3d790e8..0052ca2195e1e9cb38ce74d8733864f6e2dc999a 100644 (file)
--- 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 55e2d166facaadcb02d9aec6f899b84ce94ecca3..e645a351fe3c8c35d81a0f4d6e66ab802d0d2d48 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 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 a543d5d702513b849af9fd5d34ddae729e0506e7..402c0ef6865c6ce54b90ea4cb9188fa23219b2dc 100644 (file)
--- 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 8916fdad6a3fb6503ff920e90fa5f82ca1148fba..eb417ba668352c1aec426311d53489b06f6bb687 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 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 dece811e6136064b84afec343161c1e25f5c9dec..d26b49f7551f1cd3bc159e241f64976e5e37db58 100644 (file)
--- 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 e815b861f023432f2500015179faa26fdaba7f9e..4312e0d0cae3a96e9f4a9be98e59e8468f39e1a8 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.15.1
+0.15.2