From: Ben Pfaff <blp@nicira.com>
Date: Mon, 3 Oct 2011 16:19:29 +0000 (-0700)
Subject: debian: Make python-openvswitch packaging work with squeeze dh_python2.
X-Git-Tag: v1.3.0~160
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bc3aa0bf5a21d1d91ec8c844175e0b1a92c59e79;p=sliver-openvswitch.git

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.

Bug #7510.
Reported-by: Michael Hu <mhu@nicira.com>
Tested-by: Simon Horman <horms@verge.net.au>
---

diff --git a/AUTHORS b/AUTHORS
index 20a53d349..8822092b0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -81,6 +81,7 @@ John Galgay             john@galgay.net
 Koichi Yagishita        yagishita.koichi@jrc.co.jp
 Krishna Miriyala        krishna@nicira.com
 Luiz Henrique Ozaki     luiz.ozaki@gmail.com
+Michael Hu              mhu@nicira.com
 Michael Mao             mmao@nicira.com
 Mikael Doverhag         mdoverhag@nicira.com
 Niklas Andersson        nandersson@nicira.com
diff --git a/debian/python-openvswitch.install b/debian/python-openvswitch.install
index 17af5460b..fb901b748 100644
--- a/debian/python-openvswitch.install
+++ b/debian/python-openvswitch.install
@@ -1,2 +1,2 @@
-python/ovs/*.py usr/share/pyshared/ovs/
-python/ovs/db/*.py usr/share/pyshared/ovs/db/
+python/ovs/*.py usr/lib/python2.4/site-packages/ovs/
+python/ovs/db/*.py usr/lib/python2.4/site-packages/ovs/db/