r37061 - in /packages/qtiplot/trunk/debian: build.conf changelog control
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Thu Dec 2 07:19:26 UTC 2010
Author: gudjon-guest
Date: Thu Dec 2 07:19:18 2010
New Revision: 37061
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37061
Log:
* New upstream release
* Remove quilt dependency
* Depend on liborigin2 (>=1:13092010)
* Reenable liborigin2 (Closes: #604819)
Modified:
packages/qtiplot/trunk/debian/build.conf
packages/qtiplot/trunk/debian/changelog
packages/qtiplot/trunk/debian/control
Modified: packages/qtiplot/trunk/debian/build.conf
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/build.conf?rev=37061&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/build.conf (original)
+++ packages/qtiplot/trunk/debian/build.conf Thu Dec 2 07:19:18 2010
@@ -3,13 +3,20 @@
}
##########################################################
-## System specific configuration
+## System specific configuration
##########################################################
# Global include path which is always added at the end of the INCLUDEPATH
SYS_INCLUDEPATH = /usr/include
# Global lib path and libs which is ls always added at the end of LIBS
SYS_LIBS = -L/usr/lib
+
+##########################################################
+## zlib (http://www.zlib.net/)
+##########################################################
+
+# include path. leave it blank to use SYS_INCLUDE
+#ZLIB_INCLUDEPATH = $$QTI_ROOT/3rdparty/zlib/
##########################################################
## muParser (http://muparser.sourceforge.net/)
@@ -23,7 +30,7 @@
MUPARSER_LIBS = -lmuparser
##########################################################
-## GNU Sientific Library (http://www.gnu.org/software/gsl/)
+## GNU Sientific Library (http://www.gnu.org/software/gsl/)
##########################################################
# include path. leave it blank to use SYS_INCLUDE
@@ -35,25 +42,11 @@
GSL_LIBS = -lgsl -lgslcblas
##########################################################
-## Boost libraries (http://www.boost.org/)
-##########################################################
-
-# include path. leave it blank to use SYS_INCLUDE
-#BOOST_INCLUDEPATH = $$QTI_ROOT/3rdparty/boost
-# link statically against a copy in 3rdparty/
-#unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \
-# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
-#win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
-# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
-# or dynamically against a system-wide installation
-#BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
-
-##########################################################
## QWT - use local copy till upstream catches up
# http://qwt.sourceforge.net/index.html
##########################################################
-# include path.
+# include path.
QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
# link locally against a copy in 3rdparty/
QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
@@ -68,6 +61,52 @@
# link locally against a copy in 3rdparty/
win32:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/qwtplot3d.dll
unix:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+
+##########################################################
+## Boost libraries (http://www.boost.org/) - optional
+##########################################################
+
+# include path. leave it blank to use SYS_INCLUDE
+#BOOST_INCLUDEPATH = $$QTI_ROOT/3rdparty/boost
+# link statically against a copy in 3rdparty/
+#unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time.a \
+# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread.a
+#win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
+# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
+# or dynamically against a system-wide installation
+BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
+
+##########################################################
+## liborigin2 - optional. you don't have to set these variables
+# http://soft.proindependent.com/liborigin2/
+##########################################################
+
+# include path. leave it blank to use SYS_INCLUDE
+LIBORIGIN_INCLUDEPATH = /usr/include/liborigin
+# link statically against a copy in 3rdparty/
+LIBORIGIN_LIBS = -lorigin2
+
+###########################################################
+## libxls - optional. you don't have to set these variables
+# http://libxls.sourceforge.net/
+###########################################################
+
+# include path.
+#XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/libxls/include/
+#XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/ExcelFormat/
+# link locally against a copy in 3rdparty/
+#XLS_LIBS = $$QTI_ROOT/3rdparty/libxls/lib/libxlsreader.a
+#XLS_LIBS = $$QTI_ROOT/3rdparty/ExcelFormat/lib/libExcelFormat.a
+
+###########################################################
+## QuaZIP - optional. you don't have to set these variables
+# http://quazip.sourceforge.net/
+###########################################################
+
+# include path.
+#QUAZIP_INCLUDEPATH = $$QTI_ROOT/3rdparty/quazip/quazip/
+# link locally against a copy in 3rdparty/
+#QUAZIP_LIBS = $$QTI_ROOT/3rdparty/quazip/lib/libquazip.a
##########################################################
## libpng - optional. you don't have to set these variables
@@ -85,10 +124,45 @@
# http://soft.proindependent.com/emf/index.html
##########################################################
-# include path.
+# include path.
#EMF_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/EmfEngine/src
# link locally against a copy in 3rdparty/
#EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
+
+##########################################################
+## QTeXEngine - optional. you don't have to set these variables
+# http://soft.proindependent.com/qtexengine/
+##########################################################
+
+# include path.
+#TEX_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/QTeXEngine/src
+# link locally against a copy in 3rdparty/
+#TEX_ENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine/libQTeXEngine.a
+
+##########################################################
+## ALGLIB (2.6) - optional. you don't have to set these variables
+# http://www.alglib.net/
+##########################################################
+
+# include path.
+#ALGLIB_INCLUDEPATH = $$QTI_ROOT/3rdparty/alglib/
+# link locally against a copy in 3rdparty/
+#ALGLIB_LIBS = $$QTI_ROOT/3rdparty/alglib/libalglib.a
+
+##########################################################
+## python - only used if python is needed
+##########################################################
+
+# the python interpreter to use
+# (unix only, windows will use what ever is configured to execute .py files!)
+PYTHON = python
+
+##########################################################
+## Qt tools - allows to use specific versions
+##########################################################
+
+LUPDATE = lupdate
+LRELEASE = lrelease
############################################################
## Target specific configuration: configure Qtiplot itself
@@ -103,17 +177,14 @@
# where running QtiPlot from a terminal is inconvenient
DEFINES += SCRIPTING_CONSOLE
- # a dialog for selecting the scripting language on a per-project basis
- DEFINES += SCRIPTING_DIALOG
-
#DEFINES += QTIPLOT_DEMO
-
- # Comment the following lines to disable donations start-up message.
- #DEFINES += QTIPLOT_SUPPORT
# Uncomment the following line if you want to perform a custom installation using the *.path variables defined in ./qtiplot.pro.
CONFIG += CustomInstall
+ # Uncomment the following line if you want to build QtiPlot as a browser plugin (not working on Internet Explorer).
+ #CONFIG += BrowserPlugin
+
CONFIG += release
#CONFIG += debug
#win32: CONFIG += console
Modified: packages/qtiplot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/changelog?rev=37061&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/changelog (original)
+++ packages/qtiplot/trunk/debian/changelog Thu Dec 2 07:19:18 2010
@@ -1,3 +1,12 @@
+qtiplot (0.9.8.2-1) UNRELEASED; 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
+
qtiplot (0.9.8-2) unstable; urgency=low
* Bump standards version to 3.9.1
Modified: packages/qtiplot/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/control?rev=37061&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/control (original)
+++ packages/qtiplot/trunk/debian/control Thu Dec 2 07:19:18 2010
@@ -4,9 +4,9 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Gudjon I. Gudjonsson <gudjon at gudjon.org>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), quilt, dblatex, docbook-utils, doxygen,
+Build-Depends: debhelper (>= 7), dblatex, docbook-utils, doxygen,
libgsl0-dev, zlib1g-dev, libpng12-dev,
- liborigin2-dev (>=1:06042009+svn1724), libmuparser-dev (>=1.32), python-all-dev (>= 2.4.4),
+ 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
Standards-Version: 3.9.1
Homepage: http://soft.proindependent.com/qtiplot.html
More information about the debian-science-commits
mailing list