BLD Prepare new release

Most of the improvements are for the build process.

ChangeLog

@@ -1,10 +1,10 @@
-Version 0.6.3+
+Version 0.6.4 2011-04-06 by luispedro
 	* Fix bug in ``cwatershed()`` when using return_lines=1
 	* Fix bug in ``cwatershed()`` when using equivalent types for image and
 	markers
 	* Move tests to mahotas.tests and include them in distribution
 	* Include ChangeLog in distribution
-	* Fix compilation on the Mac OS
+	* Fix compilation on the Mac OS (patch by K-Michael Aye)
 	* Fix compilation warnings on gcc
 
 Version 0.6.3 2011-02-17

README.rst

@@ -25,6 +25,15 @@ Notable algorithms:
 Recent Changes
 --------------
 
+For version 0.6.4
+~~~~~~~~~~~~~~~~~
+
+- Fix bug in ``cwatershed()`` when using return_lines=1
+- Fix bug in ``cwatershed()`` when using equivalent types for image and markers
+- Move tests to mahotas.tests and include them in distribution
+- Include ChangeLog in distribution
+- Fix compilation on the Mac OS
+- Fix compilation warnings on gcc
 For version 0.6.3
 ~~~~~~~~~~~~~~~~~
 - Improve ``mahotas.stretch()`` function
@@ -64,12 +73,6 @@ Bugfix release:
 - Haralick for 3D images
 - Fix mahotas.imread for RGBA images
 
-0.5.3 (Oct 29 2010)
-~~~~~~~~~~~~~~~~~~~
-
-- Releases GIL when possible
-- Added ``imresize()``
-- Much improved ``thin()`` function
 
 *Website*: `http://luispedro.org/software/mahotas
 <http://luispedro.org/software/mahotas>`_

docs/source/readme.rst

@@ -42,6 +42,15 @@ threshold).
 Recent Changes
 --------------
 
+For version **0.6.4**:
+
+- Fix bug in ``cwatershed()`` when using return_lines=1
+- Fix bug in ``cwatershed()`` when using equivalent types for image and markers
+- Move tests to mahotas.tests and include them in distribution
+- Include ChangeLog in distribution
+- Fix compilation on the Mac OS
+- Fix compilation warnings on gcc
+
 For version **0.6.3**:
 
 - Improve ``mahotas.stretch()`` function

mahotas/mahotas_version.py

@@ -1 +1 @@
-__version__ = '0.6.3'
+__version__ = '0.6.4'