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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c17a213c93de6b066cfb2722b8837eaa908a2f25
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 11 23:15:04 2016 +0200

    fix installation of some filters
---
 debian/calligra-data.install      | 2 --
 debian/calligra-libs.install      | 3 ---
 debian/calligrastage-data.install | 1 +
 debian/calligrastage.install      | 1 +
 debian/calligrawords.install      | 3 +++
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 901da4a..7b261f6 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -288,8 +288,6 @@ usr/share/kde4/apps/musicshape/fonts/Emmentaler-14.ttf
 usr/share/kde4/services/calligra/calligra_device_spacenavigator.desktop
 usr/share/kde4/services/calligra/calligra_docker_defaults.desktop
 usr/share/kde4/services/calligra/calligra_docker_textdocumentinspection.desktop
-usr/share/kde4/services/calligra/calligra_filter_key2odp.desktop
-usr/share/kde4/services/calligra/calligra_filter_odt2docx.desktop
 usr/share/kde4/services/calligra/calligra_shape_artistictext.desktop
 usr/share/kde4/services/calligra/calligra_shape_chart.desktop
 usr/share/kde4/services/calligra/calligra_shape_formular.desktop
diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index bd85315..6dbe08c 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -3,9 +3,6 @@ usr/bin/calligraconverter
 usr/bin/kexi_sqlite3_dump
 usr/lib/kde4/calligra_device_spacenavigator.so
 usr/lib/kde4/calligra_docker_defaults.so
-usr/lib/kde4/calligra_filter_key2odp.so
-usr/lib/kde4/calligra_filter_odt2docx.so
-usr/lib/kde4/calligra_filter_odt2wiki.so
 usr/lib/kde4/calligra_shape_artistictext.so
 usr/lib/kde4/calligra_shape_chart.so
 usr/lib/kde4/calligra_shape_formular.so
diff --git a/debian/calligrastage-data.install b/debian/calligrastage-data.install
index 2132439..81a628c 100644
--- a/debian/calligrastage-data.install
+++ b/debian/calligrastage-data.install
@@ -8,6 +8,7 @@ usr/share/icons/hicolor/scalable/apps/calligrastage.svgz
 usr/share/kde4/apps/stage
 usr/share/kde4/config/stagerc
 usr/share/kde4/services/ServiceMenus/calligra/stage_print.desktop
+usr/share/kde4/services/calligra/calligra_filter_key2odp.desktop
 usr/share/kde4/services/calligra/calligra_filter_kpr2odp.desktop
 usr/share/kde4/services/calligra/calligra_filter_ppt2odp.desktop
 usr/share/kde4/services/calligra/calligra_filter_pptx2odp.desktop
diff --git a/debian/calligrastage.install b/debian/calligrastage.install
index 979430f..47898ac 100644
--- a/debian/calligrastage.install
+++ b/debian/calligrastage.install
@@ -1,4 +1,5 @@
 usr/bin/calligrastage
+usr/lib/kde4/calligra_filter_key2odp.so
 usr/lib/kde4/calligra_filter_kpr2odp.so
 usr/lib/kde4/calligra_filter_ppt2odp.so
 usr/lib/kde4/calligra_filter_pptx2odp.so
diff --git a/debian/calligrawords.install b/debian/calligrawords.install
index c552272..c4ff734 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -4,9 +4,11 @@ usr/lib/kde4/calligra_filter_ascii2words.so
 usr/lib/kde4/calligra_filter_doc2odt.so
 usr/lib/kde4/calligra_filter_docx2odt.so
 usr/lib/kde4/calligra_filter_odt2ascii.so
+usr/lib/kde4/calligra_filter_odt2docx.so
 usr/lib/kde4/calligra_filter_odt2epub2.so
 usr/lib/kde4/calligra_filter_odt2html.so
 usr/lib/kde4/calligra_filter_odt2mobi.so
+usr/lib/kde4/calligra_filter_odt2wiki.so
 usr/lib/kde4/calligra_filter_rtf2odt.so
 usr/lib/kde4/calligra_filter_wpd2odt.so
 usr/lib/kde4/wordspart.so
@@ -25,6 +27,7 @@ usr/share/kde4/services/calligra/calligra_filter_ascii2words.desktop
 usr/share/kde4/services/calligra/calligra_filter_doc2odt.desktop
 usr/share/kde4/services/calligra/calligra_filter_docx2odt.desktop
 usr/share/kde4/services/calligra/calligra_filter_odt2ascii.desktop
+usr/share/kde4/services/calligra/calligra_filter_odt2docx.desktop
 usr/share/kde4/services/calligra/calligra_filter_odt2epub2.desktop
 usr/share/kde4/services/calligra/calligra_filter_odt2html.desktop
 usr/share/kde4/services/calligra/calligra_filter_odt2mobi.desktop

-- 
Calligra suite packaging