Fixed so _markerlib is included in Python 3 as well. I don't like the package pollution, but we can maybe fix that later.

--HG--
branch : distribute
extra : rebase_source : 5b3de3075ffea309979c51df9d6a6a6fb1188050

2 files changed, 47 insertions, 46 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 461cfd4f..9837747a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,7 @@ recursive-include setuptools *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx *.txt
 recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
+recursive-include _markerlib *.py
 include *.py
 include *.txt
 include MANIFEST.in
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 663882d6..667a6d7a 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-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
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
 [egg_info.writers]
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
 namespace_packages.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
 
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
+include_package_data = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+use_2to3_fixers = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
 extras_require = setuptools.dist:check_extras
+eager_resources = setuptools.dist:assert_string_list
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
 exclude_package_data = setuptools.dist:check_package_data
+entry_points = setuptools.dist:check_entry_points
 namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
+use_2to3 = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
 packages = setuptools.dist:check_packages
+test_suite = setuptools.dist:check_test_suite
 convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
+dependency_links = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[distutils.commands]
+upload_docs = setuptools.command.upload_docs:upload_docs
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+saveopts = setuptools.command.saveopts:saveopts
+install_lib = setuptools.command.install_lib:install_lib
+register = setuptools.command.register:register
+develop = setuptools.command.develop:develop
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+build_py = setuptools.command.build_py:build_py
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_ext = setuptools.command.build_ext:build_ext
+test = setuptools.command.test:test
+egg_info = setuptools.command.egg_info:egg_info
+setopt = setuptools.command.setopt:setopt
+install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+sdist = setuptools.command.sdist:sdist
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl