[SCM] Calligra suite packaging branch, master, updated. debian/3.0.1+dfsg-2-16-g48fa6c8

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit a5294a192168c5ac143d34026d32a90dced9186a
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jan 29 23:22:57 2018 +0100

    update install files
---
 debian/calligra-data.install      | 138 +-------------------------------------
 debian/changelog                  |   1 +
 debian/okular-backend-odp.install |  12 ++--
 debian/okular-backend-odt.install |  17 +++--
 4 files changed, 18 insertions(+), 150 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 30f2dab..489436e 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -1,142 +1,6 @@
 etc/xdg/calligra_stencils.knsrc
 usr/share/applications/calligra.desktop
-usr/share/calligra/autocorrect/
-usr/share/calligra/calligra_shell.rc
-usr/share/calligra/cursors/
-usr/share/calligra/icons/hicolor/*/actions/abs.png
-usr/share/calligra/icons/hicolor/*/actions/animation-stage.png
-usr/share/calligra/icons/hicolor/*/actions/artistictext-tool.png
-usr/share/calligra/icons/hicolor/*/actions/backgroundtool.png
-usr/share/calligra/icons/hicolor/*/actions/bevelled.png
-usr/share/calligra/icons/hicolor/*/actions/borderpainter.png
-usr/share/calligra/icons/hicolor/*/actions/brackets.png
-usr/share/calligra/icons/hicolor/*/actions/calligraphy.png
-usr/share/calligra/icons/hicolor/*/actions/callout-shape.png
-usr/share/calligra/icons/hicolor/*/actions/circular-arrow-shape.png
-usr/share/calligra/icons/hicolor/*/actions/createpath.png
-usr/share/calligra/icons/hicolor/*/actions/cross-shape.png
-usr/share/calligra/icons/hicolor/*/actions/curve-connector.png
-usr/share/calligra/icons/hicolor/*/actions/editpath.png
-usr/share/calligra/icons/hicolor/*/actions/edittext.png
-usr/share/calligra/icons/hicolor/*/actions/ellipse-shape.png
-usr/share/calligra/icons/hicolor/*/actions/enclosed.png
-usr/share/calligra/icons/hicolor/*/actions/escape-direction-all.png
-usr/share/calligra/icons/hicolor/*/actions/escape-direction-down.png
-usr/share/calligra/icons/hicolor/*/actions/escape-direction-horizontal.png
-usr/share/calligra/icons/hicolor/*/actions/escape-direction-left.png
-usr/share/calligra/icons/hicolor/*/actions/escape-direction-right.png
-usr/share/calligra/icons/hicolor/*/actions/escape-direction-up.png
-usr/share/calligra/icons/hicolor/*/actions/escape-direction-vertical.png
-usr/share/calligra/icons/hicolor/*/actions/flower-shape.png
-usr/share/calligra/icons/hicolor/*/actions/format-break-node.png
-usr/share/calligra/icons/hicolor/*/actions/format-connect-node.png
-usr/share/calligra/icons/hicolor/*/actions/format-convert-to-path.png
-usr/share/calligra/icons/hicolor/*/actions/format-disconnect-node.png
-usr/share/calligra/icons/hicolor/*/actions/format-insert-node.png
-usr/share/calligra/icons/hicolor/*/actions/format-join-node.png
-usr/share/calligra/icons/hicolor/*/actions/format-node-curve.png
-usr/share/calligra/icons/hicolor/*/actions/format-node-line.png
-usr/share/calligra/icons/hicolor/*/actions/format-remove-node.png
-usr/share/calligra/icons/hicolor/*/actions/format-segment-curve.png
-usr/share/calligra/icons/hicolor/*/actions/format-segment-line.png
-usr/share/calligra/icons/hicolor/*/actions/frac.png
-usr/share/calligra/icons/hicolor/*/actions/gearhead-shape.png
-usr/share/calligra/icons/hicolor/*/actions/gradient.png
-usr/share/calligra/icons/hicolor/*/actions/gsub.png
-usr/share/calligra/icons/hicolor/*/actions/gsubup.png
-usr/share/calligra/icons/hicolor/*/actions/gsup.png
-usr/share/calligra/icons/hicolor/*/actions/hand.png
-usr/share/calligra/icons/hicolor/*/actions/hexagon-shape.png
-usr/share/calligra/icons/hicolor/*/actions/inscol.png
-usr/share/calligra/icons/hicolor/*/actions/insert-endnote.png
-usr/share/calligra/icons/hicolor/*/actions/insert-footnote.png
-usr/share/calligra/icons/hicolor/*/actions/insert-page-break.png
-usr/share/calligra/icons/hicolor/*/actions/insert-table-of-contents.png
-usr/share/calligra/icons/hicolor/*/actions/insrow.png
-usr/share/calligra/icons/hicolor/*/actions/int.png
-usr/share/calligra/icons/hicolor/*/actions/lines-connector.png
-usr/share/calligra/icons/hicolor/*/actions/lsub.png
-usr/share/calligra/icons/hicolor/*/actions/lsup.png
-usr/share/calligra/icons/hicolor/*/actions/matrix.png
-usr/share/calligra/icons/hicolor/*/actions/multiline.png
-usr/share/calligra/icons/hicolor/*/actions/music-cross.png
-usr/share/calligra/icons/hicolor/*/actions/music-dottednote.png
-usr/share/calligra/icons/hicolor/*/actions/music-doublecross.png
-usr/share/calligra/icons/hicolor/*/actions/music-doubleflat.png
-usr/share/calligra/icons/hicolor/*/actions/music-flat.png
-usr/share/calligra/icons/hicolor/*/actions/music-natural.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-128th.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-16th.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-32nd.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-64th.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-breve.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-eighth.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-half.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-quarter.png
-usr/share/calligra/icons/hicolor/*/actions/music-note-whole.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-128th.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-16th.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-32nd.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-64th.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-breve.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-eighth.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-half.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-quarter.png
-usr/share/calligra/icons/hicolor/*/actions/music-rest-whole.png
-usr/share/calligra/icons/hicolor/*/actions/music-tiednote.png
-usr/share/calligra/icons/hicolor/*/actions/node-type-cusp.png
-usr/share/calligra/icons/hicolor/*/actions/node-type-smooth.png
-usr/share/calligra/icons/hicolor/*/actions/node-type-symmetric.png
-usr/share/calligra/icons/hicolor/*/actions/onetwomatrix.png
-usr/share/calligra/icons/hicolor/*/actions/over.png
-usr/share/calligra/icons/hicolor/*/actions/paren.png
-usr/share/calligra/icons/hicolor/*/actions/pathshape.png
-usr/share/calligra/icons/hicolor/*/actions/pattern.png
-usr/share/calligra/icons/hicolor/*/actions/pentagon-shape.png
-usr/share/calligra/icons/hicolor/*/actions/rectangle-shape.png
-usr/share/calligra/icons/hicolor/*/actions/remcol.png
-usr/share/calligra/icons/hicolor/*/actions/remrow.png
-usr/share/calligra/icons/hicolor/*/actions/root.png
-usr/share/calligra/icons/hicolor/*/actions/rsub.png
-usr/share/calligra/icons/hicolor/*/actions/rsubup.png
-usr/share/calligra/icons/hicolor/*/actions/rsup.png
-usr/share/calligra/icons/hicolor/*/actions/select.png
-usr/share/calligra/icons/hicolor/*/actions/shape-choose.png
-usr/share/calligra/icons/hicolor/*/actions/smiley-shape.png
-usr/share/calligra/icons/hicolor/*/actions/snap-bounding-box.png
-usr/share/calligra/icons/hicolor/*/actions/snap-extension.png
-usr/share/calligra/icons/hicolor/*/actions/spiral-shape.png
-usr/share/calligra/icons/hicolor/*/actions/spreadsheetshape.png
-usr/share/calligra/icons/hicolor/*/actions/sqrt.png
-usr/share/calligra/icons/hicolor/*/actions/standard-connector.png
-usr/share/calligra/icons/hicolor/*/actions/star-shape.png
-usr/share/calligra/icons/hicolor/*/actions/straight-connector.png
-usr/share/calligra/icons/hicolor/*/actions/table.png
-usr/share/calligra/icons/hicolor/*/actions/text-put-on-path.png
-usr/share/calligra/icons/hicolor/*/actions/text-remove-from-path.png
-usr/share/calligra/icons/hicolor/*/actions/tool-text.png
-usr/share/calligra/icons/hicolor/*/actions/tool_cellformatting.png
-usr/share/calligra/icons/hicolor/*/actions/tool_imageeffects.png
-usr/share/calligra/icons/hicolor/*/actions/tool_references.png
-usr/share/calligra/icons/hicolor/*/actions/tool_review.png
-usr/share/calligra/icons/hicolor/*/actions/under.png
-usr/share/calligra/icons/hicolor/*/actions/vector.png
-usr/share/calligra/icons/hicolor/*/actions/zoom-pixels.png
-usr/share/calligra/icons/hicolor/*/mimetypes/x-shape-connection.png
-usr/share/calligra/icons/hicolor/*/mimetypes/x-shape-formula.png
-usr/share/calligra/icons/hicolor/*/mimetypes/x-shape-image.png
-usr/share/calligra/icons/hicolor/*/mimetypes/x-shape-text.png
-usr/share/calligra/icons/hicolor/scalable/actions/artistictext-tool.svg
-usr/share/calligra/icons/hicolor/scalable/actions/snap-bounding-box.svg
-usr/share/calligra/icons/hicolor/scalable/actions/snap-extension.svg
-usr/share/calligra/icons/hicolor/scalable/actions/table.svgz
-usr/share/calligra/icons/hicolor/scalable/actions/text-put-on-path.svg
-usr/share/calligra/icons/hicolor/scalable/actions/text-remove-from-path.svg
-usr/share/calligra/palettes/
-usr/share/calligra/pics/
-usr/share/calligra/stencils/
-usr/share/calligra/styles/
-usr/share/calligra/thesaurus/
+usr/share/calligra/
 usr/share/calligra_shape_music/
 usr/share/doc/HTML/en/calligra
 usr/share/kservices5/calligradocinfopropspage.desktop
diff --git a/debian/changelog b/debian/changelog
index f4ad0b4..20c3289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ calligra (1:3.1.0+dfsg-0r1) UNRELEASED; urgency=medium
     - avoid duplicated calligra.org field
     - make sure calligrastage-data has the same Homepage as calligrastage
   * Minor updates to the watch file.
+  * Update install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Sep 2017 07:52:25 +0200
 
diff --git a/debian/okular-backend-odp.install b/debian/okular-backend-odp.install
index 93bafe8..52a110c 100644
--- a/debian/okular-backend-odp.install
+++ b/debian/okular-backend-odp.install
@@ -1,10 +1,10 @@
-usr/lib/*/qt5/plugins/okularGenerator_odp.so
-usr/share/applications/okularApplication_odp.desktop
+usr/lib/*/libkookularGenerator_odp.so.*
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_odp_calligra.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_powerpoint_calligra.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_pptx_calligra.so
+usr/share/applications/okularApplication_odp_calligra.desktop
 usr/share/applications/okularApplication_powerpoint_calligra.desktop
 usr/share/applications/okularApplication_pptx_calligra.desktop
-usr/share/kservices5/libokularGenerator_odp.desktop
-usr/share/kservices5/libokularGenerator_powerpoint_calligra.desktop
-usr/share/kservices5/libokularGenerator_pptx_calligra.desktop
-usr/share/kservices5/okularOdp.desktop
+usr/share/kservices5/okularOdp_calligra.desktop
 usr/share/kservices5/okularPowerpoint_calligra.desktop
 usr/share/kservices5/okularPptx_calligra.desktop
diff --git a/debian/okular-backend-odt.install b/debian/okular-backend-odt.install
index 9daa34d..4d7d5ca 100644
--- a/debian/okular-backend-odt.install
+++ b/debian/okular-backend-odt.install
@@ -1,13 +1,16 @@
-usr/lib/*/qt5/plugins/okularGenerator_odt.so
+usr/lib/*/libkookularGenerator_odt.so.*
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_doc_calligra.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_docx_calligra.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_odt_calligra.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_rtf_calligra.so
+usr/lib/*/qt5/plugins/okular/generators/okularGenerator_wpd_calligra.so
 usr/share/applications/okularApplication_doc_calligra.desktop
 usr/share/applications/okularApplication_docx_calligra.desktop
-usr/share/applications/okularApplication_odt.desktop
+usr/share/applications/okularApplication_odt_calligra.desktop
+usr/share/applications/okularApplication_rtf_calligra.desktop
 usr/share/applications/okularApplication_wpd_calligra.desktop
-usr/share/kservices5/libokularGenerator_doc_calligra.desktop
-usr/share/kservices5/libokularGenerator_docx_calligra.desktop
-usr/share/kservices5/libokularGenerator_odt.desktop
-usr/share/kservices5/libokularGenerator_wpd_calligra.desktop
 usr/share/kservices5/okularDoc_calligra.desktop
 usr/share/kservices5/okularDocx_calligra.desktop
-usr/share/kservices5/okularOdt.desktop
+usr/share/kservices5/okularOdt_calligra.desktop
+usr/share/kservices5/okularRtf_calligra.desktop
 usr/share/kservices5/okularWpd_calligra.desktop

-- 
Calligra suite packaging