[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=c7c7f80

The following commit has been merged in the master branch:
commit c7c7f809b6627d95cfb87ca3cdc19f389f86e6c8
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Aug 12 21:21:23 2014 +0000

    New patches acceptable_answers and maxima_waiting_the_carriage
---
 debian/changelog                           |  2 ++
 debian/patches/acceptable_answers          | 13 +++++++++++++
 debian/patches/maxima_waiting_the_carriage | 17 +++++++++++++++++
 debian/patches/series                      |  2 ++
 4 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e6bb5a..8b601da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ cantor (4:4.13.3-2) UNRELEASED; urgency=medium
   * Remove patch: testmaxima_inforeq_test, maxima honours the prompts
     again.
   * New patch: maxima_multiresults
+  * New patch: acceptable_answers
+  * New patch: maxima_waiting_the_carriage
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 12 Aug 2014 12:20:52 +0000
 
diff --git a/debian/patches/acceptable_answers b/debian/patches/acceptable_answers
new file mode 100644
index 0000000..93a4cca
--- /dev/null
+++ b/debian/patches/acceptable_answers
@@ -0,0 +1,13 @@
+Index: cantor/src/backends/maxima/testmaxima.cpp
+===================================================================
+--- cantor.orig/src/backends/maxima/testmaxima.cpp	2014-08-12 18:19:56.406941240 +0000
++++ cantor/src/backends/maxima/testmaxima.cpp	2014-08-12 18:58:47.598491492 +0000
+@@ -190,7 +190,7 @@
+     Cantor::Expression* e=session()->evaluateExpression("integrate(x^n,x)");
+     QVERIFY(e!=0);
+     waitForSignal(e, SIGNAL(needsAdditionalInformation(QString)));
+-    e->addInformation("nonzero;");
++    e->addInformation("no;");
+ 
+     waitForSignal(e, SIGNAL(statusChanged(Cantor::Expression::Status)));
+     QVERIFY(e->result()!=0);
diff --git a/debian/patches/maxima_waiting_the_carriage b/debian/patches/maxima_waiting_the_carriage
new file mode 100644
index 0000000..4dd0d65
--- /dev/null
+++ b/debian/patches/maxima_waiting_the_carriage
@@ -0,0 +1,17 @@
+Index: cantor/src/backends/maxima/maximasession.cpp
+===================================================================
+--- cantor.orig/src/backends/maxima/maximasession.cpp	2014-08-12 18:19:56.406941240 +0000
++++ cantor/src/backends/maxima/maximasession.cpp	2014-08-12 21:17:27.123704399 +0000
+@@ -222,6 +222,12 @@
+     QString out=m_process->readAllStandardOutput();
+ #endif
+ 
++    // maxima sends a 
 when finishes processing it's input.
++    // wait for it, so we can process the multi line results.
++    if (!out.endsWith('
') ) {
++        m_cache+=out;
++        return;
++    }
+     out.remove('
');
+ 
+     kDebug()<<"out: "<<out;
diff --git a/debian/patches/series b/debian/patches/series
index 6e82192..82d8397 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 octave_force_use_of_gnuplot
 maxima_multiresults
+acceptable_answers
+maxima_waiting_the_carriage

-- 
cantor packaging