r37068 - in /packages/qtiplot/trunk/debian: changelog control patches/01_build_system.diff

[gudjon-guest at users.alioth.debian.org]

Author: gudjon-guest
Date: Sun Dec  5 11:25:54 2010
New Revision: 37068

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37068
Log:
* Re-enable liborigin2 (Closes: #604819)
* Added -lz to qtiplot.pro (Closes: #600736)
* Add Dependency on libboost-thread-dev

Modified:
    packages/qtiplot/trunk/debian/changelog
    packages/qtiplot/trunk/debian/control
    packages/qtiplot/trunk/debian/patches/01_build_system.diff

Modified: packages/qtiplot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/changelog?rev=37068&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/changelog (original)
+++ packages/qtiplot/trunk/debian/changelog Sun Dec  5 11:25:54 2010
@@ -1,11 +1,13 @@
-qtiplot (0.9.8.2-1) UNRELEASED; urgency=low
+qtiplot (0.9.8.2-1) unstable; urgency=low
 
   * New upstream release
   * Remove quilt dependency
   * Depend on liborigin2 (>=1:13092010)
-  * Reenable liborigin2 (Closes: #604819)
-
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 02 Dec 2010 08:08:20 +0100
+  * Re-enable liborigin2 (Closes: #604819)
+  * Added -lz to qtiplot.pro (Closes: #600736)
+  * Add Dependency on libboost-thread-dev
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sun, 05 Dec 2010 10:08:58 +0100
 
 qtiplot (0.9.8-2) unstable; urgency=low
 

Modified: packages/qtiplot/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/control?rev=37068&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/control (original)
+++ packages/qtiplot/trunk/debian/control Sun Dec  5 11:25:54 2010
@@ -7,7 +7,8 @@
 Build-Depends: debhelper (>= 7), dblatex, docbook-utils, doxygen,
  libgsl0-dev, zlib1g-dev, libpng12-dev,
  liborigin2-dev (>=1:13092010), libmuparser-dev (>=1.32), python-all-dev (>= 2.4.4),
- python-qt4, python-qt4-dev, python-sip4-dev, sip4, libqt4-opengl-dev
+ python-qt4, python-qt4-dev, python-sip4-dev, sip4, libqt4-opengl-dev,
+ libboost-thread-dev
 Standards-Version: 3.9.1
 Homepage: http://soft.proindependent.com/qtiplot.html
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qtiplot/trunk/

Modified: packages/qtiplot/trunk/debian/patches/01_build_system.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/patches/01_build_system.diff?rev=37068&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/patches/01_build_system.diff (original)
+++ packages/qtiplot/trunk/debian/patches/01_build_system.diff Sun Dec  5 11:25:54 2010
@@ -13,15 +13,16 @@
          qtiplot
 --- a/qtiplot/qtiplot.pro
 +++ b/qtiplot/qtiplot.pro
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,8 @@
  LIBS         += $$QWT_LIBS
  LIBS         += $$QWT3D_LIBS
  LIBS         += $$GSL_LIBS
 +LIBS         += -lorigin2
++LIBS         += -lz
  
  #############################################################################
  ###################### BASIC PROJECT PROPERTIES #############################
-@@ -106,17 +107,16 @@
+@@ -106,17 +108,16 @@
  					translations/qtiplot_sv.qm
  
  isEmpty(LUPDATE): LUPDATE = lupdate
@@ -42,7 +43,7 @@
  
  unix: man.files += ../qtiplot.1
  
-@@ -124,7 +124,7 @@
+@@ -124,7 +125,7 @@
  ##################### Compression (zlib-1.2.3) ################
  ###############################################################
  
@@ -51,7 +52,7 @@
  
  ###############################################################
  ################# Default Modules #############################
-@@ -159,18 +159,18 @@
+@@ -159,18 +160,18 @@
    				    qtiUtil.py \
    				    qti_wordlist.txt \
  
@@ -74,7 +75,7 @@
    }
  
    win32 {
-@@ -218,7 +218,7 @@
+@@ -220,7 +221,7 @@
  !isEmpty(BOOST_LIBS) {
  	DEFINES += OPJ_IMPORT
  	INCLUDEPATH += $$BOOST_INCLUDEPATH