r36446 - in /packages/qtiplot/trunk/debian: changelog control patches/01_build_system.diff patches/02_docbook_stylesheet.diff patches/02_fix_paths.diff patches/03_fix_qti_wordlist.txt_path.diff patches/04_add_includes.diff source/ source/format
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sat May 1 07:43:14 UTC 2010
Author: gudjon-guest
Date: Sat May 1 07:43:10 2010
New Revision: 36446
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36446
Log:
Fixed patches in version 0.9.7.14-1
Added:
packages/qtiplot/trunk/debian/patches/02_fix_paths.diff
packages/qtiplot/trunk/debian/source/
packages/qtiplot/trunk/debian/source/format
Removed:
packages/qtiplot/trunk/debian/patches/02_docbook_stylesheet.diff
packages/qtiplot/trunk/debian/patches/03_fix_qti_wordlist.txt_path.diff
packages/qtiplot/trunk/debian/patches/04_add_includes.diff
Modified:
packages/qtiplot/trunk/debian/changelog
packages/qtiplot/trunk/debian/control
packages/qtiplot/trunk/debian/patches/01_build_system.diff
Modified: packages/qtiplot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/changelog?rev=36446&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/changelog (original)
+++ packages/qtiplot/trunk/debian/changelog Sat May 1 07:43:10 2010
@@ -2,8 +2,9 @@
* New upstream release
* Build QTeXEngine into program
-
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Fri, 30 Apr 2010 08:33:40 +0200
+ * Bump liborigin2 dependency to >=30042010~r1705-1
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sat, 01 May 2010 09:33:45 +0200
qtiplot (0.9.7.13-1) unstable; urgency=low
Modified: packages/qtiplot/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/control?rev=36446&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/control (original)
+++ packages/qtiplot/trunk/debian/control Sat May 1 07:43:10 2010
@@ -6,9 +6,9 @@
Andreas Tille <tille at debian.org>
Build-Depends: debhelper (>= 7), quilt, dblatex, docbook-utils, doxygen,
libgsl0-dev, zlib1g-dev, libpng12-dev,
- liborigin2-dev, libmuparser-dev (>=1.30), python-all-dev (>= 2.4.4),
+ liborigin2-dev (>=30042010~r1705-), libmuparser-dev (>=1.30), python-all-dev (>= 2.4.4),
python-qt4, python-qt4-dev, python-sip4-dev, sip4, libqt4-opengl-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://soft.proindependent.com/qtiplot.html
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/qtiplot/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/qtiplot/trunk
Modified: packages/qtiplot/trunk/debian/patches/01_build_system.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/patches/01_build_system.diff?rev=36446&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/patches/01_build_system.diff (original)
+++ packages/qtiplot/trunk/debian/patches/01_build_system.diff Sat May 1 07:43:10 2010
@@ -11,18 +11,7 @@
qtiplot
--- a/qtiplot/qtiplot.pro
+++ b/qtiplot/qtiplot.pro
-@@ -9,8 +9,8 @@
- #############################################################################
-
- # local copy included
--INCLUDEPATH += ../3rdparty/liborigin
--INCLUDEPATH += ../3rdparty/zlib
-+#INCLUDEPATH += ../3rdparty/liborigin
-+#INCLUDEPATH += ../3rdparty/zlib
- INCLUDEPATH += ../3rdparty/QTeXEngine/src
-
- # configurable
-@@ -109,17 +109,16 @@
+@@ -106,17 +106,16 @@
translations/qtiplot_sv.qm
isEmpty(LUPDATE): LUPDATE = lupdate
@@ -43,7 +32,7 @@
unix: man.files += ../qtiplot.1
-@@ -127,7 +126,7 @@
+@@ -124,7 +123,7 @@
##################### Compression (zlib-1.2.3) ################
###############################################################
@@ -52,7 +41,7 @@
###############################################################
################# Default Modules #############################
-@@ -163,18 +162,18 @@
+@@ -159,18 +158,18 @@
qtiUtil.py \
qti_wordlist.txt \
@@ -75,9 +64,18 @@
}
win32 {
+@@ -218,7 +217,7 @@
+ !isEmpty(BOOST_LIBS) {
+ DEFINES += OPJ_IMPORT
+ INCLUDEPATH += $$BOOST_INCLUDEPATH
+- INCLUDEPATH += ../3rdparty/liborigin
++ INCLUDEPATH += /usr/include/liborigin2
+ LIBS += $$BOOST_LIBS
+ include(src/origin/origin.pri)
+ }
--- a/qtiplot/src/origin/origin.pri
+++ b/qtiplot/src/origin/origin.pri
-@@ -1,17 +1,19 @@
+@@ -1,27 +1,8 @@
###############################################################
################# Origin Import (liborigin) ###################
###############################################################
@@ -89,21 +87,71 @@
-HEADERS += ../3rdparty/liborigin/OriginFile.h
-HEADERS += ../3rdparty/liborigin/OriginParser.h
-HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
+-HEADERS += ../3rdparty/liborigin/Origin600Parser.h
+-HEADERS += ../3rdparty/liborigin/Origin610Parser.h
+-HEADERS += ../3rdparty/liborigin/Origin700Parser.h
-HEADERS += ../3rdparty/liborigin/Origin750Parser.h
-+#HEADERS += ../3rdparty/liborigin/OriginObj.h
-+#HEADERS += ../3rdparty/liborigin/OriginFile.h
-+#HEADERS += ../3rdparty/liborigin/OriginParser.h
-+#HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
-+#HEADERS += ../3rdparty/liborigin/Origin750Parser.h
+-HEADERS += ../3rdparty/liborigin/Origin800Parser.h
+-HEADERS += ../3rdparty/liborigin/Origin810Parser.h
SOURCES += src/origin/importOPJ.cpp
-SOURCES += ../3rdparty/liborigin/OriginFile.cpp
-SOURCES += ../3rdparty/liborigin/OriginParser.cpp
-SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
+-SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp
+-SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp
+-SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp
-SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
-+#SOURCES += ../3rdparty/liborigin/OriginFile.cpp
-+#SOURCES += ../3rdparty/liborigin/OriginParser.cpp
-+#SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
-+#SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
-+
-+LIBS += -lorigin2
+-SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp
+-SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp
+--- a/qtiplot/qtiplot.pro.rej
++++ /dev/null
+@@ -1,13 +0,0 @@
+---- qtiplot/qtiplot.pro
+-+++ qtiplot/qtiplot.pro
+-@@ -9,8 +9,8 @@
+- #############################################################################
+-
+- # local copy included
+--INCLUDEPATH += ../3rdparty/liborigin
+--INCLUDEPATH += ../3rdparty/zlib
+-+#INCLUDEPATH += ../3rdparty/liborigin
+-+#INCLUDEPATH += ../3rdparty/zlib
+- INCLUDEPATH += ../3rdparty/QTeXEngine/src
+-
+- # configurable
+--- a/qtiplot/src/origin/origin.pri.rej
++++ /dev/null
+@@ -1,32 +0,0 @@
+---- qtiplot/src/origin/origin.pri
+-+++ qtiplot/src/origin/origin.pri
+-@@ -1,17 +1,19 @@
+- ###############################################################
+- ################# Origin Import (liborigin) ###################
+- ###############################################################
+--INCLUDEPATH += src/origin/
+-+INCLUDEPATH += src/origin/ /usr/include/liborigin2
+-
+- HEADERS += src/origin/importOPJ.h
+--HEADERS += ../3rdparty/liborigin/OriginObj.h
+--HEADERS += ../3rdparty/liborigin/OriginFile.h
+--HEADERS += ../3rdparty/liborigin/OriginParser.h
+--HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
+--HEADERS += ../3rdparty/liborigin/Origin750Parser.h
+-+#HEADERS += ../3rdparty/liborigin/OriginObj.h
+-+#HEADERS += ../3rdparty/liborigin/OriginFile.h
+-+#HEADERS += ../3rdparty/liborigin/OriginParser.h
+-+#HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
+-+#HEADERS += ../3rdparty/liborigin/Origin750Parser.h
+-
+- SOURCES += src/origin/importOPJ.cpp
+--SOURCES += ../3rdparty/liborigin/OriginFile.cpp
+--SOURCES += ../3rdparty/liborigin/OriginParser.cpp
+--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
+--SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
+-+#SOURCES += ../3rdparty/liborigin/OriginFile.cpp
+-+#SOURCES += ../3rdparty/liborigin/OriginParser.cpp
+-+#SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
+-+#SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
+-+
+-+LIBS += -lorigin2
Added: packages/qtiplot/trunk/debian/patches/02_fix_paths.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/patches/02_fix_paths.diff?rev=36446&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/patches/02_fix_paths.diff (added)
+++ packages/qtiplot/trunk/debian/patches/02_fix_paths.diff Sat May 1 07:43:10 2010
@@ -1,0 +1,11 @@
+--- a/qtiplot/src/core/ApplicationWindow.cpp
++++ b/qtiplot/src/core/ApplicationWindow.cpp
+@@ -17735,7 +17735,7 @@
+ QStringList words;
+ #ifdef SCRIPTING_PYTHON
+ if (scriptEnv->name() == QString("Python")){
+- QString fn = d_python_config_folder + "/qti_wordlist.txt";
++ QString fn = "/usr/share/qtiplot/qti_wordlist.txt";
+ QFile file(fn);
+ if (!file.open(QFile::ReadOnly)){
+ QMessageBox::critical(this, tr("QtiPlot - Warning"),
Added: packages/qtiplot/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/source/format?rev=36446&op=file
==============================================================================
--- packages/qtiplot/trunk/debian/source/format (added)
+++ packages/qtiplot/trunk/debian/source/format Sat May 1 07:43:10 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list