debian: Add a gbp.conf to start using git-buildpackage

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 98d69c4d8dfa44772499c14793bb069201c2343b..53a4a94bd9e8b83ddc1f54f919012dee051e5bb8 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -69,7 +69,7 @@ dist: $(TAR_FILE)
 # We invoke make recursively only to force ordering of our phony
 # targets in the case of parallel invocation of make (-j).
 .PHONY: release
-release: verify-version
+release: verify-no-dirty-code
        $(MAKE) test
        $(MAKE) $(GPG_FILE)
        $(MAKE) verify-newer
@@ -79,11 +79,8 @@ release: verify-version
        mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
        git push origin $(VERSION)
-       @echo "Please send a release announcement as follows:"
-       @echo ""
-       $(MAKE) release-message
        $(MAKE) release-message > $(PACKAGE)-$(VERSION).announce
-       @echo "(This message is also available in $(PACKAGE)-$(VERSION).announce"
+       @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
 
 .PHONY: release-message
 release-message:
@@ -105,7 +102,7 @@ release-message:
        @echo ""
        @echo "What's new in notmuch $(VERSION)"
        @echo "========================="
-       @sed -ne '/^[Nn]otmuch 0.1/{n;n;b NEWS}; d; :NEWS /^===/q; {p;n;b NEWS}' < NEWS | head -n -2
+       @sed -ne '/^[Nn]otmuch $(VERSION)/{n;n;b NEWS}; d; :NEWS /^===/q; {p;n;b NEWS}' < NEWS | head -n -2
        @echo ""
        @echo "What is notmuch"
        @echo "==============="
@@ -116,6 +113,21 @@ release-message:
        @echo ""
        @echo "For more about notmuch, see http://notmuchmail.org"
 
+.PHONY: verify-no-dirty-code
+verify-no-dirty-code: verify-version
+       @printf "Checking that source tree is clean..."
+ifneq ($(shell git ls-files -m),)
+       @echo "No"
+       @echo "The following files have been modified since the most recent git commit:"
+       @echo ""
+       @git ls-files -m
+       @echo ""
+       @echo "The release will be made from the committed state, but perhaps you meant"
+       @echo "to commit this code first? Please clean this up to make it more clear."
+       @false
+else
+       @echo "Good"
+endif
 
 .PHONY: verify-version
 verify-version: