[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.6.3-3-2-gf4e586b

[Modestas Vainius]

The following commit has been merged in the master branch:
commit f4e586b713ad7aaefd3b92253ce53afd5e6366f2
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Jun 6 20:34:50 2011 +0300

    If build type is Debian, pass --layout=deb to FindLibPython.py.
---
 debian/changelog                                   |    2 +
 .../findpythonlibrary_layout_deb_on_debian.diff    |   24 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d6d1f8..ba19bc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kde4libs (4:4.6.3-4) UNRELEASED; urgency=low
 
+  * FindPythonLibrary.cmake: if build type is Debian, pass --layout=deb to
+    FindLibPython.py.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 06 Jun 2011 20:14:14 +0300
 
diff --git a/debian/patches/findpythonlibrary_layout_deb_on_debian.diff b/debian/patches/findpythonlibrary_layout_deb_on_debian.diff
new file mode 100644
index 0000000..fb4f88e
--- /dev/null
+++ b/debian/patches/findpythonlibrary_layout_deb_on_debian.diff
@@ -0,0 +1,24 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: FindPythonLibrary: pass --layout=deb to distutils if build type is Debian
+Forwarded: not-needed
+Origin:vendor
+Last-Update: 2011-06-06
+
+Python stuff should be installed to /usr/lib/python<version>/dist-packages/
+rather than /usr/lib/python<version>/site-packages/ when building debian
+packages (i.e.  CMAKE_BUILD_TYPE is Debian).
+
+--- a/cmake/modules/FindPythonLibrary.cmake
++++ b/cmake/modules/FindPythonLibrary.cmake
+@@ -46,7 +46,10 @@ else(EXISTS PYTHON_LIBRARY)
+       message(FATAL_ERROR "The file FindLibPython.py does not exist in ${_py_cmake_module_dir} (the directory where FindPythonLibrary.cmake is located). Check your installation.")
+     endif(NOT EXISTS "${_py_cmake_module_dir}/FindLibPython.py")
+ 
+-    execute_process(COMMAND ${PYTHON_EXECUTABLE}  "${_py_cmake_module_dir}/FindLibPython.py" OUTPUT_VARIABLE python_config)
++    if (CMAKE_BUILD_TYPE MATCHES "Debian")
++      set(_findlibpython_args "--layout=deb")
++    endif (CMAKE_BUILD_TYPE MATCHES "Debian")
++    execute_process(COMMAND ${PYTHON_EXECUTABLE}  "${_py_cmake_module_dir}/FindLibPython.py" ${_findlibpython_args} OUTPUT_VARIABLE python_config)
+     if(python_config)
+       string(REGEX REPLACE ".*exec_prefix:([^
]+).*$" "\1" PYTHON_PREFIX ${python_config})
+       string(REGEX REPLACE ".*
short_version:([^
]+).*$" "\1" PYTHON_SHORT_VERSION ${python_config})
diff --git a/debian/patches/series b/debian/patches/series
index 124e163..b0c471c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ kfileshare_kdesu_fileshareset.diff
 relax_plugin_kde_version_check.diff
 upstream_fix_job-on-hold_reuse_logic.diff
 add_dlrestrictions_support.diff
+findpythonlibrary_layout_deb_on_debian.diff

-- 
KDE Development Platform Libraries module packaging