[qtiplot] 01/05: Link boost_system explicitly. (Closes: #722323)

[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 f4c910d277199bf7262c6ee11389575b576fb4d3
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Sep 10 15:31:59 2013 +0200

    Link boost_system  explicitly. (Closes: #722323)
---
 debian/patches/01_build_system.diff |   19 ++++++++-----------
 debian/patches/05_link_gl2ps.patch  |   16 ++++++----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/debian/patches/01_build_system.diff b/debian/patches/01_build_system.diff
index c0629d3..86aeb97 100644
--- a/debian/patches/01_build_system.diff
+++ b/debian/patches/01_build_system.diff
@@ -1,9 +1,7 @@
 Changes the build system to use libraries from the Debian package system
 and fixes installation directories
-Index: qtiplot/qtiplot.pro
-===================================================================
---- qtiplot.orig/qtiplot.pro	2011-05-01 20:37:15.000000000 -0400
-+++ qtiplot/qtiplot.pro	2011-05-01 20:56:37.672353328 -0400
+--- a/qtiplot.pro
++++ b/qtiplot.pro
 @@ -1,7 +1,5 @@
  TEMPLATE = subdirs
  
@@ -13,20 +11,19 @@ Index: qtiplot/qtiplot.pro
 +SUBDIRS = 3rdparty/qwt \
  		3rdparty/qwtplot3d \
          qtiplot
-Index: qtiplot/qtiplot/qtiplot.pro
-===================================================================
---- qtiplot.orig/qtiplot/qtiplot.pro	2011-05-01 20:51:20.000000000 -0400
-+++ qtiplot/qtiplot/qtiplot.pro	2011-05-01 20:56:37.672353328 -0400
-@@ -20,6 +20,8 @@
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -20,6 +20,9 @@
  LIBS         += $$QWT_LIBS
  LIBS         += $$QWT3D_LIBS
  LIBS         += $$GSL_LIBS
 +LIBS         += -lorigin2
 +LIBS         += -lz
++LIBS         += -lboost_system
  
  #############################################################################
  ###################### BASIC PROJECT PROPERTIES #############################
-@@ -114,17 +116,16 @@
+@@ -114,17 +117,16 @@
  		translations/qtiplot_sv.qm
  
  isEmpty(LUPDATE): LUPDATE = lupdate
@@ -47,7 +44,7 @@ Index: qtiplot/qtiplot/qtiplot.pro
  
  unix: man.files += ../qtiplot.1
  
-@@ -159,7 +160,7 @@
+@@ -159,7 +161,7 @@
    				    qtiUtil.py \
    				    qti_wordlist.txt \
  
diff --git a/debian/patches/05_link_gl2ps.patch b/debian/patches/05_link_gl2ps.patch
index 2386c8f..2b6b868 100644
--- a/debian/patches/05_link_gl2ps.patch
+++ b/debian/patches/05_link_gl2ps.patch
@@ -1,9 +1,7 @@
 Description: Removed included copy of gl2ps library
 Authoer: Scott Howard <showard at debian.org>
-Index: qtiplot/3rdparty/qwtplot3d/qwtplot3d.pri
-===================================================================
---- qtiplot.orig/3rdparty/qwtplot3d/qwtplot3d.pri	2011-05-03 09:02:32.404767786 -0400
-+++ qtiplot/3rdparty/qwtplot3d/qwtplot3d.pri	2011-05-03 11:08:13.209130193 -0400
+--- a/3rdparty/qwtplot3d/qwtplot3d.pri
++++ b/3rdparty/qwtplot3d/qwtplot3d.pri
 @@ -4,8 +4,7 @@
  TARGET = qwtplot3d
  TEMPLATE = lib
@@ -31,14 +29,12 @@ Index: qtiplot/3rdparty/qwtplot3d/qwtplot3d.pri
 -    src/qwt3d_io_gl2ps.cpp \
 -    3rdparty/gl2ps/gl2ps.c
 +    src/qwt3d_io_gl2ps.cpp
-Index: qtiplot/qtiplot/qtiplot.pro
-===================================================================
---- qtiplot.orig/qtiplot/qtiplot.pro	2011-05-03 11:09:33.544050861 -0400
-+++ qtiplot/qtiplot/qtiplot.pro	2011-05-03 11:11:13.277746125 -0400
-@@ -22,6 +22,7 @@
- LIBS         += $$GSL_LIBS
+--- a/qtiplot/qtiplot.pro
++++ b/qtiplot/qtiplot.pro
+@@ -23,6 +23,7 @@
  LIBS         += -lorigin2
  LIBS         += -lz
+ LIBS         += -lboost_system
 +LIBS         += -lgl2ps
  
  #############################################################################

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