X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=5bb570b1a7a4b3f4c6365dd651d8948cdffcc4bc;hp=51a83a8c7b3635b1f47a50edf525538fc261a44b;hb=e6d20b7b8f47bcd5da14639c31a4943e188c070d;hpb=b068f1cc849910045ab11ac84419814b5d1727ee

diff --git a/Makefile.local b/Makefile.local
index 51a83a8c..5bb570b1 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -42,7 +42,7 @@ FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 .PHONY: all
 all: notmuch notmuch-shared notmuch.1.gz
 ifeq ($(MAKECMDGOALS),)
-ifeq ($(shell cat .first-build-message),)
+ifeq ($(shell cat .first-build-message 2>/dev/null),)
 	@NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all
 	@echo ""
 	@echo "Compilation of notmuch is now complete. You can install notmuch with:"
@@ -86,14 +86,20 @@ dist: $(TAR_FILE)
 # are part of the release and need to take the version from the
 # version file).
 .PHONY: release
-release: verify-no-dirty-code
+release: verify-source-tree-and-version
 	$(MAKE) VERSION=$(VERSION) verify-newer
 	$(MAKE) VERSION=$(VERSION) test
+	rm -rf ./debian-build
+	git-buildpackage
+	cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz
 	$(MAKE) VERSION=$(VERSION) $(GPG_FILE)
 	scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
 	ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
 	mkdir -p releases
 	mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
+	(cd debian-build; dput *.changes)
+	mv debian-build/* releases
+	rmdir debian-build
 	git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
 	git push origin $(VERSION)
 	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
@@ -130,8 +136,14 @@ release-message:
 	@echo ""
 	@echo "For more about notmuch, see http://notmuchmail.org"
 
+# This is a chain of dependencies rather than a simple list simply to
+# avoid the messages getting interleaved in the case of a parallel
+# make invocation.
+.PHONY: verify-source-tree-and-version
+verify-source-tree-and-version: verify-no-dirty-code
+
 .PHONY: verify-no-dirty-code
-verify-no-dirty-code: verify-version
+verify-no-dirty-code: verify-version-debian
 ifeq ($(IS_GIT),yes)
 	@printf "Checking that source tree is clean..."
 ifneq ($(shell git ls-files -m),)
@@ -148,8 +160,17 @@ else
 endif
 endif
 
-.PHONY: verify-version
-verify-version:
+.PHONY: verify-version-debian
+verify-version-debian: verify-version-components
+	@echo -n "Checking that Debian package version is $(VERSION)..."
+	@if [ "$(VERSION)" != $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] ; then \
+		(echo "No." && \
+		 echo "Please edit version and debian/changelog to have consistent versions." && false) \
+	 fi
+	@echo "Good."
+
+.PHONY: verify-version-components
+verify-version-components:
 	@echo -n "Checking that $(VERSION) consists only of digits and periods..."
 	@if echo $(VERSION) | grep -q -v -x '[0-9.]*'; then \
 		(echo "No." && \