Python 2.4 is obsolete, not present in Debian squeeze or sid, so don't
install Python modules for it.
It would be better to just put the files directly into
/usr/share/pyshared/ovs/, instead of in site-packages for some specific
Python version, but this causes problems for builds on squeeze, as
documented in commit bc3aa0bf5 (debian: Make python-openvswitch packaging
work with squeeze dh_python2.):
The dh_python2 helper in Debian squeeze has a limitation that is not
mentioned anywhere, as far as I can tell: Python files must be in
/usr/lib/python#.#/site-packages to be installed. The version in Debian
wheezy does not have the same limitation.
This meant that building the Debian packages on squeeze silently produced
a broken python-openvswitch package, whereas building the same thing on
wheezy built a working package.
This fixes the problem by putting the .py files where squeeze expects them.
It works on wheezy too.
A before-and-after "debdiff" shows that the only significant effect of this
commit is to drop python2.4 symlinks.
CC: [email protected]
Reported-by: Luca Falavigna <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>
---
Luca, thanks for pointing this out.
AUTHORS | 1 +
debian/openvswitch-test.install | 2 +-
debian/python-openvswitch.install | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index c19bbde..d581266 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -102,6 +102,7 @@ Joan Cirer [email protected]
John Galgay [email protected]
Koichi Yagishita [email protected]
Krishna Miriyala [email protected]
+Luca Falavigna [email protected]
Luiz Henrique Ozaki [email protected]
Michael A. Collins [email protected]
Michael Hu [email protected]
diff --git a/debian/openvswitch-test.install b/debian/openvswitch-test.install
index a152aff..a36c828 100644
--- a/debian/openvswitch-test.install
+++ b/debian/openvswitch-test.install
@@ -1,2 +1,2 @@
-usr/share/openvswitch/python/ovstest usr/lib/python2.4/site-packages/
+usr/share/openvswitch/python/ovstest usr/lib/python2.6/dist-packages/
usr/bin/ovs-test
diff --git a/debian/python-openvswitch.install
b/debian/python-openvswitch.install
index 6779298..9387e68 100644
--- a/debian/python-openvswitch.install
+++ b/debian/python-openvswitch.install
@@ -1 +1 @@
-usr/share/openvswitch/python/ovs usr/lib/python2.4/site-packages/
+usr/share/openvswitch/python/ovs usr/lib/python2.6/dist-packages/
--
1.7.2.5
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
