commit 28fda31544f2155bce2ec8d3f6244026af4781c6
parents ed1cec37 changlog stanza for backports
01c8bf89 debian: re-enable atomicity tests on armhf
tree ea7aab7de96ce2a3d1b63ae93eb80276ce8be523
author David Bremner <david@tethera.net> 2014-08-25 17:56:57 -0700
committer David Bremner <david@tethera.net> 2014-08-25 17:56:57 -0700
Merge tag 'debian/0.18.1-2' into wheezy-backports
uploaded to Debian unstable
Conflicts:
debian/changelog
.gitignore | 1 +
INSTALL | 34 +-
Makefile | 14 +-
Makefile.local | 37 +-
NEWS | 293 +++++++++++++
README | 2 +-
bindings/python/docs/source/conf.py | 2 +-
bindings/python/notmuch/version.py | 2 +-
bindings/ruby/message.c | 2 +-
command-line-arguments.c | 69 ++--
compat/.gitignore | 1 +
compat/Makefile.local | 4 +
compat/canonicalize_file_name.c | 18 +
compat/compat.h | 8 +
compat/gen_zlib_pc.c | 18 +
compat/have_canonicalize_file_name.c | 10 +
compat/have_d_type.c | 10 +
completion/notmuch-completion.bash | 19 +-
configure | 116 +++++-
debian/NEWS | 10 +
debian/changelog | 99 ++++-
debian/control | 20 +-
debian/notmuch-emacs.emacsen-install | 83 ++--
debian/notmuch-emacs.emacsen-remove | 34 +-
debian/notmuch-emacs.postinst | 5 +-
debian/ruby-notmuch.install | 2 +-
debian/source/options | 2 +
devel/gen-testdb.sh | 131 ++++++
devel/nmbug/nmbug | 46 ++-
devel/nmbug/nmbug-status | 445 +++++++++++++-------
devel/nmbug/status-config.json | 5 +
devel/release-checks.sh | 42 +-
doc/.gitignore | 2 +
doc/INSTALL | 24 ++
{man => doc}/Makefile | 0
doc/Makefile.local | 81 ++++
doc/conf.py | 172 ++++++++
doc/doxygen.cfg | 304 ++++++++++++++
doc/index.rst | 30 ++
doc/man1/notmuch-compact.rst | 52 +++
doc/man1/notmuch-config.rst | 123 ++++++
doc/man1/notmuch-count.rst | 60 +++
doc/man1/notmuch-dump.rst | 75 ++++
doc/man1/notmuch-insert.rst | 58 +++
doc/man1/notmuch-new.rst | 52 +++
doc/man1/notmuch-reply.rst | 112 +++++
doc/man1/notmuch-restore.rst | 67 +++
doc/man1/notmuch-search.rst | 151 +++++++
doc/man1/notmuch-show.rst | 182 +++++++++
doc/man1/notmuch-tag.rst | 107 +++++
doc/man1/notmuch.rst | 143 +++++++
doc/man5/notmuch-hooks.rst | 44 ++
doc/man7/notmuch-search-terms.rst | 252 ++++++++++++
doc/mkdocdeps.py | 18 +
doc/notmuch-emacs.rst | 204 ++++++++++
doc/prerst2man.py | 63 +++
dump-restore-private.h | 13 -
emacs/.gitignore | 1 +
emacs/Makefile.local | 33 +-
emacs/notmuch-hello.el | 220 +++++++---
emacs/notmuch-lib.el | 103 +++--
emacs/notmuch-mua.el | 106 ++---
emacs/notmuch-show.el | 22 +-
emacs/notmuch-tag.el | 208 +++++++---
emacs/notmuch-tree.el | 55 ++-
emacs/notmuch-version.el.tmpl | 23 ++
emacs/notmuch.el | 83 ++--
hooks.c | 3 +
lib/database.cc | 66 ++-
lib/gen-version-script.sh | 2 +-
lib/index.cc | 96 +----
lib/message-file.c | 431 +++++++++-----------
lib/message.cc | 292 ++++++++-----
lib/notmuch-private.h | 58 +--
lib/notmuch.h | 453 ++++++++++++++-------
lib/query.cc | 3 +
lib/thread.cc | 2 +-
man/.gitignore | 2 -
man/Makefile.local | 55 ---
man/man1/notmuch-compact.1 | 62 ---
man/man1/notmuch-config.1 | 158 -------
man/man1/notmuch-count.1 | 86 ----
man/man1/notmuch-dump.1 | 98 -----
man/man1/notmuch-insert.1 | 75 ----
man/man1/notmuch-new.1 | 70 ----
man/man1/notmuch-reply.1 | 133 ------
man/man1/notmuch-restore.1 | 91 -----
man/man1/notmuch-search.1 | 199 ---------
man/man1/notmuch-setup.1 | 1 -
man/man1/notmuch-show.1 | 250 ------------
man/man1/notmuch-tag.1 | 142 -------
man/man1/notmuch.1 | 190 ---------
man/man5/notmuch-hooks.5 | 48 ---
man/man7/notmuch-search-terms.7 | 269 ------------
notmuch-client.h | 13 +
notmuch-compact.c | 8 +-
notmuch-config.c | 111 +++--
notmuch-count.c | 16 +-
notmuch-dump.c | 212 +++++++---
notmuch-insert.c | 58 ++-
notmuch-new.c | 314 ++++++++------
notmuch-reply.c | 226 ++++++----
notmuch-restore.c | 103 +++--
notmuch-search.c | 35 +-
notmuch-setup.c | 15 +-
notmuch-show.c | 24 +-
notmuch-tag.c | 22 +-
notmuch.c | 88 ++--
.../download/notmuch-email-corpus-0.4.tar.xz.asc | 14 +
performance-test/perf-test-lib.sh | 73 ++--
performance-test/version.sh | 2 +-
tag-util.c | 11 +-
tag-util.h | 12 +
test/Makefile.local | 33 +-
test/README | 16 +
test/{basic => T000-basic.sh} | 29 +-
test/T010-help-test.sh | 20 +
test/{compact => T020-compact.sh} | 11 +
test/{config => T030-config.sh} | 0
test/{setup => T040-setup.sh} | 0
test/{new => T050-new.sh} | 32 ++
test/{count => T060-count.sh} | 0
test/{insert => T070-insert.sh} | 39 +-
test/{search => T080-search.sh} | 58 ++-
test/{search-output => T090-search-output.sh} | 234 +++++------
test/T100-search-by-folder.sh | 149 +++++++
...lap-bug => T110-search-position-overlap-bug.sh} | 0
...ng => T120-search-insufficient-from-quoting.sh} | 0
test/{search-limiting => T130-search-limiting.sh} | 0
test/{excludes => T140-excludes.sh} | 0
test/{tagging => T150-tagging.sh} | 0
test/{json => T160-json.sh} | 0
test/{sexp => T170-sexp.sh} | 0
test/{text => T180-text.sh} | 0
test/{multipart => T190-multipart.sh} | 0
test/{thread-naming => T200-thread-naming.sh} | 0
test/{raw => T210-raw.sh} | 0
test/{reply => T220-reply.sh} | 0
test/{reply-to-sender => T230-reply-to-sender.sh} | 0
test/{dump-restore => T240-dump-restore.sh} | 35 ++
test/{uuencode => T250-uuencode.sh} | 0
test/{thread-order => T260-thread-order.sh} | 0
test/{author-order => T270-author-order.sh} | 0
test/{from-guessing => T280-from-guessing.sh} | 0
test/{long-id => T290-long-id.sh} | 0
test/{encoding => T300-encoding.sh} | 0
test/{emacs => T310-emacs.sh} | 17 +-
...ch-buffer => T320-emacs-large-search-buffer.sh} | 0
...-filename => T330-emacs-subject-to-filename.sh} | 0
test/{maildir-sync => T340-maildir-sync.sh} | 0
test/{crypto => T350-crypto.sh} | 0
test/{symbol-hiding => T360-symbol-hiding.sh} | 0
...r-coherence => T370-search-folder-coherence.sh} | 2 +-
test/{atomicity => T380-atomicity.sh} | 0
test/{python => T390-python.sh} | 0
test/{hooks => T400-hooks.sh} | 0
.../{argument-parsing => T410-argument-parsing.sh} | 0
...test-functions => T420-emacs-test-functions.sh} | 0
...ess-cleaning => T430-emacs-address-cleaning.sh} | 0
test/{emacs-hello => T440-emacs-hello.sh} | 0
test/{emacs-show => T450-emacs-show.sh} | 0
test/{emacs-tree => T460-emacs-tree.sh} | 38 +-
test/{missing-headers => T470-missing-headers.sh} | 0
test/{hex-escaping => T480-hex-escaping.sh} | 0
...parse-time-string => T490-parse-time-string.sh} | 0
test/{search-date => T500-search-date.sh} | 0
test/{thread-replies => T510-thread-replies.sh} | 0
test/T520-show.sh | 13 +
test/T530-upgrade.sh | 119 ++++++
test/atomicity.gdb | 4 +
test/corpus/{cur => }/01:2, | 0
test/corpus/{cur => }/02:2, | 0
test/corpus/{cur => bar}/17:2, | 0
test/corpus/{cur => bar}/18:2, | 0
test/corpus/{cur => bar/baz}/05:2, | 0
test/corpus/{cur => bar/baz}/23:2, | 0
test/corpus/{cur => bar/baz}/24:2, | 0
test/corpus/{ => bar/baz}/cur/25:2, | 0
test/corpus/{ => bar/baz}/cur/26:2, | 0
test/corpus/{cur => bar/baz/new}/27:2, | 0
test/corpus/{cur => bar/baz/new}/28:2, | 0
test/corpus/{ => bar}/cur/19:2, | 0
test/corpus/{ => bar}/cur/20:2, | 0
test/corpus/{cur => bar/new}/21:2, | 0
test/corpus/{cur => bar/new}/22:2, | 0
test/corpus/{cur => foo}/06:2, | 0
test/corpus/{cur => foo/baz}/11:2, | 0
test/corpus/{cur => foo/baz}/12:2, | 0
test/corpus/{ => foo/baz}/cur/13:2, | 0
test/corpus/{ => foo/baz}/cur/14:2, | 0
test/corpus/{cur => foo/baz/new}/15:2, | 0
test/corpus/{cur => foo/baz/new}/16:2, | 0
test/corpus/{ => foo}/cur/07:2, | 0
test/corpus/{ => foo}/cur/08:2, | 0
test/corpus/{cur => foo/new}/03:2, | 0
test/corpus/{cur => foo/new}/09:2, | 0
test/corpus/{cur => foo/new}/10:2, | 0
test/corpus/{cur => new}/04:2, | 0
test/help-test | 12 -
test/notmuch-test | 57 +--
test/search-by-folder | 40 --
test/test-databases/.gitignore | 1 +
test/test-databases/Makefile | 7 +
test/test-databases/Makefile.local | 14 +
test/test-databases/database-v1.tar.xz.sha256 | 1 +
test/test-lib-common.sh | 4 +-
test/test-lib.el | 5 +
test/test-lib.sh | 68 +++-
test/test.expected-output/test-verbose-no | 1 +
test/test.expected-output/test-verbose-yes | 1 +
.../notmuch-tree-single-thread | 8 +-
test/tree.expected-output/notmuch-tree-tag-inbox | 104 ++---
.../notmuch-tree-tag-inbox-tagged | 104 ++---
.../notmuch-tree-tag-inbox-thread-tagged | 104 ++---
util/Makefile.local | 3 +-
util/string-util.c | 28 +-
util/string-util.h | 7 +
util/util.c | 24 ++
util/util.h | 29 ++
util/zlib-extra.c | 85 ++++
util/zlib-extra.h | 25 ++
version | 2 +-
vim/notmuch.vim | 39 +-
223 files changed, 7018 insertions(+), 4123 deletions(-)
diff --cc debian/changelog
index 5c8d6fba,661aabee..d7af75e8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -54,11 -146,6 +146,12 @@@ notmuch (0.17~rc1-1) experimental; urge
-- David Bremner <bremner@debian.org> Wed, 20 Nov 2013 19:27:48 -0400
+notmuch (0.16-1~bpo70+1) wheezy-backports; urgency=low
+
+ * Rebuild for wheezy-backports.
+
+ -- David Bremner <bremner@debian.org> Sun, 01 Sep 2013 19:04:32 -0300
++
notmuch (0.16-1) unstable; urgency=low
* New upstream feature release
glossary
--------
Commit objects reference one tree, and zero or more parents.
Single parent commits can typically generate a patch in
unified diff format via `git format-patch'.
Multiple parents means the commit is a merge.
Root commits have no ancestor. Note that it is
possible to have multiple root commits when merging independent histories.
Every commit references one top-level tree object.
git clone https://yhetil.org/notmuch.git