[ovs-dev] [PATCH] Debian: Transition to dh_python2

Simon Horman horms at verge.net.au
Wed Aug 24 01:55:34 UTC 2011


---
 debian/control                    |    8 +++-----
 debian/python-openvswitch.dirs    |    4 ++--
 debian/python-openvswitch.install |    4 ++--
 debian/rules                      |    2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 1978b73..2a3cca8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Open vSwitch developers <dev at openvswitch.org>
 Uploaders: Ben Pfaff <pfaffben at debian.org>, Simon Horman <horms at 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}),
@@ -114,7 +114,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.
 
@@ -122,7 +121,6 @@ Package: ovsdbmonitor
 Architecture: all
 Section: utils
 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
diff --git a/debian/python-openvswitch.dirs b/debian/python-openvswitch.dirs
index 9bc6912..ca0bb55 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/python-openvswitch/ovs/
+usr/share/pyshared/python-openvswitch/ovs/db/
diff --git a/debian/python-openvswitch.install b/debian/python-openvswitch.install
index 211ed30..b23d890 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/python-openvswitch/ovs/
+python/ovs/db/*.py usr/share/pyshared/python-openvswitch/ovs/db/
diff --git a/debian/rules b/debian/rules
index 37d321b..5c80cc6 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
-- 
1.7.5.4




More information about the dev mailing list