VERSION:=$(shell cat ${srcdir}/version)
ifneq ($(MAKECMDGOALS),release)
ifneq ($(MAKECMDGOALS),release-message)
+ifneq ($(MAKECMDGOALS),pre-release)
ifeq ($(IS_GIT),yes)
VERSION:=$(shell git describe --match '[0-9.]*')
endif
endif
endif
+endif
+
+UPSTREAM_TAG=$(subst ~,_,$(VERSION))
+DEB_TAG=debian/$(UPSTREAM_TAG)-1
RELEASE_HOST=notmuchmail.org
RELEASE_DIR=/srv/notmuchmail.org/www/releases
$(MAKE) VERSION=$(VERSION) verify-newer
$(MAKE) VERSION=$(VERSION) clean
$(MAKE) VERSION=$(VERSION) test
- git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
+ git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
$(MAKE) VERSION=$(VERSION) $(GPG_FILE)
ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
- pristine-tar commit $(DEB_TAR_FILE) $(VERSION)
- git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" debian/$(VERSION)-1
+ 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
$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
endif
@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
+.PHONY: pre-release
+pre-release:
+ $(MAKE) VERSION=$(VERSION) clean
+ $(MAKE) VERSION=$(VERSION) test
+ git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
+ git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
+ $(MAKE) VERSION=$(VERSION) $(TAR_FILE)
+ ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
+ pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
+ mkdir -p releases
+ mv $(TAR_FILE) $(DEB_TAR_FILE) releases
+
.PHONY: release-message
release-message:
@echo "To: notmuch@notmuchmail.org"
+Notmuch 0.7 (2011-08-01)
+========================
+
+Vim interface improvements
+--------------------------
+
+Jason Woofenden provided a number of bug fixes for the Vim interface
+
+ * fix citation/signature fold lengths
+ * fix cig/cit parsing within multipart/*
+ * fix on-screen instructions for show-signature
+ * fix from list reformatting in search view
+ * fix space key: now archives (did opposite)
+
+Uwe Kleine-König contributed
+
+ * use full path for sendmail/doc fix
+ * fix compose temp file name
+
+Python Bindings changes
+-----------------------
+
+Sebastian Spaeth contributed two changes related to unicode and UTF8:
+
+ * message tags are now explicitly unicode
+ * query string is encoded as a UTF8 byte string
+
+Build-System improvments
+------------------------
+
+Generate notmuch.sym after the relevant object files
+
+ This fixes a bug in parallel building. Thanks to Thomas Jost for the
+ patch.
+
Notmuch 0.6.1 (2011-07-17)
==========================
+notmuch (0.7-1) unstable; urgency=low
+
+ * New upstream release (no changes since 0.7~rc1).
+ * Upload to unstable.
+
+ -- David Bremner <bremner@debian.org> Mon, 01 Aug 2011 21:46:26 +0200
+
+notmuch (0.7~rc1-1) experimental; urgency=low
+
+ * Upstream release candidate.
+ * Fix for notmuch.sym and parallel build (Thanks to
+ Thomas Jost)
+ * Bug fixes from Jason Woofenden for vim interface:
+ - Fix "space (in show mode) mostly adds tag:inbox and tag:unread
+ instead of removing them" (Closes: #633009).
+ - Fix "says press 's'; to toggle signatures, but it's
+ really 'i'", (Closes: #633115).
+ - Fix "fix for from list on search pages", (Closes: #633045).
+ * Bug fixes for vim interface from Uwe Kleine-König
+ - use full path for sendmail/doc fix
+ - fix compose temp file name
+ * Python tag encoding fixes from Sebastian Spaeth.
+
+ -- David Bremner <bremner@debian.org> Fri, 29 Jul 2011 12:16:56 +0200
+
notmuch (0.6.1-1) unstable; urgency=low
* Properly install README.Debian in notmuch-vim (Closes: #632992).
#!/usr/bin/make -f
-VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version:\([^-]*\)/\1/p')
-
%:
dh --with python2 $@
override_dh_auto_configure:
- cp version debian/version.pre-build
- echo $(VERSION) > version
dh_auto_configure -- --emacslispdir=/usr/share/emacs/site-lisp/notmuch
override_dh_auto_build:
dh_auto_build --sourcedirectory bindings/python
override_dh_auto_clean:
- -mv debian/version.pre-build version
dh_auto_clean
dh_auto_clean --sourcedirectory bindings/python