merges master (so, no sfa-cm anymore)

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index 43d4786..61757df 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,6 +9,8 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
+from sfa.util.version import version_tag
+
 scripts = glob("clientbin/*.py") + \
     [ 
     'config/sfa-config-tty',
@@ -47,7 +49,7 @@ packages = [
     ]
 
 initscripts = [ 'sfa', 
-#                'sfa-cm',
+                'functions.sfa',
                 ]
 
 data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
@@ -107,5 +109,9 @@ else:
     setup(name='sfa',
           packages = packages, 
           data_files = data_files,
-          scripts = scripts)
+          scripts = scripts,
+          url="http://svn.planet-lab.org/wiki/SFATutorial",
+          author="Thierry Parmentelat, Tony Mack, Scott Baker",
+          author_email="thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com",
+          version=version_tag)