debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-18 21:45:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source
This commit is contained in:
David Bremner 2011-11-26 21:15:20 -08:00
commit ac8576de63
8 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
NEWS
View file

@ -1,3 +1,15 @@
Notmuch 0.10.1 (2011-11-25)
===========================
Bug-fix release.
----------------
Fix --help argument
Argument processing changes in 0.10 introduced a bug where "notmuch
--help" crashed while "notmuch help" worked fine. This is fixed in
0.10.1.
Notmuch 0.10 (2011-11-23) Notmuch 0.10 (2011-11-23)
========================= =========================

2
bindings/python/notmuch/version.py
View file

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

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
notmuch (0.10.1-1) unstable; urgency=low
* Upstream bug fix release.
- Fix segfault on "notmuch --help"
-- David Bremner <bremner@debian.org> Fri, 25 Nov 2011 12:11:30 -0500
notmuch (0.10-1) unstable; urgency=low notmuch (0.10-1) unstable; urgency=low
* New upstream release * New upstream release

2
notmuch.1
View file

@ -16,7 +16,7 @@
.\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" along with this program. If not, see http://www.gnu.org/licenses/ .
.\" .\"
.\" Author: Carl Worth <cworth@cworth.org> .\" Author: Carl Worth <cworth@cworth.org>
.TH NOTMUCH 1 2011-11-23 "Notmuch 0.10" .TH NOTMUCH 1 2011-11-25 "Notmuch 0.10.1"
.SH NAME .SH NAME
notmuch \- thread-based email index, search, and tagging notmuch \- thread-based email index, search, and tagging
.SH SYNOPSIS .SH SYNOPSIS

2
notmuch.c
View file

@ -621,7 +621,7 @@ main (int argc, char *argv[])
return notmuch (local); return notmuch (local);
if (STRNCMP_LITERAL (argv[1], "--help") == 0) if (STRNCMP_LITERAL (argv[1], "--help") == 0)
return notmuch_help_command (NULL, 0, NULL); return notmuch_help_command (NULL, argc - 1, &argv[1]);
if (STRNCMP_LITERAL (argv[1], "--version") == 0) { if (STRNCMP_LITERAL (argv[1], "--version") == 0) {
printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n"); printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");

12
test/help-test Executable file
View file

@ -0,0 +1,12 @@
#!/usr/bin/env bash
test_description="online help"
. test-lib.sh
test_expect_success 'notmuch --help' 'notmuch --help'
test_expect_success 'notmuch --help tag' 'notmuch --help tag'
test_expect_success 'notmuch help' 'notmuch help'
test_expect_success 'notmuch help tag' 'notmuch help tag'
test_expect_success 'notmuch --version' 'notmuch --version'
test_done

1
test/notmuch-test
View file

@ -18,6 +18,7 @@ cd $(dirname "$0")
TESTS=" TESTS="
basic basic
help-test
new new
count count
search search

2
version
View file

@ -1 +1 @@
0.10 0.10.1