[SCM] cantor packaging branch, master, updated. debian/4.14.1-1-2-g2971539

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 2971539e582beb1be91b116296f94ece3b72dabb
Author: Pino Toscano <pino at debian.org>
Date:   Sun Oct 19 11:22:41 2014 +0200

    octave_force_use_of_gnuplot: drop, applied upstream
---
 debian/changelog                           |  2 ++
 debian/patches/octave_force_use_of_gnuplot | 13 -------------
 debian/patches/series                      |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5711979..df0adaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ cantor (4:4.14.2-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update patches:
+    - octave_force_use_of_gnuplot: drop, applied upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 19 Oct 2014 11:20:21 +0200
 
diff --git a/debian/patches/octave_force_use_of_gnuplot b/debian/patches/octave_force_use_of_gnuplot
deleted file mode 100644
index 61ffd10..0000000
--- a/debian/patches/octave_force_use_of_gnuplot
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cantor/src/backends/octave/octavesession.cpp
-===================================================================
---- cantor.orig/src/backends/octave/octavesession.cpp	2014-05-19 14:59:17.167265414 +0200
-+++ cantor/src/backends/octave/octavesession.cpp	2014-05-19 14:59:17.163265572 +0200
-@@ -72,6 +72,8 @@
-         args << "--eval";
-         args << "graphics_toolkit gnuplot;";
-         args << "--eval";
-+        args << "graphics_toolkit gnuplot;";
-+        args << "--eval";
-         args << "set (0, \"defaultfigurevisible\",\"off\");";
-     }
-     else
diff --git a/debian/patches/series b/debian/patches/series
index 82d8397..0364b8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-octave_force_use_of_gnuplot
 maxima_multiresults
 acceptable_answers
 maxima_waiting_the_carriage

-- 
cantor packaging