[SCM] cantor packaging branch, kubuntu_unstable, updated. ubuntu/4%15.07.90-0ubuntu1-1-g998fe69

Harald Sitter apachelogger-guest at moszumanska.debian.org
Wed Aug 19 08:30:32 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit 998fe69c9c241cc807fe1251980f923fd9a1eec4
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Aug 19 10:30:29 2015 +0200

    update install paths to align with upstream
    
    this does not actually make the build pass because of:
    https://bugs.kde.org/show_bug.cgi?id=351471
---
 debian/cantor-backend-kalgebra.install  |  2 +-
 debian/cantor-backend-lua.install       |  2 +-
 debian/cantor-backend-maxima.install    |  2 +-
 debian/cantor-backend-octave.install    |  2 +-
 debian/cantor-backend-python2.install   |  2 +-
 debian/cantor-backend-python3.install   |  2 +-
 debian/cantor-backend-qalculate.install |  4 ++--
 debian/cantor-backend-r.install         |  2 +-
 debian/cantor-backend-sage.install      |  2 +-
 debian/cantor-backend-scilab.install    |  2 +-
 debian/cantor.install                   | 30 +++++++++++++++---------------
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/cantor-backend-kalgebra.install b/debian/cantor-backend-kalgebra.install
index a9382db..f992f94 100644
--- a/debian/cantor-backend-kalgebra.install
+++ b/debian/cantor-backend-kalgebra.install
@@ -1,4 +1,4 @@
 etc/xdg/cantor_kalgebra.knsrc
-usr/lib/*/qt5/plugins/cantor_kalgebrabackend.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_kalgebrabackend.so
 usr/share/config.kcfg/kalgebrabackend.kcfg
 usr/share/kservices5/cantor/kalgebrabackend.desktop
diff --git a/debian/cantor-backend-lua.install b/debian/cantor-backend-lua.install
index 48fcf1b..fcf97ac 100644
--- a/debian/cantor-backend-lua.install
+++ b/debian/cantor-backend-lua.install
@@ -1,4 +1,4 @@
-usr/lib/*/qt5/plugins/cantor_luabackend.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_luabackend.so
 usr/share/config.kcfg/luabackend.kcfg
 usr/share/icons/hicolor/48x48/apps/luabackend.png
 usr/share/kservices5/cantor/luabackend.desktop
diff --git a/debian/cantor-backend-maxima.install b/debian/cantor-backend-maxima.install
index 15091be..09c2eb3 100644
--- a/debian/cantor-backend-maxima.install
+++ b/debian/cantor-backend-maxima.install
@@ -1,5 +1,5 @@
 etc/xdg/cantor_maxima.knsrc
-usr/lib/*/qt5/plugins/cantor_maximabackend.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_maximabackend.so
 usr/share/cantor/maximabackend/cantor-initmaxima.lisp
 usr/share/cantor/maximabackend/keywords.xml
 usr/share/config.kcfg/maximabackend.kcfg
diff --git a/debian/cantor-backend-octave.install b/debian/cantor-backend-octave.install
index 911fcba..c853ddc 100644
--- a/debian/cantor-backend-octave.install
+++ b/debian/cantor-backend-octave.install
@@ -1,4 +1,4 @@
-usr/lib/*/qt5/plugins/cantor_octavebackend.so
+usr/lib/*/qt5/cantor/backends/plugins/cantor_octavebackend.so
 usr/share/cantor/octavebackend/cantor_eigenvectors.m
 usr/share/cantor/octavebackend/cantor_plot2d.m
 usr/share/cantor/octavebackend/cantor_plot3d.m
diff --git a/debian/cantor-backend-python2.install b/debian/cantor-backend-python2.install
index 942adfc..d475916 100644
--- a/debian/cantor-backend-python2.install
+++ b/debian/cantor-backend-python2.install
@@ -1,4 +1,4 @@
 etc/xdg/cantor_python2.knsrc
-usr/lib/*/qt5/plugins/cantor_python2backend.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_python2backend.so
 usr/share/config.kcfg/python2backend.kcfg
 usr/share/kservices5/cantor/python2backend.desktop
diff --git a/debian/cantor-backend-python3.install b/debian/cantor-backend-python3.install
index 9314198..306e311 100644
--- a/debian/cantor-backend-python3.install
+++ b/debian/cantor-backend-python3.install
@@ -1,5 +1,5 @@
 etc/xdg/cantor_python3.knsrc
 usr/bin/cantor_python3server
