[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-68-g82d76f5

[Dmitry Smirnov]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=82d76f5

The following commit has been merged in the master branch:
commit 82d76f5982acfd03e6c9080bb409c5b1f4336238
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sun Oct 18 21:28:13 2015 +1100

    resolve conflict:
    
     "kexi" and "calligrasheets" both install "calligra_filter_csv2sheets.desktop"...
---
 debian/kexi.install | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/kexi.install b/debian/kexi.install
index 5cbc1e4..e862b38 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -26,7 +26,6 @@ usr/lib/libkexiutils.so.1*
 usr/lib/libkformdesigner.so.1*
 usr/share/appdata/kexi.appdata.xml
 usr/share/applications/kde4/kexi.desktop
-usr/share/kde4/services/calligra
 usr/share/kde4/services/calligra/keximigrate_mdb.desktop
 usr/share/kde4/services/calligra/keximigrate_txt.desktop
 usr/share/kde4/services/calligra/kformdesigner_containers.desktop

-- 
Calligra suite packaging