[arch-commits] Commit in qtiplot/repos (3 files)

[Ronald van Haren]

    Date: Tuesday, February 3, 2009 @ 13:52:36
  Author: ronald
Revision: 26180

Merged revisions 26169 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/qtiplot/trunk

........
  r26169 | ronald | 2009-02-03 17:07:49 +0100 (Tue, 03 Feb 2009) | 1 line
  
  upgpkg: qtiplot 0.9.7.4-2
........

Modified:
  qtiplot/repos/extra-i686/	(properties)
  qtiplot/repos/extra-i686/PKGBUILD
  qtiplot/repos/extra-i686/qtiplot.archlinux.patch

-------------------------+
 PKGBUILD                |   11 ++++++-----
 qtiplot.archlinux.patch |   17 +++--------------
 2 files changed, 9 insertions(+), 19 deletions(-)


Property changes on: qtiplot/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /qtiplot/trunk:1-25754
   + /qtiplot/trunk:1-26179

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-03 18:45:09 UTC (rev 26179)
+++ extra-i686/PKGBUILD	2009-02-03 18:52:36 UTC (rev 26180)
@@ -4,13 +4,14 @@
 
 pkgname=qtiplot
 pkgver=0.9.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Data analysis and scientific plotting - free clone of Origin"
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/qtiplot.html"
-depends=('qwtplot3d' 'muparser>=1.30' 'gsl' 'python>=2.6' 'pyqt' 'sip' \
-	'boost>=1.36' 'libgl')
-# build against static liborigin provided in the package ...
+depends=('muparser>=1.30' 'gsl' 'python>=2.6' 'pyqt' 'sip' \
+	'boost>=1.36' 'libgl' 'qwt')
+# build against liborigin provided in the package ...
+# build against qwtplot3d provided in the package ...
 # as systemwide one doesn't provide all needed functions
 license=('GPL2')
 
@@ -22,7 +23,7 @@
 
 md5sums=('dd149d024501e34cda685023522b4d8d'         '56bd53f4f1367c285086acb969f13348'
          'ad8affbd6f0d5cbdcde46c923ee2668a'         '927149a0c3623209d4aaef867031ba76'
-         'ad2333cfb8df37d33a6449c2c49ec945'         '6e30bd907a945881f667036df3b3d96b'
+         'ad2333cfb8df37d33a6449c2c49ec945'         '4a37f3bbf2cff51dcd93305a920d4415'
          '20ae1d441f299aa2c2c54e3bed3a9786'         '2c858d26255ecde7bcd157515ed767d6'
          'f68e62cd6c6762345f1a123321f49e57'         'b65f2b1266b42b9c298ac4dee3d19c90')
 

Modified: extra-i686/qtiplot.archlinux.patch
===================================================================
--- extra-i686/qtiplot.archlinux.patch	2009-02-03 18:45:09 UTC (rev 26179)
+++ extra-i686/qtiplot.archlinux.patch	2009-02-03 18:52:36 UTC (rev 26180)
@@ -1,5 +1,5 @@
---- qtiplot.pro	2008-11-20 09:36:32.000000000 +0100
-+++ qtiplot.pro.archlinux	2009-01-28 00:50:29.479822245 +0100
+--- qtiplot.pro.old	2009-02-03 11:25:02.575512255 +0100
++++ qtiplot.pro	2009-02-03 11:24:53.717052708 +0100
 @@ -20,7 +20,7 @@
  win32:LIBS 		  += ../3rdparty/libpng/libpng.a
  
@@ -49,21 +49,10 @@
  #unix:LIBS         += -lmuparser
  #unix:LIBS         += -lqwt
  #unix:LIBS         += -lgsl -lgslcblas
-+unix:LIBS	   += -lmuparser -lqwtplot3d -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread-mt
++unix:LIBS	   += -lmuparser -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread-mt
  
  ##################### Windows ###############################################
  
-@@ -163,7 +163,7 @@
- ################# Default Modules #############################
- ###############################################################
- 
--include(../3rdparty/qwtplot3d/qwtplot3d.pri)
-+#include(../3rdparty/qwtplot3d/qwtplot3d.pri)
- include(src/analysis/analysis.pri)
- include(src/core/core.pri)
- include(src/lib/libqti.pri)
---- qtiplot.pro	2009-01-28 01:11:02.526225964 +0100
-+++ qtiplot.pro.archlinux	2009-01-28 01:24:49.226561202 +0100
 @@ -186,7 +186,7 @@
    						qtiUtil.py \
    						qti_wordlist.txt \