[SCM] yafaray/master: debian/patches/: #0003 added to fix FTBFS on Python 3.3

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 16907aa04bdf7b1ebb333d95d27695c5a0388051
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Thu Mar 14 11:10:59 2013 +0100

    debian/patches/: #0003 added to fix FTBFS on Python 3.3
    
    Closes: #692381
    Thanks: Dmitrijs Ledkovs for the initial patch.

diff --git a/debian/control b/debian/control
index 7207c42..563fbd3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,11 @@ Build-Depends: cmake,
                libpng-dev,
                libtiff-dev,
                libxml2-dev,
-               python3-all-dev,
+               pkg-config,
+               python3-dev (>= 3.3),
                swig,
                zlib1g-dev
-X-Python3-Version: >= 3.2
+X-Python3-Version: >= 3.3
 Standards-Version: 3.9.4
 Homepage: http://www.yafaray.org
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/yafaray.git
diff --git a/debian/patches/0001-Fix_FTBFS_on_ARM.patch b/debian/patches/0001-Fix_FTBFS_on_ARM.patch
index bca3c23..4da462e 100644
--- a/debian/patches/0001-Fix_FTBFS_on_ARM.patch
+++ b/debian/patches/0001-Fix_FTBFS_on_ARM.patch
@@ -3,7 +3,7 @@ Date: Wed, 23 May 2012 17:58:25 +0200
 Subject: Fix_FTBFS_on_ARM
 
 ---
- src/yafraycore/triangle.cc |   16 ++++++++--------
+ src/yafraycore/triangle.cc | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/yafraycore/triangle.cc b/src/yafraycore/triangle.cc
diff --git a/debian/patches/0002-Disable_FAST_MATH.patch b/debian/patches/0002-Disable_FAST_MATH.patch
index b30004f..c9f3690 100644
--- a/debian/patches/0002-Disable_FAST_MATH.patch
+++ b/debian/patches/0002-Disable_FAST_MATH.patch
@@ -3,7 +3,7 @@ Date: Sat, 26 May 2012 16:15:53 +0200
 Subject: Disable_FAST_MATH
 
 ---
- include/utilities/mathOptimizations.h |    2 +-
+ include/utilities/mathOptimizations.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/utilities/mathOptimizations.h b/include/utilities/mathOptimizations.h
diff --git a/debian/patches/0003-Fix_FTBFS_against_python3.3.patch b/debian/patches/0003-Fix_FTBFS_against_python3.3.patch
new file mode 100644
index 0000000..28267ca
--- /dev/null
+++ b/debian/patches/0003-Fix_FTBFS_against_python3.3.patch
@@ -0,0 +1,32 @@
+From: Dmitrijs Ledkovs <xnox at ubuntu.com>
+Date: Thu, 14 Mar 2013 10:41:45 +0100
+Subject: Fix_FTBFS_against_python3.3
+
+---
+ src/bindings/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt
+index a53d941..51607db 100644
+--- a/src/bindings/CMakeLists.txt
++++ b/src/bindings/CMakeLists.txt
+@@ -40,7 +40,7 @@ IF (WITH_YAF_PY_BINDINGS)
+ 	endif(YAF_PY_VERSION)
+ 	
+ 	MESSAGE("Searching for Python ${REQUIRED_PYTHON_VERSION}")
+-	find_package(YafPythonLibs REQUIRED)
++	pkg_check_modules(PYTHON python-${REQUIRED_PYTHON_VERSION})
+ 	
+ 	if (NOT PYTHON_LIBRARIES)
+ 		message("Python wasn't found, please install it to build python bindings")
+@@ -84,8 +84,8 @@ if (WITH_YAF_PY_BINDINGS)
+ 
+ 	endif(NOT WIN32)
+ 	
+-	message("Python header path: ${PYTHON_INCLUDE_DIR}")
+-	include_directories(${YAF_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIR})
++	message("Python header path: ${PYTHON_INCLUDE_DIRS}")
++	include_directories(${YAF_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
+ 	include(${SWIG_USE_FILE})
+ 
+ 	if(YAF_PY_VERSION GREATER 3)
diff --git a/debian/patches/series b/debian/patches/series
index 197c8fc..b703e55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix_FTBFS_on_ARM.patch
 0002-Disable_FAST_MATH.patch
+0003-Fix_FTBFS_against_python3.3.patch

-- 
yafaray packaging