rename sipb_xen_database -> invirt.database

Keeping old name for now, for compatibility.

svn path=/trunk/packages/sipb-xen-database/; revision=824

diff --git a/debian/changelog b/debian/changelog
index 2665feb..8f56efb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sipb-xen-database (10.14) unstable; urgency=low
+
+  * Rename sipb_xen_database -> invirt.database,
+    keeping old name too for now, for compatibility.
+
+ -- Greg Price <price@mit.edu>  Sat,  2 Aug 2008 23:19:18 -0400
+
 sipb-xen-database (10.13) unstable; urgency=low
 
   * Modify autoinstalls table to specify distribution/mirror.

diff --git a/debian/control b/debian/control
index d49a3da..d36987d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sipb-xen-database
 Section: net
 Priority: extra
 Maintainer: SIPB Xen Project <sipb-xen@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), python-support (>= 0.3.2), python-support (>= 0.5.3)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), python-support (>= 0.5.3)
 Standards-Version: 3.7.2
 
 Package: sipb-xen-database-common
@@ -20,7 +20,7 @@ Description: Installs the SIPB Xen database server
 
 Package: sipb-xen-database-client
 Architecture: all
-Depends: ${misc:Depends}, python-sqlalchemy, python-psycopg2, sipb-xen-database-common, python
+Depends: ${misc:Depends}, postgresql-client-8.1, python-sqlalchemy, python-psycopg2, sipb-xen-database-common, python
 Description: Installs the SIPB Xen database configuration file
  This is a python xen configuration script that talks to the database
  to dynamically load xen domU configuration information

diff --git a/debian/rules b/debian/rules
index 7ad2c34..e59a28a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
 
-DEB_PYTHON_SYSTEM=pysupport
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+
+binary-install/sipb-xen-database-common::
+       dh_pysupport -psipb-xen-database-common

diff --git a/debian/sipb-xen-database-common.install b/debian/sipb-xen-database-common.install
index 293db0e..bb1d6ce 100644 (file)
--- a/debian/sipb-xen-database-common.install
+++ b/debian/sipb-xen-database-common.install
@@ -1,2 +1,3 @@
 common/* .
-debian/tmp/usr/lib/python* usr/lib/
+python/* usr/share/python-support/sipb-xen-database-common/invirt/
+python/database/* usr/share/python-support/sipb-xen-database-common/sipb_xen_database/

diff --git a/sipb_xen_database/__init__.py b/python/database/__init__.py
similarity index 100%
rename from sipb_xen_database/__init__.py
rename to python/database/__init__.py

diff --git a/sipb_xen_database/models.py b/python/database/models.py
similarity index 100%
rename from sipb_xen_database/models.py
rename to python/database/models.py