Bug#583238: qcake: hardcodes 2.5 as Python version

[Jakub Wilk]

Source: qcake
Version: 0.7.2-1
Severity: important
User: debian-pyt...@lists.debian.org
Usertag: python2.6
Tags: patch

Hello,



--
Jakub Wilk

diff -u qcake-0.7.2/debian/control qcake-0.7.2/debian/control
--- qcake-0.7.2/debian/control
+++ qcake-0.7.2/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Gerfried Fuchs <rho...@debian.at>
 Build-Depends: quilt, libqt4-dev, spl-dev, libpcre3-dev, libreadline5-dev,
   plib1.8.4-dev, libopenal-dev, libalut-dev, libode-dev, libqt4-opengl-dev,
-  python2.5-dev, libphonon-dev
+  python-dev, libphonon-dev
 Standards-Version: 3.8.3
 Homepage: http://qcake.org/
 Vcs-Git: git://git.debian.org/git/users/alfie/qcake.git
diff -u qcake-0.7.2/debian/rules qcake-0.7.2/debian/rules
--- qcake-0.7.2/debian/rules
+++ qcake-0.7.2/debian/rules
@@ -39,7 +39,7 @@
 configure: configure-stamp
 configure-stamp: patch
 	$(checkdir)
-	qmake-qt4 qcake_qt4.pro
+	PYTHON_VERSION=$(shell pyversions -d) qmake-qt4 qcake_qt4.pro
 	lrelease-qt4 qcake_qt4.pro
 	touch configure-stamp
 

--- a/build/python.prf
+++ b/build/python.prf
@@ -2,7 +2,7 @@
 
 # Change this variable to your python version (2.3, 2.4, 2.5)
  win32:PYTHON_VERSION=25
- unix:PYTHON_VERSION=2.5
+ unix:PYTHON_VERSION=$$(PYTHON_VERSION)
 
 macx {
   # for macx you need to have Python development kit installed as framework

qcake currently hardcodes version of Python which is used at build time to 2.5. However, we are soon switching default version of Python to 2.6. With the attached patches qcake will always use default Python.

signature.asc
Description: Digital signature