=== added file '.gitignore' --- .gitignore 1970-01-01 00:00:00 +0000 +++ .gitignore 2010-07-28 09:07:44 +0000 @@ -0,0 +1,12 @@ +Makefile +*.o +*.a +*.dylib +.*.swp +*.qm +3rdparty/qwt/src/moc/ +build.conf +qtiplot/qtiplot.app/ +qtiplot-manual-en.pdf +tmp/ +.DS_Store === modified file '.pc/applied-patches' --- .pc/applied-patches 2010-07-25 16:29:05 +0000 +++ .pc/applied-patches 2010-07-29 13:27:34 +0000 @@ -1,3 +1,2 @@ 01_build_system.diff 02_fix_paths.diff -debian-changes-0.9.8-1 === removed directory '.pc/debian-changes-0.9.8-1' === removed directory '.pc/debian-changes-0.9.8-1/qtiplot' === removed file '.pc/debian-changes-0.9.8-1/qtiplot/qtiplot.pro' --- .pc/debian-changes-0.9.8-1/qtiplot/qtiplot.pro 2010-07-25 16:29:05 +0000 +++ .pc/debian-changes-0.9.8-1/qtiplot/qtiplot.pro 1970-01-01 00:00:00 +0000 @@ -1,248 +0,0 @@ -TARGET = qtiplot -QTI_ROOT = .. -!include( $$QTI_ROOT/build.conf ) { - message( "You need a build.conf file with local settings!" ) -} - -##################### 3rd PARTY HEADER FILES SECTION ######################## -#!!! Warning: You must set this up in $$QTIROOT/build.conf -############################################################################# - -# local copy included -INCLUDEPATH += ../3rdparty/zlib -INCLUDEPATH += ../3rdparty/QTeXEngine/src - -# configurable -INCLUDEPATH += $$MUPARSER_INCLUDEPATH -INCLUDEPATH += $$QWT_INCLUDEPATH -INCLUDEPATH += $$QWT3D_INCLUDEPATH -INCLUDEPATH += $$GSL_INCLUDEPATH - -# configurable libs -LIBS += $$MUPARSER_LIBS -LIBS += $$QWT_LIBS -LIBS += $$QWT3D_LIBS -LIBS += $$GSL_LIBS -LIBS += -lorigin2 - -############################################################################# -###################### BASIC PROJECT PROPERTIES ############################# -############################################################################# - -QMAKE_PROJECT_DEPTH = 0 - -!contains(CONFIG, BrowserPlugin){ - TEMPLATE = app -} - -CONFIG += qt warn_on exceptions opengl thread -CONFIG += assistant - -DEFINES += QT_PLUGIN -contains(CONFIG, CustomInstall){ - INSTALLS += target - INSTALLS += translations - INSTALLS += manual - INSTALLS += documentation - unix:INSTALLS += man - - unix: INSTALLBASE = /usr - 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: man.path = $$INSTALLBASE/share/man/man1/ - - win32: target.path = $$INSTALLBASE - win32: translations.path = $$INSTALLBASE/translations - win32: manual.path = $$INSTALLBASE/manual - win32: documentation.path = $$INSTALLBASE/doc - - DEFINES += TRANSLATIONS_PATH="\\\"$$replace(translations.path," ","\ ")\\\" - DEFINES += MANUAL_PATH="\\\"$$replace(manual.path," ","\ ")\\\" - } - -win32:DEFINES += QT_DLL QT_THREAD_SUPPORT -QT += opengl qt3support network svg xml - -MOC_DIR = ../tmp/qtiplot -OBJECTS_DIR = ../tmp/qtiplot -SIP_DIR = ../tmp/qtiplot -DESTDIR = ./ - -############################################################################# -###################### PROJECT FILES SECTION ################################ -############################################################################# - -###################### ICONS ################################################ -INCLUDEPATH += icons/ -win32:RC_FILE = icons/qtiplot.rc -mac:RC_FILE = icons/qtiplot.icns -RESOURCES = ../manual/html/icons/icons.qrc - -###################### TRANSLATIONS ######################################### - -TRANSLATIONS = translations/qtiplot_cn.ts \ - translations/qtiplot_cz.ts \ - translations/qtiplot_de.ts \ - translations/qtiplot_es.ts \ - translations/qtiplot_fr.ts \ - #translations/qtiplot_pt.ts \ - translations/qtiplot_ro.ts \ - translations/qtiplot_ru.ts \ - translations/qtiplot_ja.ts \ - translations/qtiplot_sv.ts - -translations.files += translations/qtiplot_cn.qm \ - translations/qtiplot_cz.qm \ - translations/qtiplot_de.qm \ - translations/qtiplot_es.qm \ - translations/qtiplot_fr.qm \ - #translations/qtiplot_pt.qm \ - translations/qtiplot_ro.qm \ - translations/qtiplot_ru.qm \ - translations/qtiplot_ja.qm \ - translations/qtiplot_sv.qm - -isEmpty(LUPDATE): LUPDATE = lupdate -system($$LUPDATE -verbose qtiplot.pro) -isEmpty(LRELEASE): LRELEASE = lrelease -system($$LRELEASE -verbose qtiplot.pro) - -###################### DOCUMENTATION ######################################## - -manual.files += ../manual/html \ - ../manual/qtiplot-manual-en.pdf - -documentation.files += ../README.html - -unix: man.files += ../qtiplot.1 - -############################################################### -##################### Compression (zlib-1.2.3) ################ -############################################################### - -SOURCES += ../minigzip.c - -############################################################### -################# Default Modules ############################# -############################################################### - -include(src/analysis/analysis.pri) -include(src/core/core.pri) -include(src/lib/libqti.pri) -include(src/plot2D/plot2D.pri) -include(src/plot3D/plot3D.pri) -include(src/matrix/matrix.pri) -include(src/table/table.pri) -include(src/scripting/scripting.pri) - -############################################################### -##################### TeX export: QTeXEngine ################## -############################################################### - -INCLUDEPATH += ../3rdparty/QTeXEngine/src -HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h -SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp -SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp - -############################################################### -##################### Scripting: PYTHON + SIP + PyQT ########## -############################################################### - -contains(SCRIPTING_LANGS, Python) { - contains(CONFIG, CustomInstall){ - INSTALLS += pythonconfig - pythonconfig.files += qtiplotrc.py \ - qtiUtil.py \ - qti_wordlist.txt \ - - unix: pythonconfig.path = /usr/share/qtiplot - win32: pythonconfig.path = $$INSTALLBASE - DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\" - } - - unix { - isEmpty(PYTHON): PYTHON = python - INCLUDEPATH += /usr/include/python2.6 - LIBS += -lpython2.6 - LIBS += -lm - system(mkdir -p $${SIP_DIR}) - system($$system(python2.6 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip) - } - - win32 { - INCLUDEPATH += $$system(call python-includepath.py) - LIBS += $$system(call python-libs-win.py) - system($$system(call python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip) - } -} - -############################################################### - -# check if we have libpng -!isEmpty(LIBPNG_LIBS) { - DEFINES += GL2PS_HAVE_LIBPNG - INCLUDEPATH += $$LIBPNG_INCLUDEPATH - LIBS += $$LIBPNG_LIBS -} - -############################################################### - -# check if we have EmfEnginge -!isEmpty(EMF_ENGINE_LIBS) { - DEFINES += EMF_OUTPUT - INCLUDEPATH += $$EMF_ENGINE_INCLUDEPATH - LIBS += $$EMF_ENGINE_LIBS - win32:LIBS += -lgdiplus - unix:LIBS += -lEMF -} - -# check if we have libxls -!isEmpty(XLS_LIBS) { - DEFINES += XLS_IMPORT - INCLUDEPATH += $$XLS_INCLUDEPATH - LIBS += $$XLS_LIBS -} - -# check if we have QuaZIP -!isEmpty(QUAZIP_LIBS) { - DEFINES += ODS_IMPORT - INCLUDEPATH += $$QUAZIP_INCLUDEPATH - LIBS += $$QUAZIP_LIBS -} - -# check if we have liborigin2 -!isEmpty(BOOST_LIBS) { - DEFINES += OPJ_IMPORT - INCLUDEPATH += $$BOOST_INCLUDEPATH - INCLUDEPATH += /usr/include/liborigin2 - LIBS += $$BOOST_LIBS - include(src/origin/origin.pri) -} - -# check if support for Microsoft Excel should be enabled -win32: contains(CONFIG, Excel) { - CONFIG += qaxcontainer - DEFINES += HAS_EXCEL - SOURCES += src/core/ExcelImport.cpp -} - -############################################################### - -# At the very end: add global include- and lib path -unix:INCLUDEPATH += $$SYS_INCLUDEPATH -unix:LIBS += $$SYS_LIBS - -############################################################### -############### Building QtiPlot as a browser plugin ########## -############################################################### - -contains(CONFIG, BrowserPlugin){ - DEFINES += BROWSER_PLUGIN - win32: CONFIG += qaxserver - RC_FILE = qtiplot.rc - include(../3rdparty/QtSolutions/qtbrowserplugin/src/qtbrowserplugin.pri) -} === modified file 'debian/changelog' --- debian/changelog 2010-07-25 16:29:05 +0000 +++ debian/changelog 2010-07-29 10:47:51 +0000 @@ -1,3 +1,13 @@ +qtiplot (0.9.8-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable (LP: #605027) + * debian/control: Fix Qt 4.7 compatibility (LP: #598826) + + Build-Depends: libqtassistantclient-dev + + Recommends: qt-assistant-compat + * Rm debian/patches/debian-changes-0.9.8-1: Maverick has Python 2.6 + + -- Alexander Valavanis Thu, 29 Jul 2010 11:46:57 +0100 + qtiplot (0.9.8-1) unstable; urgency=low * New upstream release @@ -31,6 +41,24 @@ -- Gudjon I. Gudjonsson Wed, 28 Apr 2010 08:50:00 +0200 +qtiplot (0.9.7.10+r1453-1ubuntu2) lucid; urgency=low + + * Rebuild against new SIP, no changes (LP: #518473) + + -- Scott Howard Sun, 07 Feb 2010 16:13:25 -0500 + +qtiplot (0.9.7.10+r1453-1ubuntu1) lucid; urgency=low + + * Synced with Debian testing, removed all previous Ubuntu changes + (LP: #494111) + * New Ubuntu changes: + * debian/control + - MOTU maintainers + * debian/01_build_system.diff + - 's/python2.5/python2.6/' + + -- Scott Howard Tue, 08 Dec 2009 18:06:27 -0500 + qtiplot (0.9.7.10+r1453-1) unstable; urgency=low [ Gudjon I. Gudjonsson ] === modified file 'debian/control' --- debian/control 2010-07-25 16:29:05 +0000 +++ debian/control 2010-07-28 09:47:10 +0000 @@ -1,13 +1,15 @@ Source: qtiplot Section: math Priority: optional -Maintainer: Debian Science Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Team Uploaders: Gudjon I. Gudjonsson , Andreas Tille Build-Depends: debhelper (>= 7), quilt, 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), - python-qt4, python-qt4-dev, python-sip4-dev, sip4, libqt4-opengl-dev + python-qt4, python-qt4-dev, python-sip4-dev, sip4, libqt4-opengl-dev, + libqtassistantclient-dev Standards-Version: 3.9.0 Homepage: http://soft.proindependent.com/qtiplot.html Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qtiplot/trunk/ @@ -18,6 +20,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python-qt4, libqt4-opengl, python-central, python-sip4 (>=4.9-1) +Recommends: qt-assistant-compat Description: data analysis and scientific plotting Qtiplot is a fully fledged plotting software similar to the OriginLab Origin software (See http://www.originlab.com for more information about Origin). === removed file 'debian/patches/debian-changes-0.9.8-1' --- debian/patches/debian-changes-0.9.8-1 2010-07-25 16:29:05 +0000 +++ debian/patches/debian-changes-0.9.8-1 1970-01-01 00:00:00 +0000 @@ -1,44 +0,0 @@ -Description: Upstream changes introduced in version 0.9.8-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - qtiplot (0.9.8-1) unstable; urgency=low - . - * New upstream release - * Bump standards version to 3.9.0 - * Change python version to 2.6 - . - The person named in the Author field signed this changelog entry. -Author: Gudjon I. Gudjonsson - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- qtiplot-0.9.8.orig/qtiplot/qtiplot.pro -+++ qtiplot-0.9.8/qtiplot/qtiplot.pro -@@ -166,11 +166,11 @@ contains(SCRIPTING_LANGS, Python) { - - unix { - isEmpty(PYTHON): PYTHON = python -- INCLUDEPATH += /usr/include/python2.6 -- LIBS += -lpython2.6 -+ INCLUDEPATH += /usr/include/python2.5 -+ LIBS += -lpython2.5 - LIBS += -lm - system(mkdir -p $${SIP_DIR}) -- system($$system(python2.6 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip) -+ system($$system(python2.5 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip) - } - - win32 { === modified file 'debian/patches/series' --- debian/patches/series 2010-07-25 16:29:05 +0000 +++ debian/patches/series 2010-07-29 13:15:23 +0000 @@ -1,3 +1,2 @@ 01_build_system.diff 02_fix_paths.diff -debian-changes-0.9.8-1 === modified file 'qtiplot/qtiplot.pro' --- qtiplot/qtiplot.pro 2010-07-25 16:29:05 +0000 +++ qtiplot/qtiplot.pro 2010-07-29 13:27:33 +0000 @@ -166,11 +166,11 @@ unix { isEmpty(PYTHON): PYTHON = python - INCLUDEPATH += /usr/include/python2.5 - LIBS += -lpython2.5 + INCLUDEPATH += /usr/include/python2.6 + LIBS += -lpython2.6 LIBS += -lm system(mkdir -p $${SIP_DIR}) - system($$system(python2.5 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip) + system($$system(python2.6 python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip) } win32 {