[SCM] cantor packaging branch, kubuntu_wily_backports, updated. ubuntu/15.08.2-0ubuntu2-2-gb957d3c

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit b957d3cb38c4888fa2a64c59d33b759880ae7fec
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Nov 10 21:09:31 2015 -0800

    Remove upstream applied  kubuntu_by-default-use-octave-cli-rather-than-octave.patch
---
 debian/changelog                                   |  2 ++
 ...default-use-octave-cli-rather-than-octave.patch | 31 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f1819b..976ffe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 cantor (4:15.08.3-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream bugfix release
+  * Remove upstream applied 
+    kubuntu_by-default-use-octave-cli-rather-than-octave.patch 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Nov 2015 15:22:37 -0800
 
diff --git a/debian/patches/kubuntu_by-default-use-octave-cli-rather-than-octave.patch b/debian/patches/kubuntu_by-default-use-octave-cli-rather-than-octave.patch
deleted file mode 100644
index 7b42957..0000000
--- a/debian/patches/kubuntu_by-default-use-octave-cli-rather-than-octave.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: by default use octave-cli rather than octave
- 'octave' can randomly decide to load its GUI rather than the CLI depending
- on environmental factors. We cannot stdin control the GUI, so there is no
- point in introducing this instability but instead call octave-cli directly
- since it is the only possibly operation mode we support.
-
- (NB there also is a --no-gui switch which for me doesn't appear to work for
-  some reason, so octave-cli directly seems the most reliable approach to
-  this)
-Author: Harald Sitter <sitter at kde.org>
-Origin: vendor
-Forwarded: https://git.reviewboard.kde.org/r/125646/
-Reviewed-by: Rohan Garg <rohan at kde.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/src/backends/octave/octavebackend.kcfg b/src/backends/octave/octavebackend.kcfg
-index 56ba6ce..16c9dc7 100644
---- a/src/backends/octave/octavebackend.kcfg
-+++ b/src/backends/octave/octavebackend.kcfg
-@@ -8,7 +8,7 @@
-   <group name="OctaveBackend">
-     <entry name="Path" type="Url">
-       <label>Path to the Octave executable</label>
--      <default code="true">QUrl::fromLocalFile(KStandardDirs::findExe( QLatin1String("octave") ))</default>
-+      <default code="true">QUrl::fromLocalFile(KStandardDirs::findExe( QLatin1String("octave-cli") ))</default>
-     </entry>
-     <entry name="integratePlots" type="Bool">
-       <label>Integrate Plots into the Worksheet</label>
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3502f2c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_by-default-use-octave-cli-rather-than-octave.patch

-- 
cantor packaging