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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 67352de9941e9dfc1b92afb83f48a0385e5f1afb
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 11 20:51:29 2016 +0200

    more install updates
    
    appdata files must go with the executable, not in the -data package
---
 debian/calligraflow-data.install  | 1 -
 debian/calligraflow.install       | 1 +
 debian/calligrastage-data.install | 1 -
 debian/calligrastage.install      | 1 +
 debian/calligrawords-data.install | 1 -
 debian/calligrawords.install      | 1 +
 6 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/calligraflow-data.install b/debian/calligraflow-data.install
index 8c991af..4e58aa2 100644
--- a/debian/calligraflow-data.install
+++ b/debian/calligraflow-data.install
@@ -1,4 +1,3 @@
-usr/share/appdata/flow.appdata.xml
 usr/share/icons/hicolor/*/apps/calligraflow.png
 usr/share/icons/hicolor/scalable/apps/calligraflow.svgz
 usr/share/kde4/apps/flow
diff --git a/debian/calligraflow.install b/debian/calligraflow.install
index 0fd9147..59edd23 100644
--- a/debian/calligraflow.install
+++ b/debian/calligraflow.install
@@ -5,6 +5,7 @@ usr/lib/kde4/flowdockersplugin.so
 usr/lib/kde4/flowpart.so
 usr/lib/libflowprivate.so.1*
 usr/lib/libkdeinit4_calligraflow.so
+usr/share/appdata/flow.appdata.xml
 usr/share/applications/kde4/flow.desktop
 usr/share/kde4/services/ServiceMenus/calligra/flow_print.desktop
 usr/share/kde4/services/calligra/calligra_filter_vsdx2odg.desktop
diff --git a/debian/calligrastage-data.install b/debian/calligrastage-data.install
index 76af19b..2132439 100644
--- a/debian/calligrastage-data.install
+++ b/debian/calligrastage-data.install
@@ -1,4 +1,3 @@
-usr/share/appdata/stage.appdata.xml
 usr/share/applications/kde4/stage.desktop
 usr/share/doc/kde/HTML/en/stage
 usr/share/icons/hicolor/*/apps/calligrastage.png
diff --git a/debian/calligrastage.install b/debian/calligrastage.install
index b9ae596..979430f 100644
--- a/debian/calligrastage.install
+++ b/debian/calligrastage.install
@@ -18,3 +18,4 @@ usr/lib/kde4/kpr_shapeanimation_example.so
 usr/lib/kde4/kprvariables.so
 usr/lib/libcalligrastageprivate.so.1*
 usr/lib/libkdeinit4_calligrastage.so
+usr/share/appdata/stage.appdata.xml
diff --git a/debian/calligrawords-data.install b/debian/calligrawords-data.install
index 80b2ca7..c23c13b 100644
--- a/debian/calligrawords-data.install
+++ b/debian/calligrawords-data.install
@@ -1,4 +1,3 @@
-usr/share/appdata/words.appdata.xml
 usr/share/icons/hicolor/*/apps/calligrawords.png
 usr/share/icons/hicolor/scalable/apps/calligrawords.svgz
 usr/share/kde4/apps/words
diff --git a/debian/calligrawords.install b/debian/calligrawords.install
index fd48d91..c552272 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -16,6 +16,7 @@ usr/lib/libkoversion.so.1*
 usr/lib/libkowv2.so.9
 usr/lib/libkowv2.so.9.0.0
 usr/lib/libwordsprivate.so.1*
+usr/share/appdata/words.appdata.xml
 usr/share/applications/kde4/calligrawords_ascii.desktop
 usr/share/applications/kde4/words.desktop
 usr/share/kde4/services/ServiceMenus/calligra/words_print.desktop

-- 
Calligra suite packaging