diff --git a/MANIFEST b/MANIFEST
index fd52490e9..e69de29bb 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,386 +0,0 @@
-.hgignore
-CHANGELOG
-LICENSE
-MANIFEST
-README.txt
-TODO.txt
-_findpy.py
-doc/announce/release-0.9.0.txt
-doc/announce/release-0.9.2.txt
-doc/announce/release-1.0.0.txt
-doc/announce/releases.txt
-doc/bin.txt
-doc/code.txt
-doc/confrest.py
-doc/conftest.py
-doc/contact.txt
-doc/download.txt
-doc/execnet.txt
-doc/img/pylib.png
-doc/index.txt
-doc/io.txt
-doc/log.txt
-doc/misc.txt
-doc/path.txt
-doc/style.css
-doc/test/attic.txt
-doc/test/config.txt
-doc/test/dist.txt
-doc/test/examples.txt
-doc/test/extend.txt
-doc/test/features.txt
-doc/test/funcargs.txt
-doc/test/quickstart.txt
-doc/test/test.txt
-doc/test/xunit_setup.txt
-doc/xml.txt
-example/execnet/popen_read_multiple.py
-example/funcarg/costlysetup/conftest.py
-example/funcarg/costlysetup/sub1/test_quick.py
-example/funcarg/costlysetup/sub2/test_two.py
-example/funcarg/mysetup/__init__.py
-example/funcarg/mysetup/conftest.py
-example/funcarg/mysetup/myapp.py
-example/funcarg/mysetup/test_sample.py
-example/funcarg/mysetup2/__init__.py
-example/funcarg/mysetup2/conftest.py
-example/funcarg/mysetup2/myapp.py
-example/funcarg/mysetup2/test_sample.py
-example/funcarg/mysetup2/test_ssh.py
-example/funcarg/parametrize/test_parametrize.py
-example/funcarg/parametrize/test_parametrize2.py
-example/funcarg/parametrize/test_parametrize3.py
-example/funcarg/test_simpleprovider.py
-example/genhtml.py
-example/genhtmlcss.py
-example/genxml.py
-example/pytest/failure_demo.py
-example/pytest/test_failures.py
-example/pytest/test_setup_flow_example.py
-ez_setup.py
-py/LICENSE
-py/__init__.py
-py/_com.py
-py/bin/_findpy.py
-py/bin/_genscripts.py
-py/bin/gendoc.py
-py/bin/py.cleanup
-py/bin/py.countloc
-py/bin/py.lookup
-py/bin/py.rest
-py/bin/py.svnwcrevert
-py/bin/py.test
-py/bin/py.which
-py/bin/win32/py.cleanup.cmd
-py/bin/win32/py.countloc.cmd
-py/bin/win32/py.lookup.cmd
-py/bin/win32/py.rest.cmd
-py/bin/win32/py.svnwcrevert.cmd
-py/bin/win32/py.test.cmd
-py/bin/win32/py.which.cmd
-py/builtin/__init__.py
-py/builtin/enumerate.py
-py/builtin/exception.py
-py/builtin/reversed.py
-py/builtin/set.py
-py/builtin/sorted.py
-py/builtin/testing/__init__.py
-py/builtin/testing/test_enumerate.py
-py/builtin/testing/test_exception.py
-py/builtin/testing/test_reversed.py
-py/builtin/testing/test_set.py
-py/builtin/testing/test_sorted.py
-py/cmdline/__init__.py
-py/cmdline/pycleanup.py
-py/cmdline/pycountloc.py
-py/cmdline/pylookup.py
-py/cmdline/pyrest.py
-py/cmdline/pysvnwcrevert.py
-py/cmdline/pytest.py
-py/cmdline/pywhich.py
-py/cmdline/testing/__init__.py
-py/cmdline/testing/test_cmdline.py
-py/cmdline/testing/test_generic.py
-py/code/__init__.py
-py/code/code.py
-py/code/excinfo.py
-py/code/frame.py
-py/code/safe_repr.py
-py/code/source.py
-py/code/testing/__init__.py
-py/code/testing/test_code.py
-py/code/testing/test_excinfo.py
-py/code/testing/test_frame.py
-py/code/testing/test_safe_repr.py
-py/code/testing/test_source.py
-py/code/traceback2.py
-py/compat/LICENSE
-py/compat/__init__.py
-py/compat/conftest.py
-py/compat/doctest.py
-py/compat/optparse.py
-py/compat/subprocess.py
-py/compat/testing/__init__.py
-py/compat/testing/test_doctest.py
-py/compat/testing/test_doctest.txt
-py/compat/testing/test_doctest2.py
-py/compat/testing/test_doctest2.txt
-py/compat/testing/test_optparse.py
-py/compat/testing/test_subprocess.py
-py/compat/testing/test_textwrap.py
-py/compat/textwrap.py
-py/conftest.py
-py/env.cmd
-py/env.py
-py/execnet/NOTES
-py/execnet/__init__.py
-py/execnet/channel.py
-py/execnet/gateway.py
-py/execnet/gwmanage.py
-py/execnet/improve-remote-tracebacks.txt
-py/execnet/inputoutput.py
-py/execnet/message.py
-py/execnet/multi.py
-py/execnet/register.py
-py/execnet/rsync.py
-py/execnet/rsync_remote.py
-py/execnet/script/__init__.py
-py/execnet/script/loop_socketserver.py
-py/execnet/script/quitserver.py
-py/execnet/script/shell.py
-py/execnet/script/socketserver.py
-py/execnet/script/socketserverservice.py
-py/execnet/script/xx.py
-py/execnet/testing/__init__.py
-py/execnet/testing/conftest.py
-py/execnet/testing/test_event.py
-py/execnet/testing/test_gateway.py
-py/execnet/testing/test_gwmanage.py
-py/execnet/testing/test_multi.py
-py/execnet/testing/test_pickle.py
-py/execnet/testing/test_rsync.py
-py/execnet/testing/test_xspec.py
-py/execnet/xspec.py
-py/initpkg.py
-py/io/__init__.py
-py/io/dupfile.py
-py/io/fdcapture.py
-py/io/stdcapture.py
-py/io/terminalwriter.py
-py/io/testing/__init__.py
-py/io/testing/test_dupfile.py
-py/io/testing/test_fdcapture.py
-py/io/testing/test_stdcapture.py
-py/io/testing/test_terminalwriter.py
-py/log/__init__.py
-py/log/consumer.py
-py/log/logger.py
-py/log/producer.py
-py/log/testing/__init__.py
-py/log/testing/test_log.py
-py/log/testing/test_logger.py
-py/log/testing/test_warning.py
-py/log/warning.py
-py/magic/__init__.py
-py/magic/assertion.py
-py/magic/autopath.py
-py/magic/exprinfo.py
-py/magic/invoke.py
-py/magic/patch.py
-py/magic/testing/__init__.py
-py/magic/testing/test_assertion.py
-py/magic/testing/test_autopath.py
-py/magic/testing/test_exprinfo.py
-py/magic/testing/test_invoke.py
-py/magic/testing/test_patch.py
-py/magic/testing/test_viewtype.py
-py/magic/viewtype.py
-py/misc/__init__.py
-py/misc/_dist.py
-py/misc/buildcmodule.py
-py/misc/cache.py
-py/misc/cmdline/__init__.py
-py/misc/cmdline/countloc.py
-py/misc/difftime.py
-py/misc/dynpkg.py
-py/misc/error.py
-py/misc/findmissingdocstrings.py
-py/misc/rest.py
-py/misc/std.py
-py/misc/svnlook.py
-py/misc/terminal_helper.py
-py/misc/testing/__init__.py
-py/misc/testing/data/svnlookrepo.dump
-py/misc/testing/test_api.py
-py/misc/testing/test_cache.py
-py/misc/testing/test_com.py
-py/misc/testing/test_error.py
-py/misc/testing/test_initpkg.py
-py/misc/testing/test_std.py
-py/misc/testing/test_svnlook.py
-py/misc/testing/test_terminal.py
-py/path/__init__.py
-py/path/common.py
-py/path/gateway/TODO.txt
-py/path/gateway/__init__.py
-py/path/gateway/channeltest.py
-py/path/gateway/channeltest2.py
-py/path/gateway/remotepath.py
-py/path/local/__init__.py
-py/path/local/common.py
-py/path/local/local.py
-py/path/local/posix.py
-py/path/local/testing/__init__.py
-py/path/local/testing/test_local.py
-py/path/local/testing/test_posix.py
-py/path/local/testing/test_win.py
-py/path/local/win.py
-py/path/svn/__init__.py
-py/path/svn/cache.py
-py/path/svn/quoting.txt
-py/path/svn/svncommon.py
-py/path/svn/testing/__init__.py
-py/path/svn/testing/repotest.dump
-py/path/svn/testing/svntestbase.py
-py/path/svn/testing/test_auth.py
-py/path/svn/testing/test_test_repo.py
-py/path/svn/testing/test_urlcommand.py
-py/path/svn/testing/test_wccommand.py
-py/path/svn/urlcommand.py
-py/path/svn/wccommand.py
-py/path/testing/__init__.py
-py/path/testing/common.py
-py/path/testing/fscommon.py
-py/path/testing/test_api.py
-py/process/__init__.py
-py/process/cmdexec.py
-py/process/forkedfunc.py
-py/process/killproc.py
-py/process/testing/__init__.py
-py/process/testing/test_cmdexec.py
-py/process/testing/test_forkedfunc.py
-py/process/testing/test_killproc.py
-py/rest/__init__.py
-py/rest/convert.py
-py/rest/directive.py
-py/rest/latex.py
-py/rest/rest.sty.template
-py/rest/rst.py
-py/rest/testing/__init__.py
-py/rest/testing/data/example.rst2pdfconfig
-py/rest/testing/data/example1.dot
-py/rest/testing/data/formula.txt
-py/rest/testing/data/formula1.txt
-py/rest/testing/data/graphviz.txt
-py/rest/testing/data/part1.txt
-py/rest/testing/data/part2.txt
-py/rest/testing/data/tocdepth.rst2pdfconfig
-py/rest/testing/setup.py
-py/rest/testing/test_convert.py
-py/rest/testing/test_directive.py
-py/rest/testing/test_htmlrest.py
-py/rest/testing/test_rst.py
-py/rest/testing/test_rst2pdf.py
-py/rest/testing/test_transform.py
-py/rest/transform.py
-py/test/__init__.py
-py/test/cmdline.py
-py/test/collect.py
-py/test/compat.py
-py/test/config.py
-py/test/conftesthandle.py
-py/test/defaultconftest.py
-py/test/dist/__init__.py
-py/test/dist/dsession.py
-py/test/dist/mypickle.py
-py/test/dist/nodemanage.py
-py/test/dist/testing/__init__.py
-py/test/dist/testing/test_dsession.py
-py/test/dist/testing/test_mypickle.py
-py/test/dist/testing/test_nodemanage.py
-py/test/dist/testing/test_txnode.py
-py/test/dist/txnode.py
-py/test/funcargs.py
-py/test/looponfail/__init__.py
-py/test/looponfail/remote.py
-py/test/looponfail/testing/__init__.py
-py/test/looponfail/testing/test_remote.py
-py/test/looponfail/testing/test_util.py
-py/test/looponfail/util.py
-py/test/outcome.py
-py/test/parseopt.py
-py/test/plugin/__init__.py
-py/test/plugin/conftest.py
-py/test/plugin/hookspec.py
-py/test/plugin/pytest__pytest.py
-py/test/plugin/pytest_default.py
-py/test/plugin/pytest_doctest.py
-py/test/plugin/pytest_execnetcleanup.py
-py/test/plugin/pytest_figleaf.py
-py/test/plugin/pytest_hooklog.py
-py/test/plugin/pytest_iocapture.py
-py/test/plugin/pytest_monkeypatch.py
-py/test/plugin/pytest_pdb.py
-py/test/plugin/pytest_pocoo.py
-py/test/plugin/pytest_pylint.py
-py/test/plugin/pytest_pytester.py
-py/test/plugin/pytest_recwarn.py
-py/test/plugin/pytest_restdoc.py
-py/test/plugin/pytest_resultdb.py
-py/test/plugin/pytest_resultlog.py
-py/test/plugin/pytest_runner.py
-py/test/plugin/pytest_terminal.py
-py/test/plugin/pytest_tmpdir.py
-py/test/plugin/pytest_unittest.py
-py/test/plugin/pytest_xfail.py
-py/test/plugin/test_pytest_runner.py
-py/test/pluginmanager.py
-py/test/pycollect.py
-py/test/session.py
-py/test/testing/__init__.py
-py/test/testing/acceptance_test.py
-py/test/testing/conftest.py
-py/test/testing/import_test/package/__init__.py
-py/test/testing/import_test/package/absolute_import_shared_lib.py
-py/test/testing/import_test/package/module_that_imports_shared_lib.py
-py/test/testing/import_test/package/shared_lib.py
-py/test/testing/import_test/package/test_import.py
-py/test/testing/test_collect.py
-py/test/testing/test_compat.py
-py/test/testing/test_config.py
-py/test/testing/test_conftesthandle.py
-py/test/testing/test_deprecated_api.py
-py/test/testing/test_funcargs.py
-py/test/testing/test_genitems.py
-py/test/testing/test_outcome.py
-py/test/testing/test_parseopt.py
-py/test/testing/test_pickling.py
-py/test/testing/test_pluginmanager.py
-py/test/testing/test_pycollect.py
-py/test/testing/test_recording.py
-py/test/testing/test_session.py
-py/test/testing/test_setup_functional.py
-py/test/testing/test_traceback.py
-py/test/web/__init__.py
-py/test/web/exception.py
-py/test/web/post_multipart.py
-py/test/web/webcheck.py
-py/thread/__init__.py
-py/thread/io.py
-py/thread/pool.py
-py/thread/testing/__init__.py
-py/thread/testing/test_io.py
-py/thread/testing/test_pool.py
-py/tool/__init__.py
-py/tool/testing/__init__.py
-py/tool/testing/test_utestconvert.py
-py/tool/utestconvert.py
-py/xmlobj/__init__.py
-py/xmlobj/html.py
-py/xmlobj/misc.py
-py/xmlobj/testing/__init__.py
-py/xmlobj/testing/test_html.py
-py/xmlobj/testing/test_xml.py
-py/xmlobj/visit.py
-py/xmlobj/xml.py
-setup.py
\ No newline at end of file
diff --git a/py/__init__.py b/py/__init__.py
index 2188708ed..97bebde57 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -19,7 +19,7 @@ For questions please check out http://pylib.org/contact.html
 """
 from initpkg import initpkg
 
-version = "1.0.0b3"
+version = "1.0.x"
 
 initpkg(__name__,
     description = "py.test and pylib: advanced testing tool and networking lib", 
diff --git a/setup.py b/setup.py
index 69e618d4b..ed77c5b18 100644
--- a/setup.py
+++ b/setup.py
@@ -2,12 +2,12 @@
 autogenerated by gensetup.py
 setup file for 'py' package based on:
         
-changeset:   1164:506f4c5f741b
+changeset:   1165:0516498708b6
 branch:      trunk
 tag:         tip
 user:        holger krekel <holger@merlinux.eu>
-date:        Tue Jun 23 11:33:20 2009 +0200
-summary:     Added tag 1.0.0b3 for changeset 52c6d9e78777
+date:        Tue Jun 23 12:12:45 2009 +0200
+summary:     remove TODO file (mostly done, superflous or in the issue tracker),
          
          
 """
