merges master (so, no sfa-cm anymore)

diff --combined 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 --combined setup.py
index 55a7b47,43d4786..61757df
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -9,15 -9,13 +9,15 @@@ from glob import glo
  import shutil
  from distutils.core import setup
  
 +from sfa.util.version import version_tag
 +
  scripts = glob("clientbin/*.py") + \
      [ 
      'config/sfa-config-tty',
      'config/sfa-config',
-     'config/gen-sfa-cm-config.py',
+ #    'config/gen-sfa-cm-config.py',
      'sfa/server/sfa-start.py', 
-     'sfa/server/sfa_component_setup.py', 
+ #    'sfa/server/sfa_component_setup.py', 
      'sfatables/sfatables',
      'keyconvert/keyconvert.py',
      'flashpolicy/sfa_flashpolicy.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',
@@@ -108,9 -107,5 +109,9 @@@ else
      setup(name='sfa',
            packages = packages, 
            data_files = data_files,
 -          scripts = scripts)
 +          scripts = scripts,
 +          url="http://svn.planet-lab.org/wiki/SFATutorial",
 +          author="Thierry Parmentelat, Tony Mack, Scott Baker",
 +          author_email="thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com",
 +          version=version_tag)
  

diff --combined sfa.spec
index f901231,f5f8e50..fc1aff5
--- 1/sfa.spec
--- 2/sfa.spec
+++ b/sfa.spec
@@@ -67,7 -67,7 +67,7 @@@ Group: Applications/Syste
  Requires: sfa
  
  %package client
 -Summary: the SFA experimenter-side CLI
 +Summary: sfi, the SFA experimenter-side CLI
  Group: Applications/System
  Requires: sfa
  Requires: pyOpenSSL >= 0.7
@@@ -77,11 -77,11 +77,11 @@@ Summary: the SFA layer around MyPL
  Group: Applications/System
  Requires: sfa
  
- %package cm
- Summary: the SFA layer around MyPLC NodeManager
- Group: Applications/System
- Requires: sfa
- Requires: pyOpenSSL >= 0.6
+ #%package cm
+ #Summary: the SFA layer around MyPLC NodeManager
+ #Group: Applications/System
+ #Requires: sfa
+ #Requires: pyOpenSSL >= 0.6
  
  %package federica
  Summary: the SFA layer around Federica
@@@ -127,9 -127,9 +127,9 @@@ sfi.py, together with other utilities
  This package implements the SFA interface which serves as a layer
  between the existing PlanetLab interfaces and the SFA API.
  
- %description cm
- This package implements the SFA interface which serves as a layer
- between the existing PlanetLab NodeManager interfaces and the SFA API.
+ #%description cm
+ #This package implements the SFA interface which serves as a layer
+ #between the existing PlanetLab NodeManager interfaces and the SFA API.
  
  %description federica
  The SFA driver for FEDERICA.
@@@ -216,12 -216,12 +216,12 @@@ rm -rf $RPM_BUILD_ROO
  /etc/sfa/xml.xsd
  /etc/sfa/protogeni-rspec-common.xsd
  /etc/sfa/topology
- %{_bindir}/gen-sfa-cm-config.py*
+ #%{_bindir}/gen-sfa-cm-config.py*
  
- %files cm
- /etc/init.d/sfa-cm
- %{_bindir}/sfa_component_setup.py*
- # cron jobs here 
+ #%files cm
+ #/etc/init.d/sfa-cm
+ #%{_bindir}/sfa_component_setup.py*
+ ## cron jobs here 
  
  %files federica
  %{python_sitelib}/sfa/federica
@@@ -256,18 -256,18 +256,18 @@@ f
  %postun
  [ "$1" -ge "1" ] && { service sfa dbdump ; service sfa restart ; }
  
- ### sfa-cm installs the 'sfa-cm' service
- %post cm
- chkconfig --add sfa-cm
- 
- %preun cm
- if [ "$1" = 0 ] ; then
-    /sbin/service sfa-cm stop || :
-    /sbin/chkconfig --del sfa-cm || :
- fi
- 
- %postun cm
- [ "$1" -ge "1" ] && service sfa-cm restart || :
+ #### sfa-cm installs the 'sfa-cm' service
+ #%post cm
+ #chkconfig --add sfa-cm
+ #
+ #%preun cm
+ #if [ "$1" = 0 ] ; then
+ #   /sbin/service sfa-cm stop || :
+ #   /sbin/chkconfig --del sfa-cm || :
+ #fi
+ #
+ #%postun cm
+ #[ "$1" -ge "1" ] && service sfa-cm restart || :
  
  %changelog
  * Sun Dec 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-2.1-22