From: David Bremner <david@tethera.net>
Date: Wed, 6 Mar 2019 12:53:26 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: archive/debian/0.29_rc0-1~134
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=71eaa19350883b30bafe885ea083c2e3f1621e10

Merge branch 'release'

Changes from 0.28.3
---

71eaa19350883b30bafe885ea083c2e3f1621e10
diff --cc NEWS
index 2a69b0be,549b1840..9fcb57ed
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,17 +1,26 @@@
 +Notmuch 0.29 (UNRELEASED)
 +=========================
 +
 +Command Line Interface
 +----------------------
 +
 +`notmuch show` now supports --body=false and --include-html with
 +--format=text
 +
+ Notmuch 0.28.3 (2019-03-05)
+ ===========================
+ 
+ Library
+ -------
+ 
+ Fix a bug with the internal data structure _notmuch_string_map_t used
+ by message properties.
+ 
+ Build System
+ ------------
+ 
+ Serialize calls to sphinx-build to avoid race condition.
+ `
  Notmuch 0.28.2 (2019-02-17)
  ===========================
  
diff --cc doc/Makefile.local
index f53b3702,cb0f1f64..bab3d0d2
--- a/doc/Makefile.local
+++ b/doc/Makefile.local
@@@ -37,10 -37,14 +37,18 @@@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.t
  %.gz: %
  	rm -f $@ && gzip --stdout $^ > $@
  
 +ifeq ($(WITH_EMACS),1)
 +$(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp
 +endif
 +
+ # Sequentialize the calls to sphinx-build to avoid races with
+ # reading/writing cached state. This uses GNU make specific
+ # "order-only" prerequisites.
+ 
+ sphinx-html: | $(DOCBUILDDIR)/.roff.stamp
+ sphinx-texinfo: | sphinx-html
+ sphinx-info: | sphinx-texinfo
+ 
  sphinx-html:
  	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DOCBUILDDIR)/html