From ed7ca948ae31ac0e1d3633a2f58fb3e4aecd03de Mon Sep 17 00:00:00 2001 From: David Bremner Date: Wed, 9 Dec 2020 21:55:38 -0400 Subject: [PATCH 1/3] build/docs: move docstring prereq to file targets Under a sufficiently high level of parallelism [1] there seems to be a a race condition that allows sphinx-build to start running before the docstrings are extracted. This change moves the docstring stamp from the phony targets sphinx-html and sphinx-info to the file targets that they depend on. I'm not sure why this makes things better, but I am fairly confident it does not make things worse, and experimentally it seems to eliminate the race condition. [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976934 --- doc/Makefile.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.local b/doc/Makefile.local index 60bd7184..f476d1da 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -43,7 +43,7 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) rm -f $@ && gzip --no-name --stdout $^ > $@ ifeq ($(WITH_EMACS),1) -$(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp +$(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.texi.stamp : docstring.stamp endif sphinx-html: $(DOCBUILDDIR)/.html.stamp From 55e2dbe0d0d2d7ed760a62744a347a5b55feacb7 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 10 Dec 2020 21:03:35 -0400 Subject: [PATCH 2/3] debian: changelog for 0.31.2-4 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index ed76f7f8..a8943124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 Thu, 10 Dec 2020 21:02:20 -0400 + notmuch (0.31.2-3) unstable; urgency=medium * Switch to debhelper compat level 13 From c7e1910235d06dcb2e7931b187483fc2528ab714 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 10 Dec 2020 21:07:10 -0400 Subject: [PATCH 3/3] Commit Debian 3.0 (quilt) metadata [dgit (9.12) quilt-fixup] --- debian/patches/debian-changes | 16 ++++++++++++++++ debian/patches/series | 1 + 2 files changed, 17 insertions(+) create mode 100644 debian/patches/debian-changes create mode 100644 debian/patches/series diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 00000000..40ee7d00 --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,16 @@ +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.2.orig/doc/Makefile.local ++++ notmuch-0.31.2/doc/Makefile.local +@@ -43,7 +43,7 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.te + rm -f $@ && gzip --no-name --stdout $^ > $@ + + ifeq ($(WITH_EMACS),1) +-$(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp ++$(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.texi.stamp : docstring.stamp + endif + + sphinx-html: $(DOCBUILDDIR)/.html.stamp diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..7bb82529 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +debian-changes