[SCM] cantor packaging branch, master, updated. debian/15.08.3-1-12-gca46cac

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a1a1b5b665a512f9f5e82c384b70a051bc99d79c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 12 09:12:51 2016 +0100

    Install cantor_lua.knsrc only if present.
---
 debian/cantor.install | 1 -
 debian/changelog      | 2 +-
 debian/rules          | 8 ++++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/cantor.install b/debian/cantor.install
index 00151ce..d0adede 100644
--- a/debian/cantor.install
+++ b/debian/cantor.install
@@ -1,5 +1,4 @@
 etc/xdg/cantor.knsrc
-etc/xdg/cantor_lua.knsrc
 etc/xdg/cantor_octave.knsrc
 etc/xdg/cantor_qalculate.knsrc
 etc/xdg/cantor_scilab.knsrc
diff --git a/debian/changelog b/debian/changelog
index 94a2b82..7ef68ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 cantor (4:15.12.1-2~) UNRELEASED; urgency=medium
 
-  * 
+  * Install cantor_lua.knsrc only if present.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Feb 2016 09:11:51 +0100
 
diff --git a/debian/rules b/debian/rules
index 9f7d113..6917ab8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,14 @@ override_dh_auto_test:
 	# Disable dh_auto_test at build time
 	:
 
+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