[qgis] 03/03: Default to Python 3 with Qt5.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch qt5
in repository qgis.

commit 6cad8c36e896d51c0e17b9d4f6da4713e288ef84
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 15 23:42:17 2016 +0100

    Default to Python 3 with Qt5.
---
 debian/patches/qt5-bindings.patch | 2 +-
 debian/rules                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/patches/qt5-bindings.patch b/debian/patches/qt5-bindings.patch
index 2d6c56f..2753697 100644
--- a/debian/patches/qt5-bindings.patch
+++ b/debian/patches/qt5-bindings.patch
@@ -11,7 +11,7 @@ Forwarded: https://github.com/qgis/QGIS/pull/2906
  # Python build dependency
  
 -IF(ENABLE_QT5)
-+SET (ENABLE_PYTHON3 FALSE CACHE BOOL "If enabled will try to find Python 3 before looking for Python 2")
++SET (ENABLE_PYTHON3 ${ENABLE_QT5} CACHE BOOL "If enabled will try to find Python 3 before looking for Python 2")
 +IF(ENABLE_PYTHON3)
    SET(PYTHON_VER 3 CACHE STRING "Python version")
 -ELSE(ENABLE_QT5)
diff --git a/debian/rules b/debian/rules
index 68b9ccf..5de50ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,7 @@ CMAKE_OPTS := \
 	-DBINDINGS_GLOBAL_INSTALL=TRUE \
 	-DPEDANTIC=TRUE \
 	-DENABLE_QT5=TRUE \
+	-DENABLE_PYTHON3=FALSE \
 	-DWITH_QSPATIALITE=TRUE \
 	-DWITH_SERVER=FALSE \
 	-DWITH_SERVER_PLUGINS=TRUE \

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