[SCM] cantor packaging branch, master, updated. debian/4%17.08.0-1-12-g7ed5b1d

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 5820eadcd431c0cebe4c8bf3d0b830b20b9d4c35
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 2 10:31:17 2017 +0100

    move backend files to own packages
---
 debian/cantor-backend-lua.install       | 1 +
 debian/cantor-backend-octave.install    | 1 +
 debian/cantor-backend-qalculate.install | 1 +
 debian/cantor-backend-scilab.install    | 1 +
 debian/cantor.install                   | 4 ----
 debian/changelog                        | 2 ++
 debian/control                          | 8 ++++++++
 debian/rules                            | 8 --------
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/cantor-backend-lua.install b/debian/cantor-backend-lua.install
index 46f5595..2934d81 100644
--- a/debian/cantor-backend-lua.install
+++ b/debian/cantor-backend-lua.install
@@ -1,3 +1,4 @@
+etc/xdg/cantor_lua.knsrc
 usr/lib/*/qt5/plugins/cantor/backends/cantor_luabackend.so
 usr/share/config.kcfg/luabackend.kcfg
 usr/share/icons/hicolor/48x48/apps/luabackend.png
diff --git a/debian/cantor-backend-octave.install b/debian/cantor-backend-octave.install
index 369bd95..c0f444e 100644
--- a/debian/cantor-backend-octave.install
+++ b/debian/cantor-backend-octave.install
@@ -1,3 +1,4 @@
+etc/xdg/cantor_octave.knsrc
 usr/lib/*/qt5/plugins/cantor/backends/cantor_octavebackend.so
 usr/share/cantor/octavebackend/cantor_eigenvectors.m
 usr/share/cantor/octavebackend/cantor_plot2d.m
diff --git a/debian/cantor-backend-qalculate.install b/debian/cantor-backend-qalculate.install
index 9501e06..5b02c94 100644
--- a/debian/cantor-backend-qalculate.install
+++ b/debian/cantor-backend-qalculate.install
@@ -1,3 +1,4 @@
+etc/xdg/cantor_qalculate.knsrc
 usr/lib/*/qt5/plugins/cantor/assistants/cantor_qalculateplotassistant.so
 usr/lib/*/qt5/plugins/cantor/backends/cantor_qalculatebackend.so
 usr/share/cantor/cantor_qalculateplotassistant.rc
diff --git a/debian/cantor-backend-scilab.install b/debian/cantor-backend-scilab.install
index acb64fe..7ec23c1 100644
--- a/debian/cantor-backend-scilab.install
+++ b/debian/cantor-backend-scilab.install
@@ -1,3 +1,4 @@
+etc/xdg/cantor_scilab.knsrc
 usr/lib/*/qt5/plugins/cantor/backends/cantor_scilabbackend.so
 usr/share/config.kcfg/scilabbackend.kcfg
 usr/share/icons/hicolor/48x48/apps/scilabbackend.png
diff --git a/debian/cantor.install b/debian/cantor.install
index d5c2832..3439a0d 100644
--- a/debian/cantor.install
+++ b/debian/cantor.install
@@ -1,7 +1,4 @@
 etc/xdg/cantor.knsrc
-etc/xdg/cantor_octave.knsrc
-etc/xdg/cantor_qalculate.knsrc
-etc/xdg/cantor_scilab.knsrc
 usr/bin/cantor
 usr/lib/*/libcantor_config.so
 usr/lib/*/libcantorlibs.so.*
@@ -39,7 +36,6 @@ usr/share/config.kcfg/cantor.kcfg
 usr/share/config.kcfg/cantor_libs.kcfg
 usr/share/doc/HTML/
 usr/share/icons/hicolor/*/apps/cantor.png
-usr/share/icons/hicolor/*/apps/juliabackend.png
 usr/share/kxmlgui5/cantor/cantor_part.rc
 usr/share/kxmlgui5/cantor/cantor_scripteditor.rc
 usr/share/kxmlgui5/cantor/cantor_shell.rc
diff --git a/debian/changelog b/debian/changelog
index 6622a32..8a0caf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ cantor (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * Drop the cantor-dev package, since cantor does not provide stable API/ABI
     for its libraries, and the current packaging does not support well
     dependencies.
+  * Move backend-specific files to their own packages
+    - add proper breaks/replaces
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Dec 2017 10:13:24 +0100
 
diff --git a/debian/control b/debian/control
index 911bddc..8e27f33 100644
--- a/debian/control
+++ b/debian/control
@@ -96,6 +96,8 @@ Package: cantor-backend-lua
 Architecture: amd64 i386
 Section: math
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: cantor (<< 4:17.08.3~)
+Replaces: cantor (<< 4:17.08.3~)
 Description: Lua backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -126,6 +128,8 @@ Package: cantor-backend-octave
 Architecture: any
 Section: math
 Depends: octave, ${misc:Depends}, ${shlibs:Depends}
+Breaks: cantor (<< 4:17.08.3~)
+Replaces: cantor (<< 4:17.08.3~)
 Description: Octave backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -187,6 +191,8 @@ Package: cantor-backend-qalculate
 Architecture: any
 Section: math
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: cantor (<< 4:17.08.3~)
+Replaces: cantor (<< 4:17.08.3~)
 Description: Qalculate! backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
@@ -237,6 +243,8 @@ Package: cantor-backend-scilab
 Architecture: amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x
 Section: math
 Depends: scilab-cli, ${misc:Depends}, ${shlibs:Depends}
+Breaks: cantor (<< 4:17.08.3~)
+Replaces: cantor (<< 4:17.08.3~)
 Description: Scilab backend for Cantor
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
diff --git a/debian/rules b/debian/rules
index a037982..b022de9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,14 +17,6 @@ override_dh_auto_install:
 	rm -rf debian/tmp/usr/include/cantor/
 	find debian/tmp -name '*.so' -type l -delete
 
-override_dh_install:
-	$(overridden_command)
-	# The luajit is available only in amd64 and i386 for now
-	if [ -f debian/tmp/etc/xdg/cantor_lua.knsrc ]; then \
-	    mkdir -p debian/cantor/etc/xdg; \
-	    cp debian/tmp/etc/xdg/cantor_lua.knsrc debian/cantor/etc/xdg; \
-	fi
-
 override_dh_makeshlibs:
 	$(overridden_command) -V
 

-- 
cantor packaging