Merge remote-tracking branch 'origin/master'

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index c1e8453..a14972c 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -13,11 +13,7 @@ scripts = glob("sfa/clientbin/*.py") + \
     [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
-    'sfa/importer/sfa-import-plc.py', 
-    'sfa/importer/sfa-nuke-plc.py', 
-    'sfa/server/sfa-ca.py', 
     'sfa/server/sfa-start.py', 
-    'sfa/server/sfa-clean-peer-records.py', 
     'sfa/server/sfa_component_setup.py', 
     'sfatables/sfatables',
     'keyconvert/keyconvert.py',
@@ -26,21 +22,23 @@ scripts = glob("sfa/clientbin/*.py") + \
 
 packages = [
     'sfa', 
-    'sfa/openstack',
     'sfa/trust',
     'sfa/storage',
     'sfa/util', 
-    'sfa/client',
     'sfa/server',
     'sfa/methods',
     'sfa/generic',
     'sfa/managers',
     'sfa/importer',
-    'sfa/plc',
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',
     'sfa/rspecs/versions',
+    'sfa/client',
+    'sfa/clientbin',
+    'sfa/planetlab',
+    'sfa/openstack',
+    'sfa/federica',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',