Merge branch 'release'

Conflicts:
	NEWS

Inserted news from 0.15.1

diff --git a/NEWS b/NEWS
index 9db9daf01498bad41319977936e6eaabd0c05c2d..9bd7a11e7513b763e0ead86d8c55eb1c7d87c794 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,15 @@ Command-Line Interface
 
 Deprecated commands "part" and "search-tags" are removed.
 
+Notmuch 0.15.1 (2013-01-24)
+=========================
+
+Internal test framework changes
+-------------------------------
+
+Set a default value for TERM when running tests. This fixes certain
+build failures in non-interactive environments.
+
 Notmuch 0.15 (2013-01-18)
 =========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index c9efbd986833355a853aaf9d9650d52cc358c9db..6a1b708403eecfc062b9516738bff50a6f3546ee 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'
+__VERSION__ = '0.15.1'

diff --git a/debian/changelog b/debian/changelog
index 96c8531fb1d9b1ccf18b483e5280e858a9c34eee..943ea91d781edc88be6fc8e95c265167d5295ae4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.15.1-1) experimental; urgency=low
+
+  * Upstream bug fix release: set default TERM for running tests.
+  * Re-enable build time self-tests.
+
+ -- David Bremner <bremner@debian.org>  Thu, 24 Jan 2013 07:19:45 -0400
+
 notmuch (0.15-2) experimental; urgency=low
 
   * Disable tests until a proper fix for running tests without a

diff --git a/debian/rules b/debian/rules
index 0eb3357be9b018fc65886589e05d1fe0d44bf78f..c4e3930da5fb931c4e1bd39e017884e33d8e9a53 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,6 @@ python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
 override_dh_auto_configure:
        dh_auto_configure -- --emacslispdir=/usr/share/emacs/site-lisp/notmuch
 
-override_dh_auto_test:
-       echo tests disabled.
-
 override_dh_auto_build:
        dh_auto_build
        dh_auto_build --sourcedirectory bindings/python

diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index 557eae5d74cd0d8ee809a14e5b8a391a859f3003..6204a5944e3dc92940f401a61f9ef541d1ccc3a4 100644 (file)
--- a/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-CONFIG 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-CONFIG 1 2013-01-24 "Notmuch 0.15.1"
 .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 d63be997c56bf8b534d59b0b2bbfeb8ef170380b..7f8bbac71ba23d5afdcfb62bfac0eeebe5e2f146 100644 (file)
--- a/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-COUNT 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-COUNT 1 2013-01-24 "Notmuch 0.15.1"
 .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 613fd6997ad9fc8f7cd4dcd55454b8887c701c15..799fd7b64bc5ff80d6d6f7359eb7517800b8909b 100644 (file)
--- a/man/man1/notmuch-dump.1
+++ b/man/man1/notmuch-dump.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-DUMP 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-DUMP 1 2013-01-24 "Notmuch 0.15.1"
 .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 06c4dfaebfe7c061ea3a1ffef376dba43d9ce3d5..2ee6a8f01cfdbc9e0e64efba08a6b80553efed77 100644 (file)
--- a/man/man1/notmuch-new.1
+++ b/man/man1/notmuch-new.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-NEW 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-NEW 1 2013-01-24 "Notmuch 0.15.1"
 .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 13e50ada576fa7e53a327bda61ae8878b9d09cda..2751e96be5871f8a57596a7448951a8e6740bd7a 100644 (file)
--- a/man/man1/notmuch-reply.1
+++ b/man/man1/notmuch-reply.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-REPLY 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-REPLY 1 2013-01-24 "Notmuch 0.15.1"
 .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 895c6d29c23d69c19793fc07fe6ecec97e0b178f..52aae41eca7039fade6468939778ebc1f5eabdca 100644 (file)
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-RESTORE 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-RESTORE 1 2013-01-24 "Notmuch 0.15.1"
 .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 321d77979555dc4cfd4dcaf3757cbe3ea3e6b615..acd8863a6bc4c11d00236db48e39c4f32a0446f9 100644 (file)
--- a/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SEARCH 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-SEARCH 1 2013-01-24 "Notmuch 0.15.1"
 .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 3f9584bb84215d650f8bcfdd6226105a885c6cd8..5d4ccfab3ec7174f6689d73cf31d09320bcba91b 100644 (file)
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SHOW 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-SHOW 1 2013-01-24 "Notmuch 0.15.1"
 .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 081bd0e4d3a155c04a7b62df9071b67aaefcc241..a65eb426005c29c0d9a6b21ca3086d3bf3d790e8 100644 (file)
--- a/man/man1/notmuch-tag.1
+++ b/man/man1/notmuch-tag.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-TAG 1 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-TAG 1 2013-01-24 "Notmuch 0.15.1"
 .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 6bf9b2e7c09280e4374f89b068a9b9cd519ce709..0805be83cbca8389256e8b9081280a8c42065da1 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-18 "Notmuch 0.15"
+.TH NOTMUCH 1 2013-01-24 "Notmuch 0.15.1"
 .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 4ed61c15a5cfa0f5211869d7e70f11a1ed2bbc55..a543d5d702513b849af9fd5d34ddae729e0506e7 100644 (file)
--- a/man/man5/notmuch-hooks.5
+++ b/man/man5/notmuch-hooks.5
@@ -1,4 +1,4 @@
-.TH NOTMUCH-HOOKS 5 2013-01-18 "Notmuch 0.15"
+.TH NOTMUCH-HOOKS 5 2013-01-24 "Notmuch 0.15.1"
 
 .SH NAME
 notmuch-hooks \- hooks for notmuch

diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7
index 19e5fd5fb5cbc1bd10e218c6694466849bd91727..8916fdad6a3fb6503ff920e90fa5f82ca1148fba 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-18 "Notmuch 0.15"
+.TH NOTMUCH-SEARCH-TERMS 7 2013-01-24 "Notmuch 0.15.1"
 
 .SH NAME
 notmuch-search-terms \- syntax for notmuch queries

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 6ce3b3189f25c354b471c42db1730ab8fe172e89..84db79265418535bdc6a9b4a364a65cd5a710b67 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -41,6 +41,10 @@ esac
 # Keep the original TERM for say_color and test_emacs
 ORIGINAL_TERM=$TERM
 
+# dtach(1) provides more capable terminal environment to anything
+# that requires more than dumb terminal...
+[ x"${TERM:-dumb}" = xdumb ] && DTACH_TERM=vt100 || DTACH_TERM=$TERM
+
 # For repeatability, reset the environment to known value.
 LANG=C
 LC_ALL=C
@@ -996,9 +1000,10 @@ test_emacs () {
                fi
                server_name="notmuch-test-suite-$$"
                # start a detached session with an emacs server
-               # user's TERM is given to dtach which assumes a minimally
+               # user's TERM (or 'vt100' in case user's TERM is unset, empty
+               # or 'dumb') is given to dtach which assumes a minimally
                # VT100-compatible terminal -- and emacs inherits that
-               TERM=$ORIGINAL_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \
+               TERM=$DTACH_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \
                        sh -c "stty rows 24 cols 80; exec '$TMP_DIRECTORY/run_emacs' \
                                --no-window-system \
                                $load_emacs_tests \

diff --git a/version b/version
index 2856407c03e614f617fde7b7111b9734afc0940c..e815b861f023432f2500015179faa26fdaba7f9e 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.15
+0.15.1