Setup changes.

setup.py

@@ -7,7 +7,7 @@ version, extra = string.split(sys.version, ' ', 1)
 maj, minor = string.split(version, '.', 1)
 
 if not maj[0] >= '2' and minor[0] >= '3':
-    msg = ("xsupervisord requires Python 2.3 or better, you are attempting to "
+    msg = ("supervisor requires Python 2.3 or better, you are attempting to "
            "install it using version %s.  Please install with a "
            "supported version" % version)
 
@@ -15,14 +15,14 @@ from distutils.core import setup
 
 
 setup(
-    name = 'xsupervisor',
+    name = 'supervisor',
     version = "0.1",
     description = ".",
     author = "Chris McDonough",
     author_email = "chrism@plope.com",
     maintainer = "Chris McDonough",
     maintainer_email = "chrism@plope.com",
-    scripts=['xsupervisord'],
-    packages = ['xsupervisor'],
-    package_dir = {'xsupervisor':'xsupervisor'},
+    scripts=['supervisord'],
+    packages = ['supervisor', 'supervisor.medusa'],
+    package_dir = {'supervisor':'.'},
     )

src/supervisor/supervisord

@@ -1,4 +1,4 @@
 #!/usr/bin/python
-from xsupervisor.supervisord import main
+from supervisor.supervisord import main
 main()