Adjust python dependencies to enable build on Lucid

debian/control

@@ -6,8 +6,8 @@ XSBC-Original-Maintainer: Open vSwitch developers <dev@openvswitch.org>
 Uploaders: Ben Pfaff <pfaffben@debian.org>, Simon Horman <horms@debian.org>
 Build-Depends:
  debhelper (>= 5), autoconf (>= 2.64), automake (>= 1.10) | automake1.10, 
- libssl-dev, pkg-config (>= 0.21), po-debconf, bzip2, openssl,
- python (>= 2.6.6-3), procps, python-qt4,
+ libssl-dev, pkg-config (>= 0.21), po-debconf, bzip2, openssl, python,
+ python-support (>= 0.8.4), procps, python-qt4,
  python-zopeinterface, python-twisted-conch
 Standards-Version: 3.9.2
 Homepage: http://openvswitch.org/
@@ -57,7 +57,7 @@ Description: Open vSwitch switch implementations
 Package: openvswitch-ipsec
 Architecture: linux-any
 Depends:
- ${shlibs:Depends}, ${misc:Depends}, python,
+ ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, 
  ipsec-tools (>=0.8~alpha20101208), 
  racoon (>=0.8~alpha20101208),
  openvswitch-common (= ${binary:Version}),
@@ -94,8 +94,7 @@ Description: Open vSwitch controller implementation
 
 Package: openvswitch-brcompat
 Architecture: linux-any
-Depends:
- ${shlibs:Depends}, openvswitch-switch (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, openvswitch-switch (= ${binary:Version})
 Recommends: bridge-utils
 Description: Open vSwitch bridge compatibility support
  openvswitch-brcompat provides a way for applications that use the
@@ -126,13 +125,15 @@ Package: python-openvswitch
 Architecture: all
 Section: python
 Depends: ${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
 Description: Python bindings for Open vSwitch
  This package contains the full Python bindings for Open vSwitch database.
 
 Package: ovsdbmonitor
 Architecture: all
 Section: utils
-Depends: ${python:Depends}, python-openvswitch, ${misc:Depends}
+Depends: ${python:Depends}, python-openvswitch
+Provides: ${python:Provides}
 Description: Open vSwitch graphical monitoring tool
  This package is a GUI tool for monitoring and troubleshooting local
  or remote Open vSwitch installations.  It presents GUI tables that

debian/openvswitch-ipsec.init

@@ -73,9 +73,10 @@ start_server() {
         install -d -m 755 -o root -g root /var/run/openvswitch
     fi
 
-    /usr/share/openvswitch/scripts/ovs-monitor-ipsec \
-           --pidfile=$PIDFILE --log-file --detach --monitor \
-           unix:/var/run/openvswitch/db.sock
+    PYTHONPATH=/usr/share/openvswitch/python \
+	/usr/share/openvswitch/scripts/ovs-monitor-ipsec \
+        --pidfile=$PIDFILE --log-file --detach --monitor \
+        unix:/var/run/openvswitch/db.sock
 
     return 0
 }

debian/python-openvswitch.dirs

@@ -1,2 +1,2 @@
-usr/share/pyshared/ovs/
-usr/share/pyshared/ovs/db/
+usr/share/python-support/python-openvswitch/ovs/
+usr/share/python-support/python-openvswitch/ovs/db/

debian/python-openvswitch.install

@@ -1 +1 @@
-usr/share/openvswitch/python/ovs usr/lib/python2.4/site-packages/
+usr/share/openvswitch/python/ovs usr/share/python-support/python-openvswitch/

debian/rules

@@ -125,7 +125,7 @@ binary-common:
 	dh_strip --dbg-package=openvswitch-dbg
 	dh_compress 
 	dh_fixperms
-	dh_python2
+	dh_pysupport
 	dh_perl
 	dh_makeshlibs
 	dh_installdeb