From 329d50e5a00dcd28a9cee87eeac7b97e14506406 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat <thierry.parmentelat@inria.fr> Date: Thu, 17 Jan 2013 16:55:54 +0100 Subject: [PATCH] fix paths and start to fill in dependencies --- debian/control | 17 ++++++++++++++--- debian/sfa-common.install | 22 +++++++++++----------- debian/sfa-dummy.install | 2 +- debian/sfa-federica.install | 2 +- debian/sfa-nito.install | 2 +- debian/sfa-plc.install | 4 ++-- debian/sfa-sfatables.install | 2 +- debian/sfa-xmlbuilder.install | 2 +- 8 files changed, 32 insertions(+), 21 deletions(-) diff --git a/debian/control b/debian/control index b83cdb2c..463e7876 100644 --- 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 491e9484..93531fbb 100644 --- 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 ee42546d..3af0686d 100644 --- 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 2ff7d0b3..c5abdd14 100644 --- 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 848cf58a..e76e3cc2 100644 --- 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 05fff9f8..78938fed 100644 --- 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 20b9e7c5..74186b00 100644 --- 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 e380aaa1..6e89f50d 100644 --- a/debian/sfa-xmlbuilder.install +++ b/debian/sfa-xmlbuilder.install @@ -1 +1 @@ -usr/lib*/python*/dist-packages/xmlbuilder +usr/lib*/python*/site-packages/xmlbuilder -- 2.47.0