emacs: Fix notmuch-hello-tag-list-make-query defcustom

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index c94402b18d04e858fa89bd2e0a9b666fc14efeb5..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:
@@ -295,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         \