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

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index 019f535..d6fd9e1 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -36,14 +36,16 @@ bins = [
 
 package_dirs = [
     'sfa', 
-    'sfa/client',
-    'sfa/methods',
-    'sfa/plc',
-    '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',
@@ -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',