From 43329058964f3021d997b8e2b35d3fec913e7692 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 17:47:03 +0200
Subject: starting 0.6.12

--HG--
branch : distribute
extra : rebase_source : 206e8a982bbd49a697579b98d6728a0a61bfd31c
---
 CHANGES.txt                          | 6 ++++++
 README.txt                           | 6 +++---
 distribute.egg-info/entry_points.txt | 3 ++-
 distribute_setup.py                  | 2 +-
 docs/conf.py                         | 2 +-
 release.sh                           | 2 +-
 setup.py                             | 2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9824beff..b347ae94 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.12
+------
+
+*
+
 ------
 0.6.11
 ------
diff --git a/README.txt b/README.txt
index bd084770..dba817db 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.11.tar.gz
-    $ tar -xzvf distribute-0.6.11.tar.gz
-    $ cd distribute-0.6.11
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.12.tar.gz
+    $ tar -xzvf distribute-0.6.12.tar.gz
+    $ cd distribute-0.6.12
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d..7ff3d253 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -8,6 +8,7 @@ saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
 upload_docs = setuptools.command.upload_docs:upload_docs
+upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -32,7 +33,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.4 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/distribute_setup.py b/distribute_setup.py
index 3c23affa..4f7bd08c 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ except ImportError:
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.11"
+DEFAULT_VERSION = "0.6.12"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 3991c73c..42a072fe 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@ copyright = u'2009, The fellowship of the packaging'
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.11'
+version = '0.6.12'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index fa1151c8..8388e993 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.11"
+export VERSION="0.6.12"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 064c2afd..43aa1540 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ init_path = convert_path('setuptools/command/__init__.py')
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.11"
+VERSION = "0.6.12"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
-- 
cgit v1.2.3