[SCM] cantor packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.0-0ubuntu1-14-gdb7842c

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit db7842c6a82abdfe5bddc64ad2c588b805d5b0c0
Merge: d947ba9494974d057002b0ed7a7103fcb77226a3 537246deffe344cccafe5f4190bdb3059a40412e
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Sep 9 17:29:15 2015 +0200

    Merge branch 'kubuntu_stable' into kubuntu_unstable
    
    Conflicts:
    	debian/cantor-backend-lua.install

 debian/cantor-backend-lua.install                | 1 +
 debian/cantor.lintian-overrides                  | 3 ++-
 debian/control                                   | 2 ++
 debian/libcantor-pythonbackend.lintian-overrides | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --cc debian/cantor-backend-lua.install
index 46f5595,d855d59..2934d81
--- a/debian/cantor-backend-lua.install
+++ b/debian/cantor-backend-lua.install
@@@ -1,3 -1,5 +1,4 @@@
+ etc/xdg/cantor_lua.knsrc
 -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

-- 
cantor packaging