[SCM] cantor packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.08.0-0ubuntu1-2-g97f4607

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 97f46075aaa0191c08bc41c9df86474019048dba
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Aug 31 22:44:03 2015 +0100

     Fix packaging for architectures without luajit. Changed dropped from 4:15.07.90-0ubuntu1.
    
    * Fix packaging for architectures without luajit.
      Changed dropped from 4:15.07.90-0ubuntu1.
    * No-change rebuild against libqalculate5v5.
    * Fix packaging for architectures without luajit.
    * Fix build failure for R versions >= 3.2.
---
 debian/cantor.install                            |  1 -
 debian/cantor.lintian-overrides                  |  3 +--
 debian/changelog                                 | 25 ++++++++++++++++++++++++
 debian/control                                   |  2 +-
 debian/libcantor-pythonbackend.lintian-overrides |  2 +-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/debian/cantor.install b/debian/cantor.install
index 27d1783..3a0aeda 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/cantor.lintian-overrides b/debian/cantor.lintian-overrides
index c305646..7ed6c91 100644
--- a/debian/cantor.lintian-overrides
+++ b/debian/cantor.lintian-overrides
@@ -1,3 +1,2 @@
-cantor: package-name-doesnt-match-sonames libcantor-config libcantorlibs6
+cantor: package-name-doesnt-match-sonames libcantor-config libcantorlibs1
 cantor: shlib-without-versioned-soname usr/lib/*/libcantor_config.so libcantor_config.so
-cantor: dev-pkg-without-shlib-symlink usr/lib/*/libcantor_config.so usr/lib/*/libcantor_config.so
diff --git a/debian/changelog b/debian/changelog
index d7d58ef..02cfe00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ cantor (4:15.08.0-0ubuntu1) wily; urgency=medium
 
  -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 16:55:17 +0100
 
+cantor (4:15.07.90-0ubuntu2) wily; urgency=medium
+
+  * Fix packaging for architectures without luajit.
+    Changed dropped from 4:15.07.90-0ubuntu1.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 31 Aug 2015 20:56:47 +0200
+
 cantor (4:15.07.90-0ubuntu1) wily; urgency=medium
 
   * New upstream release
@@ -11,6 +18,24 @@ cantor (4:15.07.90-0ubuntu1) wily; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 08:57:01 +0100
 
+cantor (4:15.04.2-0ubuntu4) wily; urgency=medium
+
+  * No-change rebuild against libqalculate5v5.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 11 Aug 2015 15:27:58 +0200
+
+cantor (4:15.04.2-0ubuntu3) wily; urgency=medium
+
+  * Fix packaging for architectures without luajit.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 10 Jun 2015 13:26:16 +0200
+
+cantor (4:15.04.2-0ubuntu2) wily; urgency=medium
+
+  * Fix build failure for R versions >= 3.2.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 10 Jun 2015 12:42:23 +0200
+
 cantor (4:15.04.2-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
diff --git a/debian/control b/debian/control
index cb3274a..24e8bea 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Build-Depends: cmake,
                libkf5widgetsaddons-dev,
                libkf5windowsystem-dev,
                libkf5xmlgui-dev,
-               libluajit-5.1-dev,
+               libluajit-5.1-dev  [i386 amd64],
                libqalculate-dev,
                libqt5svg5-dev,
                libqt5xmlpatterns5-dev,
diff --git a/debian/libcantor-pythonbackend.lintian-overrides b/debian/libcantor-pythonbackend.lintian-overrides
index e1cc737..78a90d4 100644
--- a/debian/libcantor-pythonbackend.lintian-overrides
+++ b/debian/libcantor-pythonbackend.lintian-overrides
@@ -1,2 +1,2 @@
-libcantor-pythonbackend: shlib-without-versioned-soname usr/lib/*/libcantor_pythonbackend.so libcantor_pythonbackend.so
+libcantor-pythonbackend: shlib-without-versioned-soname usr/lib/*/libcantor_pythonbackend.so
 libcantor-pythonbackend: postinst-must-call-ldconfig usr/lib/*/libcantor_pythonbackend.so

-- 
cantor packaging