merges master (so, no sfa-cm anymore)

diff --cc debian/control
index 64c00c1,0000000..0b7e461
mode 100644,000000..100644
--- 1/debian/control
--- /dev/null
+++ b/debian/control
@@@ -1,69 -1,0 +1,64 @@@
- Package: sfa-cm
- Architecture: any
- Depends: sfa-common
- Description: the SFA layer around MyPLC NodeManager
- 
 +Source: sfa
 +Maintainer: Thierry Parmentelat <Thierry.Parmentelat@inria.fr>
 +Section: misc
 +Priority: optional
 +Standards-Version: 3.9.2
 +Build-Depends: devscripts, debhelper (>=7.0.50~), debconf, dpatch
 +
 +Package: sfa-common
 +Architecture: any
 +Depends: python (>= 2.5), python-openssl (>= 0.7), python-m2crypto, python-dateutil, python-lxml, python-libxslt1, python-setuptools, python-zsi, postgresql (>= 8.2), python-sqlalchemy, python-migrate
 +#further depends from fedora - no obvious match on debian for now
 +#Requires: xmlsec1-openssl-devel  (libxmlsec1-dev or libxmlsec1-openssl or ??)
 +#Requires: util-linux-ng
 +#Requires: postgresql-python
 +#Requires: python-psycopg2
 +# the eucalyptus aggregate uses this module
 +#Requires: python-xmlbuilder
 +Description: Slice Facility Architecture, generic implementation derived from PlanetLab
 +
 +Package: sfa-flashpolicy
 +Architecture: any
 +Depends: sfa-common
 +Description: SFA support for flash clients
 +
 +Package: sfa-client
 +Architecture: any
 +Depends: sfa-common
 +Description: sfi, the SFA experimenter-side CLI
 +
 +Package: sfa-plc
 +Architecture: any
 +Depends: sfa-common
 +Description: the SFA layer around MyPLC
 +
 +Package: sfa-federica
 +Architecture: any
 +Depends: sfa-common
 +Description: the SFA layer around Federica
 +
 +Package: sfa-nitos
 +Architecture: any
 +Depends: sfa-common
 +Description: the SFA layer around NITOS
 +
 +Package: sfa-dummy
 +Architecture: any
 +Depends: sfa-common
 +Description: the SFA layer around a Dummy Testbed 
 +
 +Package: sfa-sfatables
 +Architecture: any
 +Depends: sfa-common
 +Description: sfatables policy tool for SFA
 +
 +Package: sfa-xmlbuilder
 +Architecture: any
 +Provides: python-xmlbuilder
 +Description: third-party xmlbuilder tool
 +
 +Package: sfa-tests
 +Architecture: any
 +Depends: sfa-common
 +Description: unit tests suite for SFA
 +

diff --cc setup.py
index 55a7b47,43d4786..61757df
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -48,8 -46,9 +48,9 @@@ packages = 
      'sfatables/processors',
      ]
  
- # need to do something about functions
- initscripts = [ 'sfa', 'sfa-cm', 'functions.sfa' ]
+ initscripts = [ 'sfa', 
 -#                'sfa-cm',
++                'functions.sfa',
+                 ]
  
  data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
                                'config/registries.xml',

diff --cc sfa.spec
Simple merge