r36471 - in /packages/qtiplot/trunk/debian: build.conf changelog control patches/01_build_system.diff

gudjon-guest at users.alioth.debian.org gudjon-guest at users.alioth.debian.org
Fri May 14 08:00:53 UTC 2010 

Author: gudjon-guest
Date: Fri May 14 08:00:41 2010
New Revision: 36471

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36471
Log:
Version 0.9.7.14 is ready for upload

Modified:
    packages/qtiplot/trunk/debian/build.conf
    packages/qtiplot/trunk/debian/changelog
    packages/qtiplot/trunk/debian/control
    packages/qtiplot/trunk/debian/patches/01_build_system.diff

Modified: packages/qtiplot/trunk/debian/build.conf
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/build.conf?rev=36471&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/build.conf (original)
+++ packages/qtiplot/trunk/debian/build.conf Fri May 14 08:00:41 2010
@@ -46,7 +46,7 @@
 #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
+#BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
 
 ##########################################################
 ## QWT - use local copy till upstream catches up

Modified: packages/qtiplot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/changelog?rev=36471&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/changelog (original)
+++ packages/qtiplot/trunk/debian/changelog Fri May 14 08:00:41 2010
@@ -3,10 +3,11 @@
   * New upstream release
   * Build QTeXEngine into program
   * 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
+  * Bump muparser dependency to 1.32
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Fri, 14 May 2010 09:04:55 +0200
+
+qtiplot (0.9.7.13-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Switch to dpkg-source 3.0 (quilt) format

Modified: packages/qtiplot/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/qtiplot/trunk/debian/control?rev=36471&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/control (original)
+++ packages/qtiplot/trunk/debian/control Fri May 14 08:00:41 2010
@@ -6,7 +6,7 @@
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7), quilt, dblatex, docbook-utils, doxygen,
  libgsl0-dev, zlib1g-dev, libpng12-dev,
- liborigin2-dev (>=30042010~r1705-), libmuparser-dev (>=1.30), python-all-dev (>= 2.4.4),
+ liborigin2-dev (>=30042010~r1705-), 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.8.4
 Homepage: http://soft.proindependent.com/qtiplot.html
@@ -20,7 +20,7 @@
  python-central, python-sip4 (>=4.9-1)
 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 informations about Origin).
+ software (See http://www.originlab.com for more information about Origin).
  .
  It can make two and three dimensional plots of publication quality, both from
  datasets and functions. It can do non-linear fitting and multi-peak fitting.
@@ -51,10 +51,11 @@
 
 Package: qtiplot-doc
 Architecture: all
+Depends: ${misc:Depends}
 Section: doc
 Description: data analysis and scientific plotting (documentation)
  This package is part of QtiPlot.
  .
  It contains QtiPlot manual and API documentation.
  .
- See the 'qtiplot' package for more informations.
+ See the 'qtiplot' package for more information.

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=36471&op=diff
==============================================================================
--- packages/qtiplot/trunk/debian/patches/01_build_system.diff (original)
+++ packages/qtiplot/trunk/debian/patches/01_build_system.diff Fri May 14 08:00:41 2010
@@ -11,7 +11,15 @@
          qtiplot
 --- a/qtiplot/qtiplot.pro
 +++ b/qtiplot/qtiplot.pro
-@@ -106,17 +106,16 @@
+@@ -23,6 +23,7 @@
+ LIBS         += $$QWT_LIBS
+ LIBS         += $$QWT3D_LIBS
+ LIBS         += $$GSL_LIBS
++LIBS         += -lorigin2
+ 
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
+@@ -106,17 +107,16 @@
  					translations/qtiplot_sv.qm
  
  isEmpty(LUPDATE): LUPDATE = lupdate
@@ -32,7 +40,7 @@
  
  unix: man.files += ../qtiplot.1
  
-@@ -124,7 +123,7 @@
+@@ -124,7 +124,7 @@
  ##################### Compression (zlib-1.2.3) ################
  ###############################################################
  
@@ -41,7 +49,7 @@
  
  ###############################################################
  ################# Default Modules #############################
-@@ -159,18 +158,18 @@
+@@ -159,18 +159,18 @@
    				    qtiUtil.py \
    				    qti_wordlist.txt \
  
@@ -64,7 +72,7 @@
    }
  
    win32 {
-@@ -218,7 +217,7 @@
+@@ -218,7 +218,7 @@
  !isEmpty(BOOST_LIBS) {
  	DEFINES += OPJ_IMPORT
  	INCLUDEPATH += $$BOOST_INCLUDEPATH
@@ -104,54 +112,3 @@
 -SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
 -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

More information about the debian-science-commits mailing list