git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into senslab2
[sfa.git]
/
setup.py
diff --git
a/setup.py
b/setup.py
index
ffd8406
..
98d07a8
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-43,9
+43,9
@@
package_dirs = [
'sfa/methods',
'sfa/generic',
'sfa/managers',
'sfa/methods',
'sfa/generic',
'sfa/managers',
- 'sfa/managers/vini',
'sfa/importer',
'sfa/plc',
'sfa/importer',
'sfa/plc',
+ 'sfa/senslab',
'sfa/rspecs',
'sfa/rspecs/elements',
'sfa/rspecs/elements/versions',
'sfa/rspecs',
'sfa/rspecs/elements',
'sfa/rspecs/elements/versions',
@@
-53,7
+53,6
@@
package_dirs = [
'sfatables',
'sfatables/commands',
'sfatables/processors',
'sfatables',
'sfatables/commands',
'sfatables/processors',
- 'flashpolicy',
]
]
@@
-61,6
+60,7
@@
data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
'config/registries.xml',
'config/default_config.xml',
'config/sfi_config',
'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',
'sfa/managers/pl/pl.rng',
'sfa/trust/credential.xsd',
'sfa/trust/top.xsd',