[SCM] cantor packaging branch, master, updated. debian/15.12.2-1-14-gc3dcef8

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit cde323e41f18b6a7c8f584974976d4bcf19aedda
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 21 01:54:15 2016 +0200

    Refresh patches
---
 debian/patches/acceptable_answers          | 17 +++++++++++++----
 debian/patches/maxima_multiresults         | 17 +++++++++++++----
 debian/patches/maxima_waiting_the_carriage | 17 +++++++++++++----
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/debian/patches/acceptable_answers b/debian/patches/acceptable_answers
index 763dae7..2a7bfc8 100644
--- a/debian/patches/acceptable_answers
+++ b/debian/patches/acceptable_answers
@@ -1,8 +1,17 @@
-Index: cantor/src/backends/maxima/testmaxima.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 01:54:13 +0200
+Subject: acceptable_answers
+
 ===================================================================
---- 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 @@
+---
+ src/backends/maxima/testmaxima.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/backends/maxima/testmaxima.cpp b/src/backends/maxima/testmaxima.cpp
+index 1437ab9..de18059 100644
+--- a/src/backends/maxima/testmaxima.cpp
++++ b/src/backends/maxima/testmaxima.cpp
+@@ -189,7 +189,7 @@ void TestMaxima::testInformationRequest()
      Cantor::Expression* e=session()->evaluateExpression(QLatin1String("integrate(x^n,x)"));
      QVERIFY(e!=0);
      waitForSignal(e, SIGNAL(needsAdditionalInformation(QString)));
diff --git a/debian/patches/maxima_multiresults b/debian/patches/maxima_multiresults
index eb14920..55633ac 100644
--- a/debian/patches/maxima_multiresults
+++ b/debian/patches/maxima_multiresults
@@ -1,8 +1,17 @@
-Index: cantor/src/backends/maxima/maximaexpression.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 01:54:13 +0200
+Subject: maxima_multiresults
+
 ===================================================================
---- 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 @@
+---
+ src/backends/maxima/maximaexpression.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/backends/maxima/maximaexpression.cpp b/src/backends/maxima/maximaexpression.cpp
+index fea621f..807a9cf 100644
+--- a/src/backends/maxima/maximaexpression.cpp
++++ b/src/backends/maxima/maximaexpression.cpp
+@@ -481,7 +481,12 @@ bool MaximaExpression::parseOutput(QString& out)
                  {
                      //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 f0898bb..321b17e 100644
--- a/debian/patches/maxima_waiting_the_carriage
+++ b/debian/patches/maxima_waiting_the_carriage
@@ -1,8 +1,17 @@
-Index: cantor/src/backends/maxima/maximasession.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 01:54:13 +0200
+Subject: maxima_waiting_the_carriage
+
 ===================================================================
---- 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 @@
+---
+ src/backends/maxima/maximasession.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/backends/maxima/maximasession.cpp b/src/backends/maxima/maximasession.cpp
+index 8f12a14..0e00b52 100644
+--- a/src/backends/maxima/maximasession.cpp
++++ b/src/backends/maxima/maximasession.cpp
+@@ -228,6 +228,12 @@ void MaximaSession::readStdOut()
      QString out=m_process->readAllStandardOutput();
  #endif
  

-- 
cantor packaging