aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt11
-rw-r--r--docs/conf.py4
-rwxr-xr-xsetup.py2
3 files changed, 14 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index dfc41bc1..14920b3e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,17 @@
CHANGES
=======
+-----
+0.6.1
+-----
+
+bootstraping
+============
+
+* The boostrap process leave setuptools alone if detected in the system
+ and --root or --prefix is provided, but is not in the same location.
+ This closes http://bitbucket.org/tarek/distribute/issue/10.
+
---
0.6
---
diff --git a/docs/conf.py b/docs/conf.py
index 74bc7a6c..d4ff4a15 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,9 +49,9 @@ copyright = u'2009, The fellowship of the packaging'
# built documents.
#
# The short X.Y version.
-version = '0.6'
+version = '0.6.1'
# The full version, including alpha/beta/rc tags.
-release = '0.6'
+release = '0.6.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index 4deaa1f6..10502748 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ init_path = convert_path('setuptools/command/__init__.py')
exec(open(init_path).read(), d)
SETUP_COMMANDS = d['__all__']
-VERSION = "0.6"
+VERSION = "0.6.1"
from setuptools import setup, find_packages
import sys