-usr/lib/*/qt5/plugins/cantor_python3backend.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_python3backend.so
 usr/share/config.kcfg/python3backend.kcfg
 usr/share/kservices5/cantor/python3backend.desktop
diff --git a/debian/cantor-backend-qalculate.install b/debian/cantor-backend-qalculate.install
index e119a7f..c6749bb 100644
--- a/debian/cantor-backend-qalculate.install
+++ b/debian/cantor-backend-qalculate.install
@@ -1,5 +1,5 @@
-usr/lib/*/qt5/plugins/cantor_qalculatebackend.so
-usr/lib/*/qt5/plugins/cantor_qalculateplotassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_qalculateplotassistant.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_qalculatebackend.so
 usr/share/cantor/cantor_qalculateplotassistant.rc
 usr/share/config.kcfg/qalculatebackend.kcfg
 usr/share/icons/hicolor/48x48/apps/qalculatebackend.png
diff --git a/debian/cantor-backend-r.install b/debian/cantor-backend-r.install
index d579459..52e2d68 100644
--- a/debian/cantor-backend-r.install
+++ b/debian/cantor-backend-r.install
@@ -1,6 +1,6 @@
 etc/xdg/cantor_r.knsrc
 usr/bin/cantor_rserver
-usr/lib/*/qt5/plugins/cantor_rbackend.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_rbackend.so
 usr/share/config.kcfg/rserver.kcfg
 usr/share/icons/hicolor/48x48/apps/rbackend.png
 usr/share/kservices5/cantor/rbackend.desktop
diff --git a/debian/cantor-backend-sage.install b/debian/cantor-backend-sage.install
index d8a6895..4ecc859 100644
--- a/debian/cantor-backend-sage.install
+++ b/debian/cantor-backend-sage.install
@@ -1,5 +1,5 @@
 etc/xdg/cantor_sage.knsrc
-usr/lib/*/qt5/plugins/cantor_sagebackend.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_sagebackend.so
 usr/share/cantor/sagebackend/keywords.xml
 usr/share/config.kcfg/sagebackend.kcfg
 usr/share/icons/hicolor/48x48/apps/sagebackend.png
diff --git a/debian/cantor-backend-scilab.install b/debian/cantor-backend-scilab.install
index 46b779c..330e91c 100644
--- a/debian/cantor-backend-scilab.install
+++ b/debian/cantor-backend-scilab.install
@@ -1,4 +1,4 @@
-usr/lib/*/qt5/plugins/cantor_scilabbackend.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_scilabbackend.so
 usr/share/config.kcfg/scilabbackend.kcfg
 usr/share/icons/hicolor/48x48/apps/scilabbackend.png
 usr/share/kservices5/cantor/scilabbackend.desktop
diff --git a/debian/cantor.install b/debian/cantor.install
index 27d1783..da0f917 100644
--- a/debian/cantor.install
+++ b/debian/cantor.install
@@ -7,21 +7,21 @@ usr/bin/cantor
 usr/lib/*/libcantor_config.so
 usr/lib/*/libcantorlibs.so.0.*
 usr/lib/*/libcantorlibs.so.6
-usr/lib/*/qt5/plugins/cantor_advancedplotassistant.so
-usr/lib/*/qt5/plugins/cantor_creatematrixassistant.so
-usr/lib/*/qt5/plugins/cantor_differentiateassistant.so
-usr/lib/*/qt5/plugins/cantor_eigenvaluesassistant.so
-usr/lib/*/qt5/plugins/cantor_eigenvectorsassistant.so
-usr/lib/*/qt5/plugins/cantor_helppanelplugin.so
-usr/lib/*/qt5/plugins/cantor_importpackageassistant.so
-usr/lib/*/qt5/plugins/cantor_integrateassistant.so
-usr/lib/*/qt5/plugins/cantor_invertmatrixassistant.so
-usr/lib/*/qt5/plugins/cantor_nullbackend.so
-usr/lib/*/qt5/plugins/cantor_plot2dassistant.so
-usr/lib/*/qt5/plugins/cantor_plot3dassistant.so
-usr/lib/*/qt5/plugins/cantor_runscriptassistant.so
-usr/lib/*/qt5/plugins/cantor_solveassistant.so
-usr/lib/*/qt5/plugins/cantor_variablemanagerplugin.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_advancedplotassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_creatematrixassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_differentiateassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_eigenvaluesassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_eigenvectorsassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_importpackageassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_integrateassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_invertmatrixassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_plot2dassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_plot3dassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_runscriptassistant.so
+usr/lib/*/qt5/plugins/cantor/assistants/cantor_solveassistant.so
+usr/lib/*/qt5/plugins/cantor/backends/cantor_nullbackend.so
+usr/lib/*/qt5/plugins/cantor/panels/cantor_helppanelplugin.so
+usr/lib/*/qt5/plugins/cantor/panels/cantor_variablemanagerplugin.so
 usr/lib/*/qt5/plugins/libcantorpart.so
 usr/share/appdata/org.kde.cantor.appdata.xml
 usr/share/applications/org.kde.cantor.desktop

-- 
cantor packaging



More information about the pkg-kde-commits mailing list