notmuch: Fix off-by-one errors if a header is >200 characters long.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 854cf5200393707ca4ab8cc8dbf81d69bfec95eb..59b8d64ef4a3bf85797e6f517dcb29cbd0de640e 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -89,11 +89,17 @@ dist: $(TAR_FILE)
 release: verify-source-tree-and-version
        $(MAKE) VERSION=$(VERSION) verify-newer
        $(MAKE) VERSION=$(VERSION) test
+       rm -rf ./debian-build
+       git-buildpackage
+       cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz
        $(MAKE) VERSION=$(VERSION) $(GPG_FILE)
        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)"
        mkdir -p releases
        mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
+       (cd debian-build; dput *.changes)
+       mv debian-build/* releases
+       rmdir debian-build
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
        git push origin $(VERSION)
        $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
@@ -267,11 +273,20 @@ ifeq ($(MAKECMDGOALS), install)
        @echo ""
        @echo "Notmuch is now installed to $(DESTDIR)$(prefix)"
        @echo ""
-       @echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:"
+       @echo "New users should simply run \"notmuch\" to be guided"
+       @echo "through the process of configuring notmuch and creating"
+       @echo "a database of existing email messages. The \"notmuch\""
+       @echo "command will also offer some sample search commands."
+       @echo ""
+       @echo "Beyond the command-line interface, notmuch also offers"
+       @echo "a full-featured interface for reading and writing mail"
+       @echo "within emacs. To use this, each user should add the"
+       @echo "following line to the ~/.emacs file:"
        @echo ""
        @echo " (require 'notmuch)"
        @echo ""
-       @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\""
+       @echo "And then run emacs as \"emacs -f notmuch\" or invoke"
+       @echo "the command \"M-x notmuch\" from within emacs."
 endif
 
 .PHONY: install-desktop