@@ -41,20 +41,14 @@ def main():
         name='py',
         description='py.test and pylib: advanced testing tool and networking lib',
         long_description = long_description, 
-        version='1.0.0b3', 
+        version='1.0.x', 
         url='http://pylib.org', 
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], 
         author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
         author_email='holger at merlinux.eu, py-dev at codespeak.net',
         
-        entry_points={'console_scripts': ['py.cleanup = py.cmdline:pycleanup',
-                                          'py.countloc = py.cmdline:pycountloc',
-                                          'py.lookup = py.cmdline:pylookup',
-                                          'py.rest = py.cmdline:pyrest',
-                                          'py.svnwcrevert = py.cmdline:pysvnwcrevert',
-                                          'py.test = py.cmdline:pytest',
-                                          'py.which = py.cmdline:pywhich']},
+        entry_points={'console_scripts': []},
         classifiers=['Development Status :: 4 - Beta',
                      'Intended Audience :: Developers',
                      'License :: OSI Approved :: MIT License',
@@ -66,92 +60,8 @@ def main():
                      'Topic :: System :: Distributed Computing',
                      'Topic :: Utilities',
                      'Programming Language :: Python'],
-        packages=['example.funcarg.mysetup',
-                  'example.funcarg.mysetup2',
-                  'py',
-                  'py.builtin',
-                  'py.builtin.testing',
-                  'py.cmdline',
-                  'py.cmdline.testing',
-                  'py.code',
-                  'py.code.testing',
-                  'py.compat',
-                  'py.compat.testing',
-                  'py.execnet',
-                  'py.execnet.script',
-                  'py.execnet.testing',
-                  'py.io',
-                  'py.io.testing',
-                  'py.log',
-                  'py.log.testing',
-                  'py.magic',
-                  'py.magic.testing',
-                  'py.misc',
-                  'py.misc.cmdline',
-                  'py.misc.testing',
-                  'py.path',
-                  'py.path.gateway',
-                  'py.path.local',
-                  'py.path.local.testing',
-                  'py.path.svn',
-                  'py.path.svn.testing',
-                  'py.path.testing',
-                  'py.process',
-                  'py.process.testing',
-                  'py.rest',
-                  'py.rest.testing',
-                  'py.test',
-                  'py.test.dist',
-                  'py.test.dist.testing',
-                  'py.test.looponfail',
-                  'py.test.looponfail.testing',
-                  'py.test.plugin',
-                  'py.test.testing',
-                  'py.test.testing.import_test.package',
-                  'py.test.web',
-                  'py.thread',
-                  'py.thread.testing',
-                  'py.tool',
-                  'py.tool.testing',
-                  'py.xmlobj',
-                  'py.xmlobj.testing'],
-        package_data={'py': ['LICENSE',
-                             'bin/_findpy.py',
-                             'bin/_genscripts.py',
-                             'bin/gendoc.py',
-                             'bin/py.cleanup',
-                             'bin/py.countloc',
-                             'bin/py.lookup',
-                             'bin/py.rest',
-                             'bin/py.svnwcrevert',
-                             'bin/py.test',
-                             'bin/py.which',
-                             'bin/win32/py.cleanup.cmd',
-                             'bin/win32/py.countloc.cmd',
-                             'bin/win32/py.lookup.cmd',
-                             'bin/win32/py.rest.cmd',
-                             'bin/win32/py.svnwcrevert.cmd',
-                             'bin/win32/py.test.cmd',
-                             'bin/win32/py.which.cmd',
-                             'compat/LICENSE',
-                             'compat/testing/test_doctest.txt',
-                             'compat/testing/test_doctest2.txt',
-                             'env.cmd',
-                             'execnet/NOTES',
-                             'execnet/improve-remote-tracebacks.txt',
-                             'misc/testing/data/svnlookrepo.dump',
-                             'path/gateway/TODO.txt',
-                             'path/svn/quoting.txt',
-                             'path/svn/testing/repotest.dump',
-                             'rest/rest.sty.template',
-                             'rest/testing/data/example.rst2pdfconfig',
-                             'rest/testing/data/example1.dot',
-                             'rest/testing/data/formula.txt',
-                             'rest/testing/data/formula1.txt',
-                             'rest/testing/data/graphviz.txt',
-                             'rest/testing/data/part1.txt',
-                             'rest/testing/data/part2.txt',
-                             'rest/testing/data/tocdepth.rst2pdfconfig']},
+        packages=[],
+        package_data={'py': []},
         zip_safe=False,
     )