[Pkg-freeipa-devel] freeipa: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog                       |    2 ++
 debian/patches/fix-install-layout.diff |   14 ++++++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 17 insertions(+)

New commits:
commit 6c55f2a5af508a08c19f07d913c491192ea0f0bb
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Feb 13 01:02:55 2013 +0200

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

diff --git a/debian/changelog b/debian/changelog
index e721ad2..259d5dc 100644
--- a/debian/changelog
+++ b/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 at ubuntu.com>  Tue, 01 Nov 2011 10:52:25 -0400
diff --git a/debian/patches/fix-install-layout.diff b/debian/patches/fix-install-layout.diff
new file mode 100644
index 0000000..53e4892
--- /dev/null
+++ b/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:
diff --git a/debian/patches/series b/debian/patches/series
index f6a6242..4d1e2a6 100644
--- a/debian/patches/series
+++ b/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