From: Carl Worth <cworth@cworth.org>
Date: Mon, 5 Apr 2010 22:54:17 +0000 (-0700)
Subject: Merge commit '0.1'
X-Git-Tag: 0.2~109
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=322eaebabe210c73dd631be1dd6a0a30c3e5e76f;p=notmuch.git

Merge commit '0.1'

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)
---

322eaebabe210c73dd631be1dd6a0a30c3e5e76f
diff --cc Makefile.local
index b35cbdd8,ecb9ae0d..4a6e3aeb
--- a/Makefile.local
+++ b/Makefile.local
@@@ -10,7 -10,14 +10,14 @@@
  # 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