mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 09:24:54 +01:00
Merge branch 'release'
Conflicts: NEWS Inserted news from 0.15.1
This commit is contained in:
commit
7264732a79
18 changed files with 37 additions and 19 deletions
9
NEWS
9
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)
|
||||
=========================
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
# this file should be kept in sync with ../../../version
|
||||
__VERSION__ = '0.15'
|
||||
__VERSION__ = '0.15.1'
|
||||
|
|
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -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
|
||||
|
|
3
debian/rules
vendored
3
debian/rules
vendored
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
2
version
2
version
|
@ -1 +1 @@
|
|||
0.15
|
||||
0.15.1
|
||||
|
|
Loading…
Reference in a new issue