Bug#560852: qtiplot: Don't need to explicitly name python version in 01_build_system.diff

[Scott Howard]

Package: qtiplot
Version: 0.9.7.10+r1453-1
Severity: minor
tags patch

Hello,

In debian/patches/01_build_system.diff  there is the following stanza

@@ -158,18 +155,19 @@
   				    qtiUtil.py \
   				    qti_wordlist.txt \

-  	unix: pythonconfig.path = /usr/local/qtiplot
+  	unix: pythonconfig.path = /usr/share/qtiplot
   	win32: pythonconfig.path = $$INSTALLBASE
-  	DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
+	PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
+  	DEFINES += PYTHON_CONFIG_PATH
   }

   unix {
     isEmpty(PYTHON): PYTHON = python
-    INCLUDEPATH += $$system($$PYTHON python-includepath.py)
-    LIBS        += $$system($$PYTHON -c "\"from distutils import
sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
+    INCLUDEPATH += /usr/include/python2.5
+    LIBS        += -lpython2.5
     LIBS        += -lm
     system(mkdir -p $${SIP_DIR})
-    system($$system($$PYTHON python-sipcmd.py) -c $${SIP_DIR}
src/scripting/qti.sip)
+    system($$system(python2.5 python-sipcmd.py) -c $${SIP_DIR}
src/scripting/qti.sip)
   }

   win32 {



Please correct me if I'm wrong, but I do not think it is necessary to
explicitly name the python versions here since the build system
includes scripts from upstream which will identify the default version
on the system. This is helpful for systems (and distros) that do not
use python2.5 as the default. Qtiplot successfully build on unstable
in pbuilder with this change. The above stanza is thus changed to:

@@ -158,7 +155,7 @@
   				    qtiUtil.py \
   				    qti_wordlist.txt \

-  	unix: pythonconfig.path = /usr/local/qtiplot
+  	unix: pythonconfig.path = /usr/share/qtiplot
   	win32: pythonconfig.path = $$INSTALLBASE
   	DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
   }




Here is the patch for the change:


--- qtiplot-0.9.7.10+r1453.orig/debian/patches/01_build_system.diff	2009-12-12
14:37:24.263138095 -0500
+++ qtiplot-0.9.7.10+r1453/debian/patches/01_build_system.diff	2009-12-12
14:38:47.703134719 -0500
@@ -43,31 +43,15 @@

  ###############################################################
  ################# Default Modules #############################
-@@ -158,18 +155,19 @@
+@@ -158,7 +155,7 @@
    				    qtiUtil.py \
    				    qti_wordlist.txt \

 -  	unix: pythonconfig.path = /usr/local/qtiplot
 +  	unix: pythonconfig.path = /usr/share/qtiplot
    	win32: pythonconfig.path = $$INSTALLBASE
--  	DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path,"
","\ ")\\\"
-+	PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
-+  	DEFINES += PYTHON_CONFIG_PATH
+   	DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path,"
","\ ")\\\"
    }
-
-   unix {
-     isEmpty(PYTHON): PYTHON = python
--    INCLUDEPATH += $$system($$PYTHON python-includepath.py)
--    LIBS        += $$system($$PYTHON -c "\"from distutils import
sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
-+    INCLUDEPATH += /usr/include/python2.5
-+    LIBS        += -lpython2.5
-     LIBS        += -lm
-     system(mkdir -p $${SIP_DIR})
--    system($$system($$PYTHON python-sipcmd.py) -c $${SIP_DIR}
src/scripting/qti.sip)
-+    system($$system(python2.5 python-sipcmd.py) -c $${SIP_DIR}
src/scripting/qti.sip)
-   }
-
-   win32 {
 --- a/qtiplot/src/origin/origin.pri
 +++ b/qtiplot/src/origin/origin.pri
 @@ -1,17 +1,19 @@




Regards,
Scott Howard