[qtiplot] 01/05: Fix FTBFS against alglib_3.9. (Closes: #787339).

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository qtiplot.

commit 86298018d1035c69d7e6ad666ee4618cae864f7c
Author: Jonathan Wiltshire <jmw at debian.org>
Date:   Sun May 31 18:29:53 2015 +0200

    Fix FTBFS against alglib_3.9. (Closes: #787339).
---
 debian/patches/03_build_conf.patch | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/03_build_conf.patch b/debian/patches/03_build_conf.patch
index 1b22297..86afad8 100644
--- a/debian/patches/03_build_conf.patch
+++ b/debian/patches/03_build_conf.patch
@@ -1,10 +1,10 @@
 Description: Edits build.conf to look for Debian system libraries.
 Author: Scott Howard <showard at debian.org>
-Index: qtiplot/build.conf.example
+Index: qtiplot-0.9.8.9/build.conf.example
 ===================================================================
---- qtiplot.orig/build.conf.example	2012-11-07 12:06:10.833691537 -0500
-+++ qtiplot/build.conf.example	2012-11-07 12:09:10.477690664 -0500
-@@ -7,39 +7,39 @@
+--- qtiplot-0.9.8.9.orig/build.conf.example
++++ qtiplot-0.9.8.9/build.conf.example
+@@ -7,39 +7,39 @@ isEmpty( QTI_ROOT ) {
  ##########################################################
  
  # Global include path which is always added at the end of the INCLUDEPATH
@@ -54,7 +54,7 @@ Index: qtiplot/build.conf.example
  
  ##########################################################
  ## QWT - use local copy till upstream catches up
-@@ -67,11 +68,11 @@
+@@ -67,11 +67,11 @@ unix:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qw
  ##########################################################
  
  # include path. leave it blank to use SYS_INCLUDE
@@ -69,7 +69,7 @@ Index: qtiplot/build.conf.example
  
  ##########################################################
  ## QTeXEngine - optional. you don't have to set these variables
-@@ -79,9 +80,9 @@
+@@ -79,9 +79,9 @@ LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng
  ##########################################################
  
  # include path.
@@ -81,19 +81,19 @@ Index: qtiplot/build.conf.example
  
  ##########################################################
  ## ALGLIB (2.6) - optional. you don't have to set these variables
-@@ -89,9 +90,9 @@
+@@ -89,9 +89,9 @@ TEX_ENGINE_LIBS = $$QTI_ROOT/3rdparty/QT
  ##########################################################
  
  # include path.
 -ALGLIB_INCLUDEPATH = $$QTI_ROOT/3rdparty/alglib/
-+#ALGLIB_INCLUDEPATH = $$QTI_ROOT/3rdparty/alglib/
++ALGLIB_INCLUDEPATH = /usr/include/libalglib
  # link locally against a copy in 3rdparty/
 -ALGLIB_LIBS = $$QTI_ROOT/3rdparty/alglib/libalglib.a
 +ALGLIB_LIBS = -lalglib
  
  ##########################################################
  ## TAMUANOVA - optional. you don't have to set these variables
-@@ -99,9 +100,9 @@
+@@ -99,9 +99,9 @@ ALGLIB_LIBS = $$QTI_ROOT/3rdparty/alglib
  ##########################################################
  
  # include path.
@@ -105,7 +105,7 @@ Index: qtiplot/build.conf.example
  
  ##########################################################
  ## python - only used if python is needed
-@@ -134,7 +135,7 @@
+@@ -134,7 +134,7 @@ contains( TARGET, qtiplot ) {
    #DEFINES         += QTIPLOT_DEMO
  
    # Uncomment the following line if you want to perform a custom installation using the *.path variables defined in ./qtiplot.pro.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qtiplot.git