commit 7059f0ed5dbdb871d47b6bf34af7671931c233d1
parents 67477513 debian: fix distribution
b6cfc8a6 debian: document new build-dependency
tree 85733b25b3171edb3c965e55c607b00d55e5de32
author David Bremner <david@tethera.net> 2021-09-10 07:34:16 -0300
committer David Bremner <david@tethera.net> 2021-09-10 07:34:16 -0300
Merge branch 'debian/bullseye' into debian/buster-backports
Update to current Debian stable
Makefile.global | 1 -
Makefile.local | 4 +-
NEWS | 31 +++++++
bindings/python-cffi/notmuch2/_database.py | 2 +-
bindings/python-cffi/version.txt | 2 +-
bindings/python/notmuch/version.py | 2 +-
debian/changelog | 45 ++++++++++
debian/control | 5 +-
debian/patches/debian-changes | 136 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
doc/Makefile.local | 2 +-
doc/conf.py | 2 +-
lib/add-message.cc | 9 +-
lib/config.cc | 11 ++-
lib/notmuch-private.h | 14 ++-
test/T357-index-decryption.sh | 26 +++---
test/T360-symbol-hiding.sh | 5 +-
test/T568-lib-thread.sh | 10 ++-
test/T670-duplicate-mid.sh | 13 +++
version.txt | 2 +-
20 files changed, 280 insertions(+), 43 deletions(-)
diff --cc debian/changelog
index b5ef8645,ebfd9209..85263214
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,48 +1,63 @@@
+ notmuch (0.31.4-2) unstable; urgency=medium
+
+ * Cherry pick upstream commit 3f4de98e7c8, which fixes a bug where
+ duplicate message-ids can cause multiple thread-ids for some message
+ documents.
+ * Add build-dependency on xapian-tools, for new test
+
+ -- David Bremner <bremner@debian.org> Mon, 28 Jun 2021 22:48:02 -0300
+
+ notmuch (0.31.4-1) unstable; urgency=medium
+
+ * New upstream bugfix release
+ - Fix include bug triggered by glib 2.67
+ - Fix race condition in T568-lib-thread
+
+ -- David Bremner <bremner@debian.org> Thu, 18 Feb 2021 07:23:00 -0400
+
+ notmuch (0.31.3-2) unstable; urgency=medium
+
+ * Don't install gdb on hppa (skip gdb based tests)
+
+ -- David Bremner <bremner@debian.org> Sat, 26 Dec 2020 15:14:07 -0400
+
+ notmuch (0.31.3-1) unstable; urgency=medium
+
+ * New upstream bugfix release
+ * Second fix for T360, fix regression on ppc64el
+ * Fix for exclude tags in notmuch2 python bindings
+ * Fix for memory error in notmuch_database_get_config_list
+
+ -- David Bremner <bremner@debian.org> Fri, 25 Dec 2020 11:48:37 -0400
+
+ notmuch (0.31.2-5) unstable; urgency=medium
+
+ * Use readelf instead of nm in T360, hopefully build in ppc64
+
+ -- David Bremner <bremner@debian.org> Sun, 13 Dec 2020 08:24:23 -0400
+
+ notmuch (0.31.2-4) unstable; urgency=medium
+
+ * Move prerequisite to file targets from phony ones. Thanks to
+ Lucas Nussbaum for the report. (Closes: #976934).
+
+ -- David Bremner <bremner@debian.org> Thu, 10 Dec 2020 21:02:20 -0400
+
+notmuch (0.31.2-3~bpo10+2) buster-backports; urgency=medium
+
+ * Re-upload with binaries for NEW package.
+
+ -- David Bremner <bremner@debian.org> Sun, 13 Dec 2020 13:23:57 -0400
+
+notmuch (0.31.2-3~bpo10+1) buster-backports; urgency=medium
+
+ * Rebuild for buster-backports.
+ * Require dh-elpa >= 2.0.6~
+ * Disable dwz for ruby extension (work-around bug in binutils default
+ dwarf level).
+
+ -- David Bremner <bremner@debian.org> Sun, 13 Dec 2020 10:56:52 -0400
+
notmuch (0.31.2-3) unstable; urgency=medium
* Switch to debhelper compat level 13
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