X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=5108a0cc60393eda486088cd50620eeb34545a48;hp=02afdd0f0308c24f2b71388f6e2dec5943d855d7;hb=d399b6b909fe6e2c6073464006061382c8bb31d5;hpb=fa3e2bad397fa3d8cb3e6edb99c55f8e00fecf04 diff --git a/Makefile.local b/Makefile.local index 02afdd0f..5108a0cc 100644 --- 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." @@ -143,7 +143,7 @@ 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' + 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 @@ -207,7 +207,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." @@ -295,9 +295,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 \