[SCM] cantor packaging branch, master, updated. debian/4.13.3-1-5-g323d288

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/cantor.git;a=commitdiff;h=09f68d0

The following commit has been merged in the master branch:
commit 09f68d033cca75c5a4f8f226426412cfa9565e9e
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Aug 12 15:59:56 2014 +0000

    New patch: maxima_multiresults
---
 debian/changelog                   |  1 +
 debian/patches/maxima_multiresults | 18 ++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index caf339c..8e6bb5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cantor (4:4.13.3-2) UNRELEASED; urgency=medium
 
   * Remove patch: testmaxima_inforeq_test, maxima honours the prompts
     again.
+  * New patch: maxima_multiresults
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 12 Aug 2014 12:20:52 +0000
 
diff --git a/debian/patches/maxima_multiresults b/debian/patches/maxima_multiresults
new file mode 100644
index 0000000..2441397
--- /dev/null
+++ b/debian/patches/maxima_multiresults
@@ -0,0 +1,18 @@
+Index: cantor/src/backends/maxima/maximaexpression.cpp
+===================================================================
+--- cantor.orig/src/backends/maxima/maximaexpression.cpp	2014-08-12 15:58:36.953986588 +0000
++++ cantor/src/backends/maxima/maximaexpression.cpp	2014-08-12 15:58:56.606499738 +0000
+@@ -485,7 +485,12 @@
+                 {
+                     //if we got an error message, but also a result, lets just+
+                     //assume that it was just a warning, as obviously something worked
+-                    if(errorMessage().isEmpty()||result!=0)
++                    if(errorMessage().isEmpty() && idx2 < out.size()) {
++                        // just a prompt, and there are more results ahead
++                        idx = idx2;
++                        continue;
++                    }
++                    else if(errorMessage().isEmpty()||result!=0)
+                     {
+                         setResult(result);
+                         setStatus(Cantor::Expression::Done);
diff --git a/debian/patches/series b/debian/patches/series
index 4fb493a..6e82192 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 octave_force_use_of_gnuplot
+maxima_multiresults

-- 
cantor packaging