]> git.notmuchmail.org Git - notmuch/commitdiff
Merge commit '0.1'
authorCarl Worth <cworth@cworth.org>
Mon, 5 Apr 2010 22:54:17 +0000 (15:54 -0700)
committerCarl Worth <cworth@cworth.org>
Mon, 5 Apr 2010 22:54:17 +0000 (15:54 -0700)
This is a merge of the few changes I made to release 0.1
retroactively, (after having incremented the version to 0.1.1).

Conflicts:
Makefile.local (renamed NOTMUCH_VERSION to VERSION)

1  2 
Makefile.local

diff --cc Makefile.local
index b35cbdd8fe7513c72488c16ffad0d242e7a374d7,ecb9ae0d81b11dd8f4f1f532be277d3f51244ee1..4a6e3aeb23a31adb99811888775c31a58c7516f3
  # repository), we add a third digit, (0.1.1, 0.1.2, etc.), and
  # increment it occasionally, (such as after a big batch of commits are
  # merged.
- NOTMUCH_VERSION=0.1.1
+ PACKAGE=notmuch
 -VERSION=0.1
++VERSION=0.1.1
+ RELEASE_HOST=notmuchmail.org
+ RELEASE_DIR=/srv/notmuchmail.org/www/releases
+ TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
+ SHA1_FILE=$(TAR_FILE).sha1
+ GPG_FILE=$(SHA1_FILE).asc
  
  # Get settings from the output of configure by running it to generate
  # Makefile.config if it doesn't exist yet. And add Makefile.config to