[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=cac8c94

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

    drop cantor-dev
---
 debian/cantor-dev.install |  2 --
 debian/changelog          |  3 +++
 debian/control            | 25 -------------------------
 debian/rules              |  6 ++++++
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/debian/cantor-dev.install b/debian/cantor-dev.install
deleted file mode 100644
index 337db22..0000000
--- a/debian/cantor-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/cantor/
-usr/lib/*/libcantorlibs.so
diff --git a/debian/changelog b/debian/changelog
index 007b612..6622a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ cantor (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * Simplify watch file, and switch it to https.
   * Fix typo in an old changelog entry.
   * Remove debian/not-installed, as it is no more useful now.
+  * 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.
 
  -- 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 e30b484..911bddc 100644
--- a/debian/control
+++ b/debian/control
@@ -248,31 +248,6 @@ Description: Scilab backend for Cantor
  .
  This package is part of the KDE education module.
 
-Package: cantor-dev
-Architecture: any
-Section: libdevel
-Depends: cantor (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: interface for mathematical applications - development files
- Cantor is an application to allow you to you use your favorite mathematical
- applications from within an elegant worksheet interface. It provides dialogs
- to assist with common tasks and allows you to share your worksheets
- with others.
- .
- Cantor supports various mathematical applications as backends (provided in
- external packages):
-  * Maxima Computer Algebra System (cantor-backend-maxima)
-  * R Project for Statistical Computing (cantor-backend-r)
-  * Sage Mathematics Software (cantor-backend-sage)
-  * Octave (cantor-backend-octave)
-  * Python (cantor-backend-python2 and cantor-backend-python3)
-  * Scilab (cantor-backend-scilab)
-  * Qalculate! (cantor-backend-qalculate)
-  * Lua (cantor-backend-lua)
- .
- This package is part of the KDE education module.
- .
- This package contains development files for cantor.
-
 Package: libcantor-pythonbackend
 Architecture: any
 Section: math
diff --git a/debian/rules b/debian/rules
index 8dffd76..a037982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,12 @@ override_dh_auto_test:
 	# Disable dh_auto_test at build time
 	:
 
+override_dh_auto_install:
+	$(overridden_command)
+	# do not ship the development stuff for now
+	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

-- 
cantor packaging