Merge branch 'master' into senslab2

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index 97e0758..eafced4 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -13,9 +13,6 @@ scripts = glob("sfa/clientbin/*.py") + \
     [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
-    'sfa/importer/sfa-import.py', 
-    'sfa/importer/sfa-nuke.py', 
-    'sfa/server/sfa-ca.py', 
     'sfa/server/sfa-start.py', 
     'sfa/server/sfa_component_setup.py', 
     'sfatables/sfatables',
@@ -35,8 +32,12 @@ packages = [
     'sfa/generic',
     'sfa/managers',
     'sfa/importer',
-    'sfa/plc',
+
+
     'sfa/senslab',
+
+    'sfa/planetlab',
+
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',