debian: Transition to dh_python2

dh_pysupport that the packaging used until now is deprecated, with
dh_python2 as its successor.

This commit removes the PYTHONPATH setting from
debian/openvswitch-ipsec.init because it is not needed, as the Python
packaging is public.  In fact, the Python packaging was public,
unintentionally, before, so the PYTHONPATH could have been removed earlier.

5 files changed, 9 insertions, 12 deletions

diff --git a/debian/control b/debian/control
index 1d09d94bd..52eb7f7be 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ 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,
- python-support (>= 0.8.4), procps, python-qt4,
+ libssl-dev, pkg-config (>= 0.21), po-debconf, bzip2, openssl,
+ python (>= 2.6.6-3), procps, python-qt4,
  python-zopeinterface, python-twisted-conch
 Standards-Version: 3.9.2
 Homepage: http://openvswitch.org/
@@ -46,7 +46,7 @@ Description: Open vSwitch switch implementations
 Package: openvswitch-ipsec
 Architecture: linux-any
 Depends:
- ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, 
+ ${shlibs:Depends}, ${misc:Depends}, python,
  ipsec-tools (>=0.8~alpha20101208), 
  racoon (>=0.8~alpha20101208),
  openvswitch-common (= ${binary:Version}),
@@ -115,7 +115,6 @@ 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.
 
@@ -123,7 +122,6 @@ Package: ovsdbmonitor
 Architecture: all
 Section: utils
 Depends: ${python:Depends}, python-openvswitch, ${misc:Depends}
-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
diff --git a/debian/openvswitch-ipsec.init b/debian/openvswitch-ipsec.init
index ba82f5139..61a1101b4 100755
--- a/debian/openvswitch-ipsec.init
+++ b/debian/openvswitch-ipsec.init
@@ -73,8 +73,7 @@ start_server() {
         install -d -m 755 -o root -g root /var/run/openvswitch
     fi
 
-    PYTHONPATH=/usr/share/openvswitch/python \
-           /usr/share/openvswitch/scripts/ovs-monitor-ipsec \
+    /usr/share/openvswitch/scripts/ovs-monitor-ipsec \
            --pidfile-name=$PIDFILE --detach --monitor \
            unix:/var/run/openvswitch/db.sock
 
diff --git a/debian/python-openvswitch.dirs b/debian/python-openvswitch.dirs
index 9bc6912a3..cbf0de33d 100644
--- a/debian/python-openvswitch.dirs
+++ b/debian/python-openvswitch.dirs
@@ -1,2 +1,2 @@
-usr/share/python-support/python-openvswitch/ovs/
-usr/share/python-support/python-openvswitch/ovs/db/
+usr/share/pyshared/ovs/
+usr/share/pyshared/ovs/db/
diff --git a/debian/python-openvswitch.install b/debian/python-openvswitch.install
index 211ed300e..17af5460b 100644
--- a/debian/python-openvswitch.install
+++ b/debian/python-openvswitch.install
@@ -1,2 +1,2 @@
-python/ovs/*.py usr/share/python-support/python-openvswitch/ovs/
-python/ovs/db/*.py usr/share/python-support/python-openvswitch/ovs/db/
+python/ovs/*.py usr/share/pyshared/ovs/
+python/ovs/db/*.py usr/share/pyshared/ovs/db/
diff --git a/debian/rules b/debian/rules
index 37d321b7d..5c80cc60b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,7 +109,7 @@ binary-common:
 	dh_strip --dbg-package=openvswitch-dbg
 	dh_compress 
 	dh_fixperms
-	dh_pysupport
+	dh_python2
 	dh_perl
 	dh_makeshlibs
 	dh_installdeb