[SCM] kdevelop-python packaging branch, master, updated. debian/1.7.2-1-3-g37d5164

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop-python.git;a=commitdiff;h=b9c2d98

The following commit has been merged in the master branch:
commit b9c2d981faf42a3c59056625ef45cb603249dc24
Author: Pino Toscano <pino at debian.org>
Date:   Fri Jan 22 08:26:41 2016 +0100

    fix build on non-amd64 & non-i386 archs
    
    backport upstream commit b54654be20cfd52cf121784f8a5dd6e77bc4767b
---
 debian/changelog                                   |  4 ++++
 debian/patches/series                              |  1 +
 ...ream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch | 26 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b618ab6..c4eded2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdevelop-python (1.7.2-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit b54654be20cfd52cf121784f8a5dd6e77bc4767b to fix
+    detection of the Python library on archs different than amd64 & i386;
+    patch upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 22 Jan 2016 08:23:45 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 567d7ce..661cd6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 upstream_fix-cmake-macro-name-of-python-executable.patch
+upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch
diff --git a/debian/patches/upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch b/debian/patches/upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch
new file mode 100644
index 0000000..c6370f7
--- /dev/null
+++ b/debian/patches/upstream_cmake-use-CMAKE_LIBRARY_ARCHITECTURE.patch
@@ -0,0 +1,26 @@
+From b54654be20cfd52cf121784f8a5dd6e77bc4767b Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Fri, 22 Jan 2016 08:22:56 +0100
+Subject: [PATCH] cmake: use CMAKE_LIBRARY_ARCHITECTURE
+
+... instead of hardcoding x86_64-linux-gnu & i386-linux-gnu
+---
+ cmake/modules/FindPython.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
+index 17d6c30..136c5c9 100644
+--- a/cmake/modules/FindPython.cmake
++++ b/cmake/modules/FindPython.cmake
+@@ -87,7 +87,7 @@ find_library(PYTHON_LIBRARIES
+     PATHS
+         "${PYTHON_PREFIX}/lib"
+         [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\${PYTHON_VERSION}\InstallPath]/libs
+-    PATH_SUFFIXES "" "python${PYTHON_VERSION}/config" "x86_64-linux-gnu" "i386-linux-gnu"
++    PATH_SUFFIXES "" "python${PYTHON_VERSION}/config" "${CMAKE_LIBRARY_ARCHITECTURE}"
+     DOC "Python libraries" NO_DEFAULT_PATH)
+ 
+ find_path(PYTHON_INCLUDE_DIRS "Python.h"
+-- 
+2.7.0.rc3
+

-- 
kdevelop-python packaging