Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv5606

Modified Files:
        qtiplot-qt4-x11.info qtiplot-qt4-x11.patch 
Log Message:
Update from tracker 
http://sourceforge.net/tracker/index.php?func=detail&aid=1929392&group_id=17203&atid=414256

Index: qtiplot-qt4-x11.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-x11.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qtiplot-qt4-x11.patch       29 Mar 2008 20:27:35 -0000      1.2
+++ qtiplot-qt4-x11.patch       6 Apr 2008 18:39:58 -0000       1.3
@@ -162,3 +162,79 @@
 -                manual\
 +#               manual\
            qtiplot
+Binary files qtiplot-0.9.3.orig/fitPlugins/fitRational0/.DS_Store and 
qtiplot-0.9.3/fitPlugins/fitRational0/.DS_Store differ
+diff -urN qtiplot-0.9.3.orig/fitPlugins/fitRational0/fitRational0.pro 
qtiplot-0.9.3/fitPlugins/fitRational0/fitRational0.pro
+--- qtiplot-0.9.3.orig/fitPlugins/fitRational0/fitRational0.pro        
2008-03-29 11:20:57.000000000 +0000
++++ qtiplot-0.9.3/fitPlugins/fitRational0/fitRational0.pro     2008-03-30 
13:59:26.000000000 +0100
+@@ -10,7 +10,9 @@
+ CONFIG           += dll 
+ 
+ DESTDIR           = ../
+- 
++
++QMAKE_LFLAGS_SONAME = [EMAIL PROTECTED]@/lib/qt4-x11/qtiplot/
++
+ # statically link against GSL in 3rdparty
+ unix:INCLUDEPATH += /sw/include
+ 
+Binary files qtiplot-0.9.3.orig/fitPlugins/fitRational1/.DS_Store and 
qtiplot-0.9.3/fitPlugins/fitRational1/.DS_Store differ
+diff -urN qtiplot-0.9.3.orig/fitPlugins/fitRational1/fitRational1.pro 
qtiplot-0.9.3/fitPlugins/fitRational1/fitRational1.pro
+--- qtiplot-0.9.3.orig/fitPlugins/fitRational1/fitRational1.pro        
2008-03-29 11:20:57.000000000 +0000
++++ qtiplot-0.9.3/fitPlugins/fitRational1/fitRational1.pro     2008-03-30 
13:59:51.000000000 +0100
+@@ -10,7 +10,9 @@
+ CONFIG           += dll 
+ 
+ DESTDIR           = ../
+- 
++
++QMAKE_LFLAGS_SONAME = [EMAIL PROTECTED]@/lib/qt4-x11/qtiplot/
++
+ # statically link against GSL in 3rdparty
+ unix:INCLUDEPATH += /sw/include
+ 
+Binary files qtiplot-0.9.3.orig/qtiplot/.DS_Store and 
qtiplot-0.9.3/qtiplot/.DS_Store differ
+diff -urN qtiplot-0.9.3.orig/qtiplot/qtiplot.pro 
qtiplot-0.9.3/qtiplot/qtiplot.pro
+--- qtiplot-0.9.3.orig/qtiplot/qtiplot.pro     2008-03-29 11:20:57.000000000 
+0000
++++ qtiplot-0.9.3/qtiplot/qtiplot.pro  2008-03-30 14:13:13.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ # building without muParser doesn't work yet
+ SCRIPTING_LANGS += muParser
+-#SCRIPTING_LANGS += Python
++SCRIPTING_LANGS += Python
+ 
+ # a console displaying output of scripts; particularly useful on Windows
+ # where running QtiPlot from a terminal is inconvenient
+@@ -16,8 +16,8 @@
+ # comment the following lines if you haven't subscribed for a QtiPlot 
binaries maintenance contract
+ #RESTRICTED_MODULES += EMF
+ 
+-#CONFIG          += release
+-CONFIG          += debug
++CONFIG          += release
++#CONFIG          += debug
+ #win32: CONFIG   += console
+ 
+ # what to install and where
+@@ -32,9 +32,9 @@
+ win32: INSTALLBASE = c:/QtiPlot
+ 
+ unix: target.path = $$INSTALLBASE/bin
+-unix: translations.path = $$INSTALLBASE/share/qtiplot/translations
+-unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual
+-unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
++unix: translations.path = $$INSTALLBASE/share/qtiplot-qt4-x11/translations
++unix: manual.path = $$INSTALLBASE/share/doc/qtiplot-qt4-x11/manual
++unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot-qt4-x11
+ unix: man.path = $$INSTALLBASE/share/man/man1/
+ 
+ win32: target.path = $$INSTALLBASE
+@@ -451,7 +451,7 @@
+   pythonconfig.files += qtiplotrc.py \
+                                               qtiUtil.py
+ 
+-  unix: pythonconfig.path = /etc
++  unix: pythonconfig.path = 
@PREFIX@/lib/python2.5/site-packages/qtiplot-qt4-x11
+   win32: pythonconfig.path = $$INSTALLBASE
+ 
+   DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"

