Merge tag '0.18_rc1'

notmuch 0.18~rc1 release

diff --combined Makefile.local
index 6e78368c9febe828bbb264e24f8e4a114b56ca79,086b5a115f8b0a6e42af327f6c5e385c811cd6fe..fa07d81bb097701f20122f9470cae3681d1b7339
--- 1/Makefile.local
--- 2/Makefile.local
+++ b/Makefile.local
@@@ -21,7 -21,7 +21,7 @@@ endi
  VERSION:=$(shell cat ${srcdir}/version)
  ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
  ifeq ($(IS_GIT),yes)
 -VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
 +VERSION:=$(shell git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
  # Write the file 'version.stamp' in case its contents differ from $(VERSION)
  FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs)
  ifneq ($(FILE_VERSION),$(VERSION))
@@@ -80,8 -80,8 +80,8 @@@ version.stamp: $(srcdir)/versio
        echo $(VERSION) > $@
  
  $(TAR_FILE):
-       if git tag -v $(VERSION) >/dev/null 2>&1; then \
-            ref=$(VERSION); \
+       if git tag -v $(UPSTREAM_TAG) >/dev/null 2>&1; then \
+            ref=$(UPSTREAM_TAG); \
          else \
             ref="HEAD" ; \
           echo "Warning: No signed tag for $(VERSION)"; \