Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by inserting the 0.10.2 stanza before 0.11

diff --combined Makefile.local
index d699463bc7e35b946efe0aaa6da36686b80fd3d0,d97fa6183d45f179294f29b2cf853cbb5898d5b0..15e6d8827661c9d736bb754dbe9422a6942e9c31
--- 1/Makefile.local
--- 2/Makefile.local
+++ b/Makefile.local
@@@ -12,18 -12,16 +12,18 @@@ PACKAGE=notmuc
  
  IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi)
  
 +ifeq ($(IS_GIT),yes)
 +DATE:=$(shell git log --date=short -1 --pretty=format:%cd)
 +else
 +DATE:=$(shell date +%F)
 +endif
 +
  VERSION:=$(shell cat ${srcdir}/version)
 -ifneq ($(MAKECMDGOALS),release)
 -ifneq ($(MAKECMDGOALS),release-message)
 -ifneq ($(MAKECMDGOALS),pre-release)
 +ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
  ifeq ($(IS_GIT),yes)
  VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
  endif
  endif
 -endif
 -endif
  
  UPSTREAM_TAG=$(subst ~,_,$(VERSION))
  DEB_TAG=debian/$(UPSTREAM_TAG)-1
@@@ -93,12 -91,6 +93,12 @@@ $(GPG_FILE): $(SHA1_FILE
  .PHONY: dist
  dist: $(TAR_FILE)
  
 +.PHONY: update-versions
 +
 +update-versions:
 +      sed -i "s/^.TH NOTMUCH 1.*$$/.TH NOTMUCH 1 ${DATE} \"Notmuch ${VERSION}\"/" notmuch.1
 +      sed -i "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" $(PV_FILE)
 +
  # We invoke make recursively only to force ordering of our phony
  # targets in the case of parallel invocation of make (-j).
  #
@@@ -122,7 -114,7 +122,7 @@@ release: verify-source-tree-and-versio
  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 -135,7 +143,7 @@@ debian-snapshot: TMPFILE := $(shell mkt
  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
@@@ -187,7 -179,7 +187,7 @@@ release-message
  verify-source-tree-and-version: verify-no-dirty-code
  
  .PHONY: verify-no-dirty-code
 -verify-no-dirty-code: verify-version-debian verify-version-python
 +verify-no-dirty-code: verify-version-debian verify-version-python verify-version-manpage
  ifeq ($(IS_GIT),yes)
        @printf "Checking that source tree is clean..."
  ifneq ($(shell git ls-files -m),)
@@@ -207,33 -199,28 +207,33 @@@ endi
  .PHONY: verify-version-debian
  verify-version-debian: verify-version-components
        @echo -n "Checking that Debian package version is $(VERSION)-1..."
 -      @if [ "$(VERSION)-1" != $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] ; then \
 +      @[ "$(VERSION)-1" = $$(sed '1{ s/).*//; s/.*(//; q; }' debian/changelog) ] || \
                (echo "No." && \
 -               echo "Please edit version and debian/changelog to have consistent versions." && false) \
 -       fi
 +               echo "Please edit version and debian/changelog to have consistent versions." && false)
        @echo "Good."
  
  .PHONY: verify-version-python
  verify-version-python: verify-version-components
        @echo -n "Checking that python bindings version is $(VERSION)..."
 -      @if [ "$(VERSION)" != $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] ; then \
 +      @[ "$(VERSION)" = $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] || \
 +              (echo "No." && \
 +               echo "Please edit version and $(PV_FILE) to have consistent versions." && false)
 +      @echo "Good."
 +
 +.PHONY: verify-version-manpage
 +verify-version-manpage: verify-version-components
 +      @echo -n "Checking that manual page version is $(VERSION)..."
 +      @[ "$(VERSION)" = $$(sed -n '/^[.]TH NOTMUCH 1/{s/.*"Notmuch //;s/".*//p;}' notmuch.1) ] || \
                (echo "No." && \
 -               echo "Please edit version and $(PV_FILE) to have consistent versions." && false) \
 -       fi
 +               echo "Please edit version and notmuch.1 to have consistent versions." && false)
        @echo "Good."
  
  .PHONY: verify-version-components
  verify-version-components:
        @echo -n "Checking that $(VERSION) consists only of digits and periods..."
 -      @if echo $(VERSION) | grep -q -v -x '[0-9.]*'; then \
 +      @echo $(VERSION) | grep -q -x '^[0-9.]*$$' || \
                (echo "No." && \
 -               echo "Please follow the instructions in RELEASING to choose a version" && false) \
 -       else :; fi
 +               echo "Please follow the instructions in RELEASING to choose a version" && false)
        @echo "Good."
  
  .PHONY: verify-newer

diff --combined NEWS
index 2b2f08a6b799d5ba51a5577fc0a1f44e0126f68e,3f577e4240c2dc09333bf254ccc1bab7e6fa8d08..bb5e4d55f6415a34c1e4a5231799bd62a3a14c7b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,16 -1,14 +1,27 @@@
 +Notmuch 0.11 (201x-xx-xx)
 +=========================
 +
 +Performance
 +-----------
 +
 +Automatic tag query optimization
 +
 +  "notmuch tag" now automatically optimizes the user's query to
 +  exclude messages whose tags won't change.  In the past, we've
 +  suggested that people do this by hand; this is no longer necessary.
 +
 +
+ Notmuch 0.10.2 (2011-12-04)
+ ===========================
+ 
+ Bug-fix release.
+ ----------------
+ 
+ Fix crash in python bindings.
+ 
+     The python bindings did not call g_type_init, which caused crashes
+     for some, but not all users.
+ 
  Notmuch 0.10.1 (2011-11-25)
  ===========================
  

diff --combined test/notmuch-test
index ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570,113ea7cf3330ee8b51fdf9fde3c2ec5fd3ec524c..53ce355cae1dfeed8bd09ef9ef5df46c82e3ebad
--- 1/test/notmuch-test
--- 2/test/notmuch-test
+++ b/test/notmuch-test
@@@ -47,6 -47,7 +47,7 @@@ TESTS=
    symbol-hiding
    search-folder-coherence
    atomicity
+   python
  "
  TESTS=${NOTMUCH_TESTS:=$TESTS}
  
@@@ -61,13 -62,10 +62,13 @@@ els
      TEST_TIMEOUT_CMD=""
  fi
  
 +trap 'e=$?; kill $!; exit $e' HUP INT TERM
  # Run the tests
  for test in $TESTS; do
 -    $TEST_TIMEOUT_CMD ./$test "$@"
 +    $TEST_TIMEOUT_CMD ./$test "$@" &
 +    wait $!
  done
 +trap - HUP INT TERM
  
  # Report results
  ./aggregate-results.sh test-results/*