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

[Timo Aaltonen]

 debian/changelog                              |    4 ++++
 debian/patches/correct-python-path.diff       |   11 +++++++++++
 debian/patches/dont-search-platform-path.diff |   11 +++++++++++
 debian/patches/series                         |    2 ++
 4 files changed, 28 insertions(+)

New commits:
commit 2ceed98412baf6be2d5f32ab7974f436be44ce31
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Feb 12 21:08:09 2013 +0200

    dont-search-platform-path.diff: Don't use Python.h from the platform specific path.

diff --git a/debian/changelog b/debian/changelog
index 642e788..e721ad2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,5 +31,7 @@ freeipa (3.1.2-1) UNRELEASED; urgency=low
   * Add no-test-lang.diff, test_lang is gone.
   * correct-python-path.diff: Fallback on the correct path if rpm query
     fails.
+  * dont-search-platform-path.diff: Don't use Python.h from the
+    platform specific path.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 01 Nov 2011 10:52:25 -0400
diff --git a/debian/patches/dont-search-platform-path.diff b/debian/patches/dont-search-platform-path.diff
new file mode 100644
index 0000000..e5aa0cf
--- /dev/null
+++ b/debian/patches/dont-search-platform-path.diff
@@ -0,0 +1,11 @@
+--- a/ipapython/py_default_encoding/setup.py
++++ b/ipapython/py_default_encoding/setup.py
+@@ -22,7 +22,7 @@ from distutils.sysconfig import get_pyth
+ import sys
+ import os
+ 
+-python_header = os.path.join(get_python_inc(plat_specific=1), 'Python.h')
++python_header = os.path.join(get_python_inc(plat_specific=0), 'Python.h')
+ if not os.path.exists(python_header):
+     sys.exit("Cannot find Python development packages that provide Python.h")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f366e38..f6a6242 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix-string-format.diff
 fix-nss-include.diff
 no-test-lang.diff
 correct-python-path.diff
+dont-search-platform-path.diff

commit eddcdeac378ea7fede1a8b30edae9db337679fa2
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Feb 12 21:03:55 2013 +0200

    correct-python-path.diff: Fallback on the correct path if rpm query fails.

diff --git a/debian/changelog b/debian/changelog
index 12895f8..642e788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,5 +29,7 @@ freeipa (3.1.2-1) UNRELEASED; urgency=low
   * control: Add python-krbv to client depends.
   * Add fix-nss-include.diff, fix nss include path.
   * Add no-test-lang.diff, test_lang is gone.
+  * correct-python-path.diff: Fallback on the correct path if rpm query
+    fails.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 01 Nov 2011 10:52:25 -0400
diff --git a/debian/patches/correct-python-path.diff b/debian/patches/correct-python-path.diff
new file mode 100644
index 0000000..6a74d35
--- /dev/null
+++ b/debian/patches/correct-python-path.diff
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -44,7 +44,7 @@ ifneq ($(DEVELOPER_MODE),0)
+ LINT_OPTIONS=--no-fail
+ endif
+ 
+-PYTHON ?= $(shell rpm -E %__python)
++PYTHON ?= $(shell rpm -E %__python || echo /usr/bin/python)
+ 
+ all: bootstrap-autogen server
+ 	@for subdir in $(SUBDIRS); do \
diff --git a/debian/patches/series b/debian/patches/series
index 66033ee..f366e38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ prefix.patch
 fix-string-format.diff
 fix-nss-include.diff
 no-test-lang.diff
+correct-python-path.diff