show: Pass notmuch_message_t instead of path to show_message_body.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index b6e216a28e533bce0dcb80e85f61ff96cd360095..97f397ff2d238ca99bbb735488ccd06dd0c40d4b 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -122,7 +122,7 @@ release: verify-source-tree-and-version
 ifeq ($(REALLY_UPLOAD),yes)
        git push origin $(VERSION)
        cd releases && 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)"
+       ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
 endif
        @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
 
@@ -139,15 +139,16 @@ pre-release:
        mv $(TAR_FILE) $(DEB_TAR_FILE) releases
 
 .PHONY: debian-snapshot
-debian-snapshot: TMPFILE := $(shell mktemp)
 debian-snapshot:
        make VERSION=$(VERSION) clean
-       cp debian/changelog $(TMPFILE)
-       EDITOR=/bin/true dch -v $(VERSION)+1 -D UNRELEASED 'test build, not for upload'
-       echo '3.0 (native)' > debian/source/format
-       debuild -us -uc
-       mv -f $(TMPFILE) debian/changelog
-       echo '3.0 (quilt)' > debian/source/format
+       TMPFILE=$$(mktemp /tmp/notmuch.XXXXXX);         \
+         cp debian/changelog $${TMPFILE};              \
+         EDITOR=/bin/true dch -b -v $(VERSION)+1       \
+           -D UNRELEASED 'test build, not for upload'; \
+         echo '3.0 (native)' > debian/source/format;   \
+         debuild -us -uc;                              \
+         mv -f $${TMPFILE} debian/changelog;           \
+         echo '3.0 (quilt)' > debian/source/format
 
 .PHONY: release-message
 release-message:
@@ -187,7 +188,7 @@ release-message:
 verify-source-tree-and-version: verify-no-dirty-code
 
 .PHONY: verify-no-dirty-code
-verify-no-dirty-code: verify-version-debian verify-version-python
+verify-no-dirty-code: verify-version-debian verify-version-python verify-version-manpage
 ifeq ($(IS_GIT),yes)
        @printf "Checking that source tree is clean..."
 ifneq ($(shell git ls-files -m),)
@@ -207,7 +208,7 @@ endif
 .PHONY: verify-version-debian
 verify-version-debian: verify-version-components
        @echo -n "Checking that Debian package version is $(VERSION)-1..."
-       @[ "$(VERSION)-1" = $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] || \
+       @[ "$(VERSION)-1" = $$(sed '1{ s/).*//; s/.*(//; q; }' debian/changelog) ] || \
                (echo "No." && \
                 echo "Please edit version and debian/changelog to have consistent versions." && false)
        @echo "Good."
@@ -220,6 +221,14 @@ verify-version-python: verify-version-components
                 echo "Please edit version and $(PV_FILE) to have consistent versions." && false)
        @echo "Good."
 
+.PHONY: verify-version-manpage
+verify-version-manpage: verify-version-components
+       @echo -n "Checking that manual page version is $(VERSION)..."
+       @[ "$(VERSION)" = $$(sed -n '/^[.]TH NOTMUCH 1/{s/.*"Notmuch //;s/".*//p;}' notmuch.1) ] || \
+               (echo "No." && \
+                echo "Please edit version and notmuch.1 to have consistent versions." && false)
+       @echo "Good."
+
 .PHONY: verify-version-components
 verify-version-components:
        @echo -n "Checking that $(VERSION) consists only of digits and periods..."
@@ -287,9 +296,11 @@ clean:
 distclean: clean
 
 notmuch_client_srcs =          \
+       command-line-arguments.c\
        debugger.c              \
        gmime-filter-reply.c    \
        gmime-filter-headers.c  \
+       hooks.c                 \
        notmuch.c               \
        notmuch-config.c        \
        notmuch-count.c         \