fix-install-layout.diff: Pass an option to setup-client.py to install the python bits to the correct path.

debian/changelog

@@ -33,5 +33,7 @@ freeipa (3.1.2-1) UNRELEASED; urgency=low
     fails.
   * dont-search-platform-path.diff: Don't use Python.h from the
     platform specific path.
+  * fix-install-layout.diff: Pass an option to setup-client.py to
+    install the python bits to the correct path.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 01 Nov 2011 10:52:25 -0400

debian/patches/fix-install-layout.diff

@@ -0,0 +1,14 @@
+--- a/Makefile
++++ b/Makefile
+@@ -76,9 +76,9 @@ client-install: client client-dirs
+ 	done
+ 	cd install/po && $(MAKE) install || exit 1;
+ 	if [ "$(DESTDIR)" = "" ]; then \
+-		$(PYTHON) setup-client.py install; \
++		$(PYTHON) setup-client.py install --install-layout=deb; \
+ 	else \
+-		$(PYTHON) setup-client.py install --root $(DESTDIR); \
++		$(PYTHON) setup-client.py install --install-layout=deb --root $(DESTDIR); \
+ 	fi
+ 
+ client-dirs:

debian/patches/series

@@ -6,3 +6,4 @@ fix-nss-include.diff
 no-test-lang.diff
 correct-python-path.diff
 dont-search-platform-path.diff
+fix-install-layout.diff