diff -Nru qtiplot-0.9.8/debian/changelog qtiplot-0.9.8/debian/changelog --- qtiplot-0.9.8/debian/changelog 2010-10-19 17:34:46.000000000 +0100 +++ qtiplot-0.9.8/debian/changelog 2010-10-19 17:50:10.000000000 +0100 @@ -1,3 +1,22 @@ +qtiplot (0.9.8-2ubuntu1) natty; urgency=low + + * Merge with debian unstable (LP: #656046). Remaining changes: + - Build-Depends on libqtassistantclient-dev + Recommends qt-assistant-compat to fix a FTBFS since qtassistant + is removed in qt > 4.6 (LP: #598826) + * Added 03_binutils-gold-fix.diff: Fix FTBFS with binutils-gold (LP: #663332) + + -- Alexander Valavanis Tue, 19 Oct 2010 17:38:21 +0100 + +qtiplot (0.9.8-2) unstable; urgency=low + + * Bump standards version to 3.9.1 + * Add comments to patches + * Removing accidental patch, debian-changes that prevents qtiplot from + depending on python 2.6 (Closes: #594341) + + -- Gudjon I. Gudjonsson Wed, 29 Sep 2010 21:59:36 +0200 + qtiplot (0.9.8-1ubuntu1) maverick; urgency=low * Merge from debian unstable(LP: #605027). Remaining changes: diff -Nru qtiplot-0.9.8/debian/control qtiplot-0.9.8/debian/control --- qtiplot-0.9.8/debian/control 2010-10-19 17:34:46.000000000 +0100 +++ qtiplot-0.9.8/debian/control 2010-10-19 17:42:45.000000000 +0100 @@ -10,7 +10,7 @@ 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, libqtassistantclient-dev -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 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 diff -Nru qtiplot-0.9.8/debian/patches/01_build_system.diff qtiplot-0.9.8/debian/patches/01_build_system.diff --- qtiplot-0.9.8/debian/patches/01_build_system.diff 2010-10-19 17:34:46.000000000 +0100 +++ qtiplot-0.9.8/debian/patches/01_build_system.diff 2010-10-19 17:36:21.000000000 +0100 @@ -1,3 +1,5 @@ +Changes the build system to use libraries from the Debian package system +and fixes installation directories --- a/qtiplot.pro +++ b/qtiplot.pro @@ -1,7 +1,5 @@ diff -Nru qtiplot-0.9.8/debian/patches/02_fix_paths.diff qtiplot-0.9.8/debian/patches/02_fix_paths.diff --- qtiplot-0.9.8/debian/patches/02_fix_paths.diff 2010-10-19 17:34:46.000000000 +0100 +++ qtiplot-0.9.8/debian/patches/02_fix_paths.diff 2010-10-19 17:36:21.000000000 +0100 @@ -1,3 +1,4 @@ +Installs qti_wordlist to /usr/share/qtiplot --- a/qtiplot/src/core/ApplicationWindow.cpp +++ b/qtiplot/src/core/ApplicationWindow.cpp @@ -17735,7 +17735,7 @@ diff -Nru qtiplot-0.9.8/debian/patches/03_binutils-gold-fix.diff qtiplot-0.9.8/debian/patches/03_binutils-gold-fix.diff --- qtiplot-0.9.8/debian/patches/03_binutils-gold-fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ qtiplot-0.9.8/debian/patches/03_binutils-gold-fix.diff 2010-10-19 17:48:42.000000000 +0100 @@ -0,0 +1,16 @@ +Adds -lz library linkage to fix issues with binutils-gold +See https://bugs.launchpad.net/ubuntu/+source/qtiplot/+bug/663332 +Alex Valavanis +2010-10-19 +Index: qtiplot-fix-656046/qtiplot/qtiplot.pro +=================================================================== +--- qtiplot-fix-656046.orig/qtiplot/qtiplot.pro 2010-10-19 17:45:13.000000000 +0100 ++++ qtiplot-fix-656046/qtiplot/qtiplot.pro 2010-10-19 17:45:25.000000000 +0100 +@@ -24,6 +24,7 @@ + LIBS += $$QWT3D_LIBS + LIBS += $$GSL_LIBS + LIBS += -lorigin2 ++LIBS += -lz + + ############################################################################# + ###################### BASIC PROJECT PROPERTIES ############################# diff -Nru qtiplot-0.9.8/debian/patches/debian-changes-0.9.8-1 qtiplot-0.9.8/debian/patches/debian-changes-0.9.8-1 --- qtiplot-0.9.8/debian/patches/debian-changes-0.9.8-1 2010-10-19 17:34:46.000000000 +0100 +++ qtiplot-0.9.8/debian/patches/debian-changes-0.9.8-1 1970-01-01 01:00:00.000000000 +0100 @@ -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 { diff -Nru qtiplot-0.9.8/debian/patches/series qtiplot-0.9.8/debian/patches/series --- qtiplot-0.9.8/debian/patches/series 2010-10-19 17:34:46.000000000 +0100 +++ qtiplot-0.9.8/debian/patches/series 2010-10-19 17:45:02.000000000 +0100 @@ -1,2 +1,3 @@ 01_build_system.diff 02_fix_paths.diff +03_binutils-gold-fix.diff