From: Ben Pfaff Date: Fri, 3 Feb 2012 21:30:50 +0000 (-0800) Subject: debian: Don't install Python modules for obsolete Python versions. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5177f525658bc1f98c37ae08e8f5d4100ff0d910;p=openvswitch debian: Don't install Python modules for obsolete Python versions. 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: horms@debian.org Reported-by: Luca Falavigna Signed-off-by: Ben Pfaff --- diff --git a/AUTHORS b/AUTHORS index c19bbde5..d581266b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -102,6 +102,7 @@ Joan Cirer joan@ev0.net John Galgay john@galgay.net Koichi Yagishita yagishita.koichi@jrc.co.jp Krishna Miriyala krishna@nicira.com +Luca Falavigna dktrkranz@debian.org Luiz Henrique Ozaki luiz.ozaki@gmail.com Michael A. Collins mike.a.collins@ark-net.org Michael Hu mhu@nicira.com diff --git a/debian/openvswitch-test.install b/debian/openvswitch-test.install index a152aff5..a36c8281 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 67792985..9387e68d 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/