2
0
mirror of https://github.com/openvswitch/ovs synced 2025-10-15 14:17:18 +00:00

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.
This commit is contained in:
Simon Horman
2011-08-26 18:03:42 +09:00
committed by Ben Pfaff
parent a7844aaf5e
commit 00488a5eef
5 changed files with 9 additions and 12 deletions

8
debian/control vendored
View File

@@ -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/
@@ -54,7 +54,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}),
@@ -123,7 +123,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.
@@ -131,7 +130,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

View File

@@ -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

View File

@@ -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/

View File

@@ -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/

2
debian/rules vendored
View File

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