lib: define specialized get_thread_id for use in thread subquery

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 9d9c52c26d9e85d7eac1420b0002e9b6dd9e1872..2bf0e17aa623ce57e9a940d51286ad01f1d9aa88 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -31,11 +31,12 @@ $(TAR_FILE):
        fi ; \
        git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
        echo $(VERSION) > version.tmp
+       ct=`git --no-pager log -1 --pretty=format:%ct $$ref` ; \
        tar --owner root --group root --append -f $(TAR_FILE).tmp \
                --transform s_^_$(PACKAGE)-$(VERSION)/_  \
-               --transform 's_.tmp$$__' version.tmp
+               --transform 's_.tmp$$__' --mtime=@$$ct version.tmp
        rm version.tmp
-       gzip < $(TAR_FILE).tmp > $(TAR_FILE)
+       gzip -n < $(TAR_FILE).tmp > $(TAR_FILE)
        @echo "Source is ready for release in $(TAR_FILE)"
 
 $(SHA256_FILE): $(TAR_FILE)
@@ -75,7 +76,7 @@ release: verify-source-tree-and-version
        mv $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) releases
        $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
 ifeq ($(REALLY_UPLOAD),yes)
-       git push origin $(VERSION)
+       git push origin $(VERSION) $(DEB_TAG) release pristine-tar
        cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
        ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
 endif
@@ -175,7 +176,7 @@ verify-newer:
             echo "Refusing to replace an existing release."; \
             echo "Don't forget to update \"version\" as described in RELEASING before release." ; \
             false ;; \
-         *) echo "An unexpected error occured"; \
+         *) echo "An unexpected error occurred"; \
             false;; esac
 
 # The user has not set any verbosity, default to quiet mode and inform the
@@ -246,7 +247,6 @@ notmuch_client_srcs =               \
        sprinter-text.c         \
        query-string.c          \
        mime-node.c             \
-       crypto.c                \
        tag-util.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)