debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source
This commit is contained in:
David Bremner 2012-03-13 22:09:56 -03:00
commit 0c20878cce
15 changed files with 47 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure vendored
View file

@ -273,9 +273,11 @@ if [ ${have_xapian} = "0" ]; then
errors=$((errors + 1)) errors=$((errors + 1))
fi fi
# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a
# crypto bug. We need 2.6.7 for permissive "From " header handling.
printf "Checking for GMime development files... " printf "Checking for GMime development files... "
have_gmime=0 have_gmime=0
for gmimepc in gmime-2.6 gmime-2.4; do for gmimepc in 'gmime-2.6 >= 2.6.7' gmime-2.4; do
if pkg-config --exists $gmimepc; then if pkg-config --exists $gmimepc; then
printf "Yes ($gmimepc).\n" printf "Yes ($gmimepc).\n"
have_gmime=1 have_gmime=1

2
debian/control vendored
View file

@ -10,7 +10,7 @@ Build-Depends:
debhelper (>= 7.0.50~), debhelper (>= 7.0.50~),
pkg-config, pkg-config,
libxapian-dev, libxapian-dev,
libgmime-2.6-dev | libgmime-2.4-dev, libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev,
libtalloc-dev, libtalloc-dev,
libz-dev, libz-dev,
python-all (>= 2.6.6-3~), python-all (>= 2.6.6-3~),

5
man/man1/notmuch-config.1
View file

@ -137,9 +137,8 @@ Specifies the location of the notmuch configuration file. Notmuch will
use ${HOME}/.notmuch\-config if this variable is not set. use ${HOME}/.notmuch\-config if this variable is not set.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch-dump\fR(1),
\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
\fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1),
\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

8
man/man1/notmuch-count.1
View file

@ -51,7 +51,7 @@ Do not exclude the messages matching search.exclude_tags in the config file.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-dump\fR(1),
\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

8
man/man1/notmuch-dump.1
View file

@ -31,7 +31,7 @@ for details of the supported syntax for <search-terms>.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

8
man/man1/notmuch-new.1
View file

@ -64,7 +64,7 @@ Prevents hooks from being run.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-part\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-reply\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

8
man/man1/notmuch-reply.1
View file

@ -80,7 +80,7 @@ on issue found in multiple patches.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
\fBnotmuch-part\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

8
man/man1/notmuch-restore.1
View file

@ -39,7 +39,7 @@ details.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

8
man/man1/notmuch-search.1
View file

@ -122,7 +122,7 @@ Do not exclude the messages matching search.exclude_tags in the config file.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-part\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
\fBnotmuch-restore\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

8
man/man1/notmuch-show.1
View file

@ -146,7 +146,7 @@ command.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
\fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

8
man/man1/notmuch-tag.1
View file

@ -32,7 +32,7 @@ details.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
\fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1) \fBnotmuch-show\fR(1),

7
man/man1/notmuch.1
View file

@ -131,10 +131,9 @@ use ${HOME}/.notmuch\-config if this variable is not set.
\fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
\fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7),
\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), \fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1)
\fBnotmuch-tag\fR(1)
The notmuch website: The notmuch website:

8
man/man5/notmuch-hooks.5
View file

@ -42,7 +42,7 @@ imported messages.
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-dump\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1),
\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1),
\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) \fBnotmuch-tag\fR(1)

5
man/man7/notmuch-search-terms.7
View file

@ -135,7 +135,6 @@ current time:
.SH SEE ALSO .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-part\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1),
\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1),
\fBnotmuch-search\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1)
\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1)

2
test/crypto
View file

@ -104,8 +104,6 @@ test_expect_equal \
"$expected" "$expected"
test_begin_subtest "signature verification with signer key unavailable" test_begin_subtest "signature verification with signer key unavailable"
# this is broken with current versions of gmime-2.6
(ldd $(which notmuch) | grep -Fq gmime-2.6) && test_subtest_known_broken
# move the gnupghome temporarily out of the way # move the gnupghome temporarily out of the way
mv "${GNUPGHOME}"{,.bak} mv "${GNUPGHOME}"{,.bak}
output=$(notmuch show --format=json --verify subject:"test signed message 001" \ output=$(notmuch show --format=json --verify subject:"test signed message 001" \