fix paths and start to fill in dependencies

diff --git a/debian/control b/debian/control
index b83cdb2..463e787 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,20 @@ Build-Depends: devscripts, debhelper (>=7.0.50~), debconf, dpatch
 
 Package: sfa-common
 Architecture: any
-Depends: python-openssl, python-m2crypto, python-dateutil
+Depends: python (>= 2.5), python-openssl (>= 0.7), python-m2crypto, python-dateutil, python-lxml, python-libxslt1, python-setuptools, python-zsi, postgresql (>= 8.2)
+# further depends from fedora - no obvious match on debian for now
+###tmp### #Requires: xmlsec1-openssl-devel  (libxmlsec1-dev or libxmlsec1-openssl or ??)
+###tmp### #Requires: util-linux-ng
+###tmp### # for the registry
+###tmp### #Requires: postgresql >= 8.2, postgresql-server >= 8.2
+###tmp### # xxx here 
+###tmp### Requires: postgresql-python
+###tmp### Requires: python-psycopg2
+###tmp### # f8=0.4 - f12=0.5 f14=0.6 f16=0.7
+###tmp### Requires: python-sqlalchemy
+###tmp### Requires: python-migrate
+###tmp### # the eucalyptus aggregate uses this module
+###tmp### Requires: python-xmlbuilder
 Description: Slice Facility Architecture, generic implementation derived from PlanetLab
 
 Package: sfa-flashpolicy
@@ -18,7 +31,6 @@ Description: SFA support for flash clients
 Package: sfa-client
 Architecture: any
 Depends: sfa-common
-Depends: pyOpenSSL >= 0.7
 Description: sfi, the SFA experimenter-side CLI
 
 Package: sfa-plc
@@ -29,7 +41,6 @@ Description: the SFA layer around MyPLC
 Package: sfa-cm
 Architecture: any
 Depends: sfa-common
-Depends: pyOpenSSL >= 0.6
 Description: the SFA layer around MyPLC NodeManager
 
 Package: sfa-federica

diff --git a/debian/sfa-common.install b/debian/sfa-common.install
index 491e948..93531fb 100644 (file)
--- a/debian/sfa-common.install
+++ b/debian/sfa-common.install
@@ -1,14 +1,14 @@
-usr/lib*/python*/dist-packages/sfa/__init__.py*
-usr/lib*/python*/dist-packages/sfa/trust
-usr/lib*/python*/dist-packages/sfa/storage
-usr/lib*/python*/dist-packages/sfa/util
-usr/lib*/python*/dist-packages/sfa/server
-usr/lib*/python*/dist-packages/sfa/methods
-usr/lib*/python*/dist-packages/sfa/generic
-usr/lib*/python*/dist-packages/sfa/managers
-usr/lib*/python*/dist-packages/sfa/importer
-usr/lib*/python*/dist-packages/sfa/rspecs
-usr/lib*/python*/dist-packages/sfa/client
+usr/lib*/python*/site-packages/sfa/__init__.py*
+usr/lib*/python*/site-packages/sfa/trust
+usr/lib*/python*/site-packages/sfa/storage
+usr/lib*/python*/site-packages/sfa/util
+usr/lib*/python*/site-packages/sfa/server
+usr/lib*/python*/site-packages/sfa/methods
+usr/lib*/python*/site-packages/sfa/generic
+usr/lib*/python*/site-packages/sfa/managers
+usr/lib*/python*/site-packages/sfa/importer
+usr/lib*/python*/site-packages/sfa/rspecs
+usr/lib*/python*/site-packages/sfa/client
 usr/bin/sfa-start.py*
 usr/bin/sfaadmin.py*
 usr/bin/sfaadmin

diff --git a/debian/sfa-dummy.install b/debian/sfa-dummy.install
index ee42546..3af0686 100644 (file)
--- a/debian/sfa-dummy.install
+++ b/debian/sfa-dummy.install
@@ -1 +1 @@
-usr/lib*/python*/dist-packages/sfa/dummy
+usr/lib*/python*/site-packages/sfa/dummy

diff --git a/debian/sfa-federica.install b/debian/sfa-federica.install
index 2ff7d0b..c5abdd1 100644 (file)
--- a/debian/sfa-federica.install
+++ b/debian/sfa-federica.install
@@ -1 +1 @@
-usr/lib*/python*/dist-packages/sfa/federica
+usr/lib*/python*/site-packages/sfa/federica

diff --git a/debian/sfa-nito.install b/debian/sfa-nito.install
index 848cf58..e76e3cc 100644 (file)
--- a/debian/sfa-nito.install
+++ b/debian/sfa-nito.install
@@ -1 +1 @@
-usr/lib*/python*/dist-packages/sfa/nitos
+usr/lib*/python*/site-packages/sfa/nitos

diff --git a/debian/sfa-plc.install b/debian/sfa-plc.install
index 05fff9f..78938fe 100644 (file)
--- a/debian/sfa-plc.install
+++ b/debian/sfa-plc.install
@@ -1,5 +1,5 @@
-usr/lib*/python*/dist-packages/sfa/planetlab
-usr/lib*/python*/dist-packages/sfa/openstack
+usr/lib*/python*/site-packages/sfa/planetlab
+usr/lib*/python*/site-packages/sfa/openstack
 etc/sfa/pl.rng
 etc/sfa/credential.xsd
 etc/sfa/top.xsd

diff --git a/debian/sfa-sfatables.install b/debian/sfa-sfatables.install
index 20b9e7c..74186b0 100644 (file)
--- a/debian/sfa-sfatables.install
+++ b/debian/sfa-sfatables.install
@@ -1,3 +1,3 @@
 etc/sfatables/*
 usr/bin/sfatables
-usr/lib*/python*/dist-packages/sfatables
+usr/lib*/python*/site-packages/sfatables

diff --git a/debian/sfa-xmlbuilder.install b/debian/sfa-xmlbuilder.install
index e380aaa..6e89f50 100644 (file)
--- a/debian/sfa-xmlbuilder.install
+++ b/debian/sfa-xmlbuilder.install
@@ -1 +1 @@
-usr/lib*/python*/dist-packages/xmlbuilder
+usr/lib*/python*/site-packages/xmlbuilder