[SCM] Packaging for qtiplot branch, master, updated. debian/0.9.8.9-3-10-g670abaa

[Scott Howard]

The following commit has been merged in the master branch:
commit 670abaab0488e16b593e1c0a237b65090bca1aa2
Author: Scott Howard <showard314 at gmail.com>
Date:   Sat Jun 8 02:27:04 2013 -0400

    Fix bug were table columns could not be set (Closes: #707736)

diff --git a/debian/changelog b/debian/changelog
index 75af1bc..6c3bcbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtiplot (0.9.8.9-6) unstable; urgency=low
+
+  * Fix bug were table columns could not be set (Closes: #707736)
+    - debian/patches/set_col_values.patch
+
+ -- Scott Howard <showard at debian.org>  Sat, 08 Jun 2013 02:21:57 -0400
+
 qtiplot (0.9.8.9-5) unstable; urgency=low
 
   * Team upload, QA upload.
diff --git a/debian/patches/series b/debian/patches/series
index ebcc52e..4f992ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ crasher_without_internet.patch
 glu_include.patch
 minizip.patch
 adopt_to_alglib3.patch
+set_col_values.patch
diff --git a/debian/patches/set_col_values.patch b/debian/patches/set_col_values.patch
new file mode 100644
index 0000000..5afe43e
--- /dev/null
+++ b/debian/patches/set_col_values.patch
@@ -0,0 +1,18 @@
+Description: if you don't initialize the "i" variable, or initialize it to 0.0
+ qtiplot won't let you set the column values using muparser.
+Author: Scott Howard <showard at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707736
+
+Index: qtiplot/qtiplot/src/table/Table.cpp
+===================================================================
+--- qtiplot.orig/qtiplot/src/table/Table.cpp	2013-06-08 02:06:35.550201324 -0400
++++ qtiplot/qtiplot/src/table/Table.cpp	2013-06-08 02:08:30.026204044 -0400
+@@ -564,7 +564,7 @@
+ 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+ 
+     muParserScript *mup = new muParserScript(scriptEnv, cmd, this,  QString("<%1>").arg(colName(col)));
+-    double *r = mup->defineVariable("i");
++    double *r = mup->defineVariable("i",startRow + 1.0);
+     mup->defineVariable("j", (double)col);
+     mup->defineVariable("sr", startRow + 1.0);
+     mup->defineVariable("er", endRow + 1.0);
diff --git a/debian/rules b/debian/rules
index 7b189fe..c72197c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,11 @@ override_dh_auto_configure:
 override_dh_auto_install:
 
 override_dh_auto_build-arch:
-	$(MAKE)
+	$(MAKE) -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 
 override_dh_auto_build-indep:
 	doxygen Doxyfile
-	$(MAKE) -C manual -f Makefile all
+	$(MAKE) -C manual -f Makefile all j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 
 overrid_dh_auto_clean:
 	dh_auto_clean

-- 
Packaging for qtiplot