make release: Add a check that version and debian/changelog are consistent

Eventually I'd like to automate this so that one or the other of these
files is canonical and the other is generated from it. Until then, add
this check to the release process to avoid a skewed release being
shipped.

diff --git a/Makefile.local b/Makefile.local
index f497b6cb5225d7e568f1c69d915c3f423ec347a2..854cf5200393707ca4ab8cc8dbf81d69bfec95eb 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -86,7 +86,7 @@ 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
        $(MAKE) VERSION=$(VERSION) $(GPG_FILE)
@@ -130,8 +130,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 +154,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." && \

diff --git a/RELEASING b/RELEASING
index e438a1d0c2c7735a5766d943aca3b72dfe68dad4..70a2ec547d2653379c476c99bc9dbd54173a7c07 100644 (file)
--- a/RELEASING
+++ b/RELEASING
@@ -72,6 +72,7 @@ repository. From here, there are just a few steps to release:
 5) Run "make release" which will perform the following steps:
 
        * Ensure that the version consists only of digits and periods
+       * Ensure that version and debian/changelog have the same version
        * Verify that the source tree is clean
        * Compile the current notmuch code (aborting release if it fails)
        * Run the notmuch test suite (aborting release if it fails)