Merge lp:~showard314/ubuntu/karmic/qtiplot/fix_karmic_ftbfs into lp:ubuntu/karmic/qtiplot

[Scott Howard]

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-14 00:19:13 +0000
+++ debian/changelog	2009-11-03 02:10:23 +0000
@@ -1,3 +1,12 @@
+qtiplot (0.9.7-1ubuntu1) karmic-proposed; urgency=low
+
+  * debian/patches/qwt_api_fix.patch
+    - Fixed FTBFS from api change in qwt AND Sip (LP: #471238)
+  * debian/postinst
+    - Removed python support since this FTBFS with Sip version in Karmic
+
+ -- Scott Howard <[e-mail]>  Mon, 02 Nov 2009 21:04:45 -0500
+
 qtiplot (0.9.7-1build1) karmic; urgency=low
 
   * Rebuild with Sip 4.9

=== added file 'debian/patches/qwt_api_fix.patch'
--- debian/patches/qwt_api_fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/qwt_api_fix.patch	2009-11-03 02:10:23 +0000
@@ -0,0 +1,153 @@
+# Ubuntu bug: https://bugs.launchpad.net/bugs/471238
+# Description: Updated qtiplot for new qwt api since this qtiplot is older than Jaunty.
+# Also removed python scripting capabillities since they do not work and cause FTBFS
+# since it relies on older (i.e. Hardy) versions of some packages.
+
+Index: ubuntu/qtiplot/src/plot2D/Graph.cpp
+===================================================================
+--- ubuntu.orig/qtiplot/src/plot2D/Graph.cpp	2009-11-02 18:43:24.505549985 -0500
++++ ubuntu/qtiplot/src/plot2D/Graph.cpp	2009-11-02 19:16:42.535545896 -0500
+@@ -1130,8 +1130,8 @@
+ 	maxSymbolSize *= 0.5;
+ 
+ 	QwtScaleDiv *div = axisScaleDiv(QwtPlot::xBottom);
+-	double start = div->lBound();
+-	double end = div->hBound();
++	double start = div->lowerBound();
++	double end = div->upperBound();
+ 	QwtValueList majTicksLst = div->ticks(QwtScaleDiv::MajorTick);
+ 	int ticks = majTicksLst.size();
+ 	double step = fabs(end - start)/(double)(ticks - 1.0);
+@@ -1142,18 +1142,18 @@
+     double x_left = xMap.xTransform(intv[QwtPlot::xBottom].minValue());
+ 
+ 	if (start >= xMap.invTransform(x_left - maxSymbolSize))
+-		start = div->lBound() - step;
++		start = div->lowerBound() - step;
+ 
+ 	double x_right = xMap.xTransform(intv[QwtPlot::xBottom].maxValue());
+ 	if (end <= xMap.invTransform(x_right + maxSymbolSize))
+-		end = div->hBound() + step;
++		end = div->upperBound() + step;
+ 
+ 	setAxisScale(QwtPlot::xBottom, start, end, step);
+ 	setAxisScale(QwtPlot::xTop, start, end, step);
+ 
+ 	div = axisScaleDiv(QwtPlot::yLeft);
+-	start = div->lBound();
+-	end = div->hBound();
++	start = div->lowerBound();
++	end = div->upperBound();
+ 	majTicksLst = div->ticks(QwtScaleDiv::MajorTick);
+ 	ticks = majTicksLst.size();
+ 	step = fabs(end - start)/(double)(ticks - 1.0);
+@@ -1163,11 +1163,11 @@
+ 	const QwtScaleMap &yMap = canvasMap(QwtPlot::yLeft);
+     double y_bottom = yMap.xTransform(intv[QwtPlot::yLeft].minValue());
+ 	if (start >= yMap.invTransform(y_bottom + maxSymbolSize))
+-		start = div->lBound() - step;
++		start = div->lowerBound() - step;
+ 
+ 	double y_top = yMap.xTransform(intv[QwtPlot::yLeft].maxValue());
+ 	if (end <= yMap.invTransform(y_top - maxSymbolSize))
+-		end = div->hBound() + step;
++		end = div->upperBound() + step;
+ 
+ 	setAxisScale(QwtPlot::yLeft, start, end, step);
+ 	setAxisScale(QwtPlot::yRight, start, end, step);
+@@ -1898,8 +1898,8 @@
+ 		const QwtScaleDiv *scDiv = axisScaleDiv(i);
+ 		QwtValueList lst = scDiv->ticks (QwtScaleDiv::MajorTick);
+ 
+-		s += QString::number(QMIN(scDiv->lBound(), scDiv->hBound()), 'g', 15)+"\t";
+-		s += QString::number(QMAX(scDiv->lBound(), scDiv->hBound()), 'g', 15)+"\t";
++		s += QString::number(QMIN(scDiv->lowerBound(), scDiv->upperBound()), 'g', 15)+"\t";
++		s += QString::number(QMAX(scDiv->lowerBound(), scDiv->upperBound()), 'g', 15)+"\t";
+ 		s += QString::number(d_user_step[i], 'g', 15)+"\t";
+ 		s += QString::number(axisMaxMajor(i))+"\t";
+ 		s += QString::number(axisMaxMinor(i))+"\t";
+@@ -3976,8 +3976,8 @@
+         double step = g->axisStep(i);
+ 		d_user_step[i] = step;
+ 		const QwtScaleDiv *sd = g->axisScaleDiv(i);
+-		QwtScaleDiv div = sc_engine->divideScale (QMIN(sd->lBound(), sd->hBound()),
+-				QMAX(sd->lBound(), sd->hBound()), majorTicks, minorTicks, step);
++		QwtScaleDiv div = sc_engine->divideScale (QMIN(sd->lowerBound(), sd->upperBound()),
++				QMAX(sd->lowerBound(), sd->upperBound()), majorTicks, minorTicks, step);
+ 
+ 		if (se->testAttribute(QwtScaleEngine::Inverted))
+ 			div.invert();
+@@ -5411,7 +5411,7 @@
+         map[axisId].setTransformation(axisScaleEngine(axisId)->transformation());
+ 
+         const QwtScaleDiv &scaleDiv = *axisScaleDiv(axisId);
+-        map[axisId].setScaleInterval(scaleDiv.lBound(), scaleDiv.hBound());
++        map[axisId].setScaleInterval(scaleDiv.lowerBound(), scaleDiv.upperBound());
+ 
+         double from, to;
+         if ( axisEnabled(axisId) ){
+Index: ubuntu/qtiplot/src/plot2D/ScaleEngine.cpp
+===================================================================
+--- ubuntu.orig/qtiplot/src/plot2D/ScaleEngine.cpp	2009-11-02 18:43:24.465549029 -0500
++++ ubuntu/qtiplot/src/plot2D/ScaleEngine.cpp	2009-11-02 19:16:42.545549738 -0500
+@@ -263,7 +263,7 @@
+     d_break_width = engine->breakWidth();
+ 	d_break_decoration = engine->hasBreakDecoration();
+ 	setAttributes(engine->attributes());
+-    setMargins(engine->loMargin(), engine->hiMargin());
++    setMargins(engine->lowerMargin(), engine->upperMargin());
+ }
+ 
+ QwtScaleDiv ScaleEngine::divideScale(double x1, double x2, int maxMajSteps,
+@@ -345,7 +345,7 @@
+ 		
+ 		engine->setAttributes(attributes());
+     	engine->setReference(reference());
+-    	engine->setMargins(loMargin(), hiMargin());
++    	engine->setMargins(lowerMargin(), upperMargin());
+ 		engine->autoScale(maxNumSteps, x1, x2, stepSize);
+ 		delete engine;
+ 	} else {
+Index: ubuntu/qtiplot/src/plot2D/Spectrogram.cpp
+===================================================================
+--- ubuntu.orig/qtiplot/src/plot2D/Spectrogram.cpp	2009-11-02 18:43:24.495547511 -0500
++++ ubuntu/qtiplot/src/plot2D/Spectrogram.cpp	2009-11-02 19:16:42.555548551 -0500
+@@ -135,9 +135,9 @@
+ // Next we switch axes scales
+ QwtScaleDiv *scDiv = plot->axisScaleDiv(oldMainAxis);
+ if (axis == QwtPlot::xBottom || axis == QwtPlot::xTop)
+-	plot->setAxisScale(xAxis, scDiv->lBound(), scDiv->hBound());
++	plot->setAxisScale(xAxis, scDiv->lowerBound(), scDiv->upperBound());
+ else if (axis == QwtPlot::yLeft || color_axis == QwtPlot::yRight)
+-	plot->setAxisScale(yAxis, scDiv->lBound(), scDiv->hBound());
++	plot->setAxisScale(yAxis, scDiv->lowerBound(), scDiv->upperBound());
+ 
+ colorAxis = plot->axisWidget(color_axis);
+ plot->setAxisScale(color_axis, data().range().minValue(), data().range().maxValue());
+Index: ubuntu/qtiplot/src/plot2D/dialogs/AxesDialog.cpp
+===================================================================
+--- ubuntu.orig/qtiplot/src/plot2D/dialogs/AxesDialog.cpp	2009-11-02 18:43:24.545547868 -0500
++++ ubuntu/qtiplot/src/plot2D/dialogs/AxesDialog.cpp	2009-11-02 19:16:42.565548761 -0500
+@@ -2611,8 +2611,8 @@
+ 
+     int a = mapToQwtAxis(axis);
+     const QwtScaleDiv *scDiv = d_graph->axisScaleDiv(a);
+-    double start = QMIN(scDiv->lBound(), scDiv->hBound());
+-    double end = QMAX(scDiv->lBound(), scDiv->hBound());
++    double start = QMIN(scDiv->lowerBound(), scDiv->upperBound());
++    double end = QMAX(scDiv->lowerBound(), scDiv->upperBound());
+ 
+     ScaleDraw::ScaleType type = d_graph->axisType(a);
+ 	if (type == ScaleDraw::Date){
+Index: ubuntu/qtiplot/qtiplot.pro
+===================================================================
+--- ubuntu.orig/qtiplot/qtiplot.pro	2009-11-02 19:17:28.905547852 -0500
++++ ubuntu/qtiplot/qtiplot.pro	2009-11-02 19:17:46.166835204 -0500
+@@ -1,6 +1,6 @@
+ # building without muParser doesn't work yet
+ SCRIPTING_LANGS += muParser
+-SCRIPTING_LANGS += Python
++#SCRIPTING_LANGS += Python
+ 
+ # a console displaying output of scripts; particularly useful on Windows
+ # where running QtiPlot from a terminal is inconvenient

=== modified file 'debian/patches/series'
--- debian/patches/series	2008-08-17 19:43:31 +0000
+++ debian/patches/series	2009-11-03 02:10:23 +0000
@@ -1,3 +1,4 @@
+qwt_api_fix.patch
 01_build_system.diff
 02_docbook_stylesheet.diff
 03_fix_qti_wordlist.txt_path.diff

=== modified file 'debian/postinst'
--- debian/postinst	2008-06-12 08:57:17 +0000
+++ debian/postinst	2009-11-03 02:10:23 +0000
@@ -18,10 +18,11 @@
 # the debian-policy package
 
 
+#PYTHON support IS REMOVED FOR UBUNTU KARMIC to fix a FTBFS
 case "$1" in
     configure)
-    py_compilefiles -f /usr/share/qtiplot/qtiplotrc.py
-    py_compilefiles -f /usr/share/qtiplot/qtiUtil.py
+#    py_compilefiles -f /usr/share/qtiplot/qtiplotrc.py
+#    py_compilefiles -f /usr/share/qtiplot/qtiUtil.py
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)