Bumped to 1.2 in preparation for next release.

4 files changed, 54 insertions, 54 deletions

diff --git a/ez_setup.py b/ez_setup.py
index 7a597d22..13d0949f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@ try:
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1"
+DEFAULT_VERSION = "1.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index df9b9c2d..abcafd65 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-install_scripts = setuptools.command.install_scripts:install_scripts
-install = setuptools.command.install:install
-setopt = setuptools.command.setopt:setopt
-register = setuptools.command.register:register
-easy_install = setuptools.command.easy_install:easy_install
-test = setuptools.command.test:test
-sdist = setuptools.command.sdist:sdist
-alias = setuptools.command.alias:alias
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-egg_info = setuptools.command.egg_info:egg_info
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-build_py = setuptools.command.build_py:build_py
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_lib = setuptools.command.install_lib:install_lib
-develop = setuptools.command.develop:develop
-rotate = setuptools.command.rotate:rotate
-build_ext = setuptools.command.build_ext:build_ext
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-saveopts = setuptools.command.saveopts:saveopts
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [distutils.setup_keywords]
-tests_require = setuptools.dist:check_requirements
-install_requires = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 exclude_package_data = setuptools.dist:check_package_data
-dependency_links = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
 convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-use_2to3 = setuptools.dist:assert_bool
 test_suite = setuptools.dist:check_test_suite
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
 packages = setuptools.dist:check_packages
-eager_resources = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+entry_points = setuptools.dist:check_entry_points
 include_package_data = setuptools.dist:assert_bool
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 extras_require = setuptools.dist:check_extras
-entry_points = setuptools.dist:check_entry_points
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
+test_loader = setuptools.dist:check_importable
+install_requires = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+dependency_links = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+zip_safe = setuptools.dist:assert_bool
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
-entry_points.txt = setuptools.command.egg_info:write_entries
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[distutils.commands]
+easy_install = setuptools.command.easy_install:easy_install
+build_ext = setuptools.command.build_ext:build_ext
+install = setuptools.command.install:install
+saveopts = setuptools.command.saveopts:saveopts
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
+install_scripts = setuptools.command.install_scripts:install_scripts
+egg_info = setuptools.command.egg_info:egg_info
+upload_docs = setuptools.command.upload_docs:upload_docs
+sdist = setuptools.command.sdist:sdist
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+alias = setuptools.command.alias:alias
+rotate = setuptools.command.rotate:rotate
+register = setuptools.command.register:register
+develop = setuptools.command.develop:develop
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_lib = setuptools.command.install_lib:install_lib
+build_py = setuptools.command.build_py:build_py
+setopt = setuptools.command.setopt:setopt
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index c06a8a0b..6d385dc7 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 439eb0cd..64477cf2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1'
+__version__ = '1.2'