aboutsummaryrefslogtreecommitdiff
blob: 38b585fec78242320240b45715b0979d58366e22 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
diff -r -U2 scidavis-0.1.3.orig/scidavis/scidavis.pro scidavis-0.1.3/scidavis/scidavis.pro
--- scidavis-0.1.3.orig/scidavis/scidavis.pro	2008-03-01 02:52:46.000000000 +0600
+++ scidavis-0.1.3/scidavis/scidavis.pro	2008-05-19 10:29:18.000000000 +0700
@@ -19,6 +19,6 @@
 
 ### names of the lupdate and lrelease programs (needed if you want to compile and install the translations automatically)
-unix: LUPDATE_BIN = lupdate-qt4
-unix: LRELEASE_BIN = lrelease-qt4
+unix: LUPDATE_BIN = lupdate
+unix: LRELEASE_BIN = lrelease
 win32: LUPDATE_BIN = lupdate
 win32: LRELEASE_BIN = lrelease
@@ -46,5 +46,5 @@
 ### (or ".scidavis.py") into the users home directory. scidavisUtil.py must be either in the 
 ### directory specified here or somewhere else in the python path (sys.path) where "import" can find it
-unix: pythonconfig.path = /etc						# where scidavisrc.py is installed
+unix: pythonconfig.path = $$INSTALLBASE/share/scidavis       # where scidavisrc.py is installed
 win32: pythonconfig.path = $$INSTALLBASE    
 unix: pythonutils.path = $$INSTALLBASE/share/scidavis        # where the scidavisUtil python modules is installed
@@ -59,6 +59,6 @@
 ### Note to packagers: If you want to use systemwide installed liborigin
 ### instead of the one provided in "3rdparty", uncomment the following 2 lines:
-# CONFIG += dynamic_liborigin
-# LIBS += -lorigin
+#CONFIG += dynamic_liborigin
+#LIBS += -lorigin
 ### Unfortunately, due to liborigin being in alpha stage, we cannot promise
 ### that SciDAVis works with any other version that the one in "3rdparty".
@@ -71,12 +71,12 @@
 #############################################################################
 
-unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
+#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
 
-unix:INCLUDEPATH  += ../3rdparty/qwt/src
-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+#unix:INCLUDEPATH  += ../3rdparty/qwt/src
+#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
 
-unix:LIBS         += -L/usr/lib$${libsuff}
-unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
+#unix:LIBS         += -L/usr/lib$${libsuff}
+#unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
 
 #############################################################################
@@ -84,14 +84,17 @@
 #############################################################################
 
-#unix:INCLUDEPATH  += /usr/include/qwt5
-#unix:LIBS         += -L/usr/lib$${libsuff}
+unix:INCLUDEPATH  += /usr/include/muparser
+unix:INCLUDEPATH  += /usr/include/qwtplot3d
+unix:INCLUDEPATH  += /usr/include/qwt5
+unix:INCLUDEPATH  += /usr/include/gsl
 ## dynamically link against Qwt(3D) installed system-wide
 ## WARNING: make sure they are compiled against >= Qt4.2
 ## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also 
 ## cause problems.
-#unix:LIBS         += -lqwtplot3d
-#unix:LIBS         += -lqwt
+unix:LIBS         += -lqwtplot3d
+unix:LIBS         += -lqwt
 ##dynamically link against GSL and zlib installed system-wide
-#unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
+unix:LIBS         += $$system(pkg-config --libs gsl)
+unix:LIBS         += -lz -lmuparser
 
 #############################################################################
diff -r -U2 scidavis-0.1.3.orig/scidavis/sourcefiles.pri scidavis-0.1.3/scidavis/sourcefiles.pri
--- scidavis-0.1.3.orig/scidavis/sourcefiles.pri	2008-04-19 20:35:28.000000000 +0700
+++ scidavis-0.1.3/scidavis/sourcefiles.pri	2008-05-19 10:52:17.000000000 +0700
@@ -47,6 +47,5 @@
                        ../scidavis-logo.png \
                        ../README \
-                       ../CHANGES \
-                       ../gpl.txt 
+                       ../CHANGES
 
 ###################### DESKTOP INTEGRATION ##################################