[SCM] cantor packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-30-g70354fb

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit cbd6c19fb8bf434be7ba668a21d2c120c2e23ac7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Sep 6 00:35:17 2015 +0200

    Refresh patches.
---
 debian/changelog                           |  1 +
 debian/patches/acceptable_answers          | 12 ++++++------
 debian/patches/maxima_multiresults         |  6 +++---
 debian/patches/maxima_waiting_the_carriage | 10 +++++-----
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75bd56c..4389492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ cantor (4:15.08.0-1~) UNRELEASED; urgency=medium
   * New upstream release (15.04.3).
   * New upstream release (15.08.0).
   * Update build dependencies.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 05 Sep 2015 22:18:46 +0200
 
diff --git a/debian/patches/acceptable_answers b/debian/patches/acceptable_answers
index 93a4cca..763dae7 100644
--- a/debian/patches/acceptable_answers
+++ b/debian/patches/acceptable_answers
@@ -1,13 +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)");
+--- cantor.orig/src/backends/maxima/testmaxima.cpp	2015-09-06 00:30:38.842086100 +0200
++++ cantor/src/backends/maxima/testmaxima.cpp	2015-09-06 00:31:10.724800767 +0200
+@@ -189,7 +189,7 @@
+     Cantor::Expression* e=session()->evaluateExpression(QLatin1String("integrate(x^n,x)"));
      QVERIFY(e!=0);
      waitForSignal(e, SIGNAL(needsAdditionalInformation(QString)));
--    e->addInformation("nonzero;");
-+    e->addInformation("no;");
+-    e->addInformation(QLatin1String("nonzero;"));
++    e->addInformation(QLatin1String("no;"));
  
      waitForSignal(e, SIGNAL(statusChanged(Cantor::Expression::Status)));
      QVERIFY(e->result()!=0);
diff --git a/debian/patches/maxima_multiresults b/debian/patches/maxima_multiresults
index 2441397..eb14920 100644
--- a/debian/patches/maxima_multiresults
+++ b/debian/patches/maxima_multiresults
@@ -1,8 +1,8 @@
 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 @@
+--- cantor.orig/src/backends/maxima/maximaexpression.cpp	2015-09-06 00:28:01.256439764 +0200
++++ cantor/src/backends/maxima/maximaexpression.cpp	2015-09-06 00:28:01.236440571 +0200
+@@ -481,7 +481,12 @@
                  {
                      //if we got an error message, but also a result, lets just+
                      //assume that it was just a warning, as obviously something worked
diff --git a/debian/patches/maxima_waiting_the_carriage b/debian/patches/maxima_waiting_the_carriage
index 782560c..f0898bb 100644
--- a/debian/patches/maxima_waiting_the_carriage
+++ b/debian/patches/maxima_waiting_the_carriage
@@ -1,17 +1,17 @@
 Index: cantor/src/backends/maxima/maximasession.cpp
 ===================================================================
---- cantor.orig/src/backends/maxima/maximasession.cpp	2014-08-22 21:42:56.128913156 +0200
-+++ cantor/src/backends/maxima/maximasession.cpp	2014-08-22 21:42:56.128913156 +0200
+--- cantor.orig/src/backends/maxima/maximasession.cpp	2015-09-06 00:34:06.605711068 +0200
++++ cantor/src/backends/maxima/maximasession.cpp	2015-09-06 00:34:37.368471173 +0200
 @@ -228,6 +228,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('
') ) {
++    if (!out.endsWith(QLatin1Char('
')) ) {
 +        m_cache+=out;
 +        return;
 +    }
-     out.remove('
');
+     out.remove(QLatin1Char('
'));
  
-     kDebug()<<"out: "<<out;
+     qDebug()<<"out: "<<out;

-- 
cantor packaging