merged master onto senslab2, manually solved conflicts in setup.py

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index 921139c..d6fd9e1 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ bins = [
     'sfa/plc/sfa-import-plc.py', 
     'sfa/plc/sfa-nuke-plc.py', 
     'sfa/server/sfa-ca.py', 
-    'sfa/server/sfa-server.py', 
+    'sfa/server/sfa-start.py', 
     'sfa/server/sfa-clean-peer-records.py', 
     'sfa/server/sfa_component_setup.py', 
     'sfa/client/sfi.py', 
@@ -36,17 +36,19 @@ bins = [
 
 package_dirs = [
     'sfa', 
-    'sfa/client',
-    'sfa/methods',
-    'sfa/plc',
-    'sfa/senslab',
-    'sfa/server',
     'sfa/trust',
     'sfa/util', 
+    'sfa/client',
+    'sfa/server',
+    'sfa/methods',
+    'sfa/generic',
     'sfa/managers',
     'sfa/managers/vini',
+    'sfa/plc',
+    'sfa/senslab',
     'sfa/rspecs',
     'sfa/rspecs/elements',
+    'sfa/rspecs/elements/versions',
     'sfa/rspecs/versions',
     'sfatables',
     'sfatables/commands',
@@ -59,6 +61,7 @@ data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
                               'config/default_config.xml',
                               'config/sfi_config',
+                              'config/topology',
                               'sfa/managers/pl/pl.rng',
                               'sfa/trust/credential.xsd',
                               'sfa/trust/top.xsd',