[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=63e73a8

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

    Remove patch: testmaxima_inforeq_test, maxima honours the prompts again.
---
 debian/changelog                       |  3 ++-
 debian/patches/series                  |  1 -
 debian/patches/testmaxima_inforeq_test | 33 ---------------------------------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13ed08c..caf339c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cantor (4:4.13.3-2) UNRELEASED; urgency=medium
 
-  * 
+  * Remove patch: testmaxima_inforeq_test, maxima honours the prompts
+    again.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 12 Aug 2014 12:20:52 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index 8431829..4fb493a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 octave_force_use_of_gnuplot
-testmaxima_inforeq_test
diff --git a/debian/patches/testmaxima_inforeq_test b/debian/patches/testmaxima_inforeq_test
deleted file mode 100644
index 9b3cd86..0000000
--- a/debian/patches/testmaxima_inforeq_test
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cantor/src/backends/maxima/testmaxima.h
-===================================================================
---- cantor.orig/src/backends/maxima/testmaxima.h	2014-01-30 15:27:56.309485431 +0100
-+++ cantor/src/backends/maxima/testmaxima.h	2014-01-31 10:52:09.650102768 +0100
-@@ -54,7 +54,7 @@
- 
-     void testInvalidAssignment();
- 
--    void testInformationRequest();
-+    // void testInformationRequest();
- 
-     void testSyntaxHelp();
- 
-Index: cantor/src/backends/maxima/testmaxima.cpp
-===================================================================
---- cantor.orig/src/backends/maxima/testmaxima.cpp	2014-01-30 15:27:56.309485431 +0100
-+++ cantor/src/backends/maxima/testmaxima.cpp	2014-01-31 11:46:45.525613925 +0100
-@@ -185,6 +185,7 @@
-     QCOMPARE(cleanOutput(e2->result()->toHtml()), QString("4"));
- }
- 
-+/*
- void TestMaxima::testInformationRequest()
- {
-     Cantor::Expression* e=session()->evaluateExpression("integrate(x^n,x)");
-@@ -197,6 +198,7 @@
- 
-     QCOMPARE(cleanOutput(e->result()->toHtml()), QString("x^(n+1)/(n+1)"));
- }
-+*/
- 
- void TestMaxima::testSyntaxHelp()
- {

-- 
cantor packaging