From: David Bremner <david@tethera.net>
Date: Sat, 3 May 2014 23:32:05 +0000 (+0900)
Subject: Merge tag '0.18_rc1'
X-Git-Tag: 0.19_rc1~170
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=21cb851a22f41e0b2a7c07dcbcc4f2dec20a0e3d;hp=-c

Merge tag '0.18_rc1'

notmuch 0.18~rc1 release
---

21cb851a22f41e0b2a7c07dcbcc4f2dec20a0e3d
diff --combined Makefile.local
index 6e78368c,086b5a11..fa07d81b
--- a/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)"; \