[SCM] cantor packaging branch, kubuntu_unstable, updated. debian/4.14.2-2-15-gbb8f4f8

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit bb8f4f8b181bd5954228ce6506802068c28bc8a2
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 10 14:33:38 2015 +0100

    ditch the patches
---
 debian/patches/acceptable_answers          | 13 -------------
 debian/patches/maxima_multiresults         | 18 ------------------
 debian/patches/maxima_waiting_the_carriage | 17 -----------------
 debian/patches/series                      |  3 ---
 4 files changed, 51 deletions(-)

diff --git a/debian/patches/acceptable_answers b/debian/patches/acceptable_answers
deleted file mode 100644
index 93a4cca..0000000
--- a/debian/patches/acceptable_answers
+++ /dev/null
@@ -1,13 +0,0 @@
-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_multiresults b/debian/patches/maxima_multiresults
deleted file mode 100644
index 2441397..0000000
--- a/debian/patches/maxima_multiresults
+++ /dev/null
@@ -1,18 +0,0 @@
-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/maxima_waiting_the_carriage b/debian/patches/maxima_waiting_the_carriage
deleted file mode 100644
index 782560c..0000000
--- a/debian/patches/maxima_waiting_the_carriage
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-@@ -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('
') ) {
-+        m_cache+=out;
-+        return;
-+    }
-     out.remove('
');
- 
-     kDebug()<<"out: "<<out;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0364b8a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-maxima_multiresults
-acceptable_answers
-maxima_waiting_the_carriage

-- 
cantor packaging