Merge branch 'master' into exp2

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index 87a4529..49c6a93 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ bins = [
     'sfa/client/sfiAddAttribute.py',
     'sfa/client/sfiDeleteAttribute.py',
     'sfatables/sfatables',
-    'keyconvert/keyconvert.py'
+    'keyconvert/keyconvert.py',
     'flashpolicy/sfa_flashpolicy.py',
     ]
 
@@ -43,8 +43,10 @@ package_dirs = [
     'sfa/trust',
     'sfa/util', 
     'sfa/managers',
+    'sfa/managers/vini',
     'sfa/rspecs',
-    'sfa/rspecs/aggregates',
+    'sfa/rspecs/elements',
+    'sfa/rspecs/versions',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
@@ -62,7 +64,7 @@ data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               'sfa/trust/sig.xsd',
                               'sfa/trust/xml.xsd',
                               'sfa/trust/protogeni-rspec-common.xsd',
-                              'flash_policy/flashpolicy_config.xml',
+                              'flashpolicy/sfa_flashpolicy_config.xml',
                             ]),
               ('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
               ('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),