Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

diff --git a/debian/control b/debian/control
index f5e2283..43b92dd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -41,10 +41,15 @@ Architecture: any
 Depends: sfa-common
 Description: the SFA layer around NITOS
 
-Package: sfa-senslab
+Package: sfa-iotlab
 Architecture: any
 Depends: sfa-common, python-passlib, python-ldap
-Description: the SFA layer around SensLab
+Description: the SFA layer around IotLab
+
+Package: sfa-cortexlab
+Architecture: any
+Depends: sfa-common, python-passlib, python-ldap
+Description: the SFA layer around CortexLab
 
 Package: sfa-dummy
 Architecture: any

diff --git a/debian/sfa-cortexlab.install b/debian/sfa-cortexlab.install
new file mode 100644 (file)
index 0000000..e4d2e2d
--- /dev/null
+++ b/debian/sfa-cortexlab.install
@@ -0,0 +1 @@
+usr/lib*/python*/dist-packages/sfa/cortexlab

diff --git a/debian/sfa-senslab.install b/debian/sfa-iotlab.install
similarity index 100%
rename from debian/sfa-senslab.install
rename to debian/sfa-iotlab.install

diff --git a/sfa.spec b/sfa.spec
index 3a1d6c7..ba883a6 100644 (file)
--- a/sfa.spec
+++ b/sfa.spec
@@ -79,8 +79,13 @@ Summary: the SFA layer around NITOS
 Group: Applications/System
 Requires: sfa
 
-%package senslab
-Summary: the SFA layer around SensLab
+%package iotlab
+Summary: the SFA layer around IotLab
+Group: Applications/System
+Requires: sfa
+
+%package cortexlab
+Summary: the SFA layer around CortexLab
 Group: Applications/System
 Requires: sfa
 
@@ -124,8 +129,11 @@ The SFA driver for FEDERICA.
 %description nitos
 The SFA driver for NITOS.
 
-%description senslab
-The SFA driver for SensLab.
+%description iotlab
+The SFA driver for IotLab.
+
+%description cortexlab
+The SFA driver for CortexLab.
 
 %description dummy
 The SFA driver for a Dummy Testbed.
@@ -212,9 +220,12 @@ rm -rf $RPM_BUILD_ROOT
 %files nitos
 %{python_sitelib}/sfa/nitos
 
-%files senslab
+%files iotlab
 %{python_sitelib}/sfa/iotlab
 
+%files cortexlab
+%{python_sitelib}/sfa/cortexlab
+
 %files dummy
 %{python_sitelib}/sfa/dummy