[SCM] cantor packaging branch, kubuntu_unstable, updated. ubuntu/15.08.2-0ubuntu2-19-gc8455fe

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit c8455fe819ebf69a6d6c22c8a61f08864d4f85b1
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 15 15:38:22 2015 +0200

    refresh patch against master
---
 .../kubuntu_by-default-use-octave-cli-rather-than-octave.patch      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
index 7b42957..4ef0933 100644
--- 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
@@ -14,15 +14,15 @@ 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
+index be3f4f4..286910b 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>
+-      <default code="true">QUrl::fromLocalFile(QStandardPaths::findExecutable( QLatin1String("octave") ))</default>
++      <default code="true">QUrl::fromLocalFile(QStandardPaths::findExecutable( QLatin1String("octave-cli") ))</default>
      </entry>
      <entry name="integratePlots" type="Bool">
        <label>Integrate Plots into the Worksheet</label>

-- 
cantor packaging