[SCM] cantor packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.08.2-0ubuntu1-5-g3bf1d04

[Harald Sitter]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 039b33b729384e8a672500312214a22532129d89
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 15 15:26:10 2015 +0200

    Added kubuntu_by-default-use-octave-cli-rather-than-octave.patch to change the octave binary from 'octave' to 'octave-cli' as octave for unknown reasons decides to load the GUI when we really want the CLI. Also filed for review upstream
---
 debian/changelog                                   |  4 +++
 ...default-use-octave-cli-rather-than-octave.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7782ad7..ce9d5f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ cantor (4:15.08.2-0ubuntu2) UNRELEASED; urgency=medium
   * autopkgtest depends on python3-numpy to pass the python3 tests
   * Made octave backend depend on ghostscript as some of its scripts use the
     print instruction which requires it
+  * Added kubuntu_by-default-use-octave-cli-rather-than-octave.patch to change
+    the octave binary from 'octave' to 'octave-cli' as octave for unknown
+    reasons decides to load the GUI when we really want the CLI. Also filed
+    for review upstream
 
  -- Harald Sitter <sitter at kde.org>  Thu, 15 Oct 2015 12:42:05 +0200
 
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
new file mode 100644
index 0000000..7b42957
--- /dev/null
+++ b/debian/patches/kubuntu_by-default-use-octave-cli-rather-than-octave.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 0000000..3502f2c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_by-default-use-octave-cli-rather-than-octave.patch

-- 
cantor packaging