[libkml] 06/11: Add path to fix Python library installation path.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libkml.

commit ad6e2a72e11576061a07a50dd60ce1589c5e90d3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 26 23:17:20 2015 +0200

    Add path to fix Python library installation path.
---
 debian/changelog                         |  1 +
 debian/patches/python-install-path.patch | 34 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 39c149c..05ca9e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libkml (1.3.0~r864+git20150726-3f3f37f-1~exp1) UNRELEASED; urgency=medium
   * New upstream git snapshot.
     - Re-enable swig bindings
   * Drop patches applied upstream.
+  * Add path to fix Python library installation path.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 26 Jul 2015 18:38:00 +0200
 
diff --git a/debian/patches/python-install-path.patch b/debian/patches/python-install-path.patch
new file mode 100644
index 0000000..c198126
--- /dev/null
+++ b/debian/patches/python-install-path.patch
@@ -0,0 +1,34 @@
+Description: Default to python interpreter library path when none is specified
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,9 +49,6 @@ endif(NOT DEFINED RESOURCE_INSTALL_DIR)
+ if(NOT DEFINED LOCALE_INSTALL_DIR)
+   set(LOCALE_INSTALL_DIR "${DATA_INSTALL_DIR}/locale/")
+ endif(NOT DEFINED LOCALE_INSTALL_DIR)
+-if(NOT DEFINED PYTHON_INSTALL_DIR)
+-  set(PYTHON_INSTALL_DIR "${LIB_INSTALL_DIR}/python")
+-endif(NOT DEFINED PYTHON_INSTALL_DIR)
+ if(NOT DEFINED JAVA_INSTALL_DIR)
+   set(JAVA_INSTALL_DIR "${DATA_INSTALL_DIR}/java")
+ endif(NOT DEFINED JAVA_INSTALL_DIR)
+--- a/src/swig/CMakeLists.txt
++++ b/src/swig/CMakeLists.txt
+@@ -11,10 +11,12 @@ if(WITH_PYTHON)
+ 
+   include_directories(${PYTHON_INCLUDE_PATH})
+ 
+-  # execute_process(COMMAND
+-  #   python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)"
+-  #   OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
+-  #   OUTPUT_STRIP_TRAILING_WHITESPACE )
++  if(NOT DEFINED PYTHON_INSTALL_DIR)
++    execute_process(COMMAND
++      ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)"
++      OUTPUT_VARIABLE PYTHON_INSTALL_DIR
++      OUTPUT_STRIP_TRAILING_WHITESPACE )
++  endif(NOT DEFINED PYTHON_INSTALL_DIR)
+ 
+   file(GLOB IFILES "kml*.i")
+   foreach(INTERFACE_FILE ${IFILES})
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e4d93c3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+python-install-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git