Index: qtiplot-qt4-x11.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-x11.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qtiplot-qt4-x11.info        30 Mar 2008 15:12:06 -0000      1.3
+++ qtiplot-qt4-x11.info        6 Apr 2008 18:39:58 -0000       1.4
@@ -1,12 +1,13 @@
 Package: qtiplot-qt4-x11
 Version: 0.9.3
-Revision: 1
+Revision: 2
 
 Maintainer: Murali Vadivelu <[EMAIL PROTECTED]>
 
-Depends: x11, qt4-x11-core-shlibs, gsl-shlibs, qwtplot3d-qt4-x11-shlibs, 
qwt-qt4-x11-shlibs, muparser-shlibs, python25, python25-shlibs, pyqt4-py25, 
pyqt4-py25-bin
-BuildDepends: x11-dev, qt4-x11, gsl, qwtplot3d-qt4-x11, qwt-qt4-x11, muparser, 
sip-py25, sip-py25-bin, fink (>= 0.28) 
+Depends: x11, qt4-x11-core-shlibs, gsl-shlibs, qwtplot3d-qt4-x11-shlibs, 
qwt-qt4-x11-shlibs, muparser-shlibs, python25, python25-shlibs, pyqt4-py25, 
pyqt4-py25-bin, scipy-core-py25
+BuildDepends: x11-dev, qt4-x11, gsl, qwtplot3d-qt4-x11, qwt-qt4-x11, muparser, 
sip-py25, sip-py25-bin, fink (>= 0.28.0-1), glib2-dev , libgettext3-dev
 BuildConflicts: labplot, labplot-shlibs, liborigin, liborigin-shlibs
+Conflicts: qtiplot
 
 Description: Data analysis and scientific plotting
 Homepage: http://soft.proindependent.com/qtiplot.html
@@ -36,17 +37,10 @@
 <<
 
 InstallScript: <<
-mkdir -p %i/bin
-cp qtiplot/qtiplot %i/bin/
-
-mkdir -p %i/lib/qt4-x11/qtiplot
-cp -R fitPlugins/*.dylib %i/lib/qt4-x11/qtiplot/
+INSTALL_ROOT=%d make install
 cp -R 3rdparty/liborigin/*.dylib %i/lib/qt4-x11/qtiplot/
-
-mkdir -p %i/share/doc/qtiplot
-#cp -R manual/* %i/share/doc/qtiplot/
-install_name_tool -id %p/lib/qt4-x11/qtiplot/libfitRational0.1.dylib 
%i/lib/qt4-x11/qtiplot/libfitRational0.1.0.0.dylib
-install_name_tool -id %p/lib/qt4-x11/qtiplot/libfitRational1.1.dylib 
%i/lib/qt4-x11/qtiplot/libfitRational1.1.0.0.dylib
+echo qti > %i/lib/python2.5/site-packages/qtiplot-qt4-x11.pth
+cd %i/lib/python2.5/site-packages; %p/bin/python2.5 -O 
%p/lib/python2.5/compileall.py qtiplot-qt4-x11
 <<
 
 Shlibs: <<
@@ -55,8 +49,8 @@
 !%p/lib/qt4-x11/qtiplot/liborigin.0.dylib
 <<
 
-DocFiles: gpl_licence.txt README.html qtiplot.css qtiplot_logo.png
+#DocFiles: gpl_licence.txt README.html qtiplot.css qtiplot_logo.png
 
 DescDetail: <<
-Data analysis and scientific plotting 
+Data analysis and scientific plotting program
 <<


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to