+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)
+++ /dev/null
-This is an autogenerated patch header for a single-debian-patch file. The
-delta against upstream is either kept as a single patch, or maintained
-in some VCS, and exported as a single patch instead of more manageable
-atomic patches.
-
---- notmuch-0.31.3.orig/Makefile.global
-+++ notmuch-0.31.3/Makefile.global
-@@ -36,7 +36,6 @@ endif
- endif
-
- UPSTREAM_TAG=$(subst ~,_,$(VERSION))
--DEB_TAG=debian/$(UPSTREAM_TAG)-1
-
- RELEASE_HOST=notmuchmail.org
- RELEASE_DIR=/srv/notmuchmail.org/www/releases
---- notmuch-0.31.3.orig/Makefile.local
-+++ notmuch-0.31.3/Makefile.local
-@@ -73,12 +73,11 @@ release: verify-source-tree-and-version
- $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
- ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
- pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
-- git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
- mkdir -p releases
- mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases
- $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
- ifeq ($(REALLY_UPLOAD),yes)
-- git push origin $(VERSION) $(DEB_TAG) release pristine-tar
-+ git push origin $(VERSION) release pristine-tar
- cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
- ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
- rsync --verbose --delete --recursive doc/_build/html/ $(RELEASE_HOST):$(DOC_DIR)
-@@ -90,7 +89,6 @@ pre-release:
- $(MAKE) VERSION=$(VERSION) clean
- $(MAKE) VERSION=$(VERSION) test
- git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
-- git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
- $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
- ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
- pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
---- notmuch-0.31.3.orig/NEWS
-+++ notmuch-0.31.3/NEWS
-@@ -1,4 +1,5 @@
- Notmuch 0.31.3 (2020-12-25)
-+===========================
-
- Bindings
- --------
test_begin_subtest "building database"
test_expect_success "NOTMUCH_NEW"
+test_begin_subtest "finding thread"
+THREAD=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
+count=$(notmuch count $THREAD)
+test_expect_equal "$count" "7"
+
cat <<'EOF' > c_tail
if (stat) {
const char *stat_str = notmuch_database_status_string (db);
notmuch_thread_t *thread = NULL;
notmuch_threads_t *threads = NULL;
notmuch_query_t *query = NULL;
- const char *id = "thread:0000000000000009";
+ const char *id = "${THREAD}";
stat = notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE, &db, &msg);
if (stat != NOTMUCH_STATUS_SUCCESS) {
printf("%d\n%s\n", thread != NULL, id2);
}
EOF
+thread_num=${THREAD#thread:}
cat <<EOF > EXPECTED
== stdout ==
1
-0000000000000009
+${thread_num}
== stderr ==
EOF
test_expect_equal_file EXPECTED OUTPUT