lib: replace deprecated n_q_count_messages with status returning version

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index d2ef3e080b7b266f46d894a59c6fb61c04124e5c..03eafaaa523bf82b00237860fd590d32c8bead7a 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -70,11 +70,11 @@ release: verify-source-tree-and-version
        pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
        git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
        mkdir -p releases
-       mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
+       mv $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) releases
        $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
 ifeq ($(REALLY_UPLOAD),yes)
        git push origin $(VERSION)
-       cd releases && scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
+       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
        @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
@@ -114,9 +114,9 @@ release-message:
        @echo ""
        @echo "Which can be verified with:"
        @echo ""
-       @echo "  $(RELEASE_URL)/$(SHA1_FILE)"
+       @echo "  $(RELEASE_URL)/$(SHA256_FILE)"
        @echo -n "  "
-       @cat releases/$(SHA1_FILE)
+       @cat releases/$(SHA256_FILE)
        @echo ""
        @echo "  $(RELEASE_URL)/$(GPG_FILE)"
        @echo "  (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
@@ -241,7 +241,7 @@ notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 
 notmuch.o: version.stamp
 
-notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a
+notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libnotmuch_util.a parse-time-string/libparse-time-string.a
        $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
 
 notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)