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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 845760c44bbb1abe1a447e55f3dfadfc06b9f6dc
Author: Pino Toscano <pino at debian.org>
Date:   Wed Sep 13 07:18:28 2017 +0200

    do not ship calligra_filter_odt2docx.desktop
    
    it is not an Application desktop file
---
 debian/calligrawords.install | 1 -
 debian/changelog             | 2 ++
 debian/rules                 | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/calligrawords.install b/debian/calligrawords.install
index dc08b5a..0053d6a 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -16,7 +16,6 @@ usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_odt2wiki.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_rtf2odt.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_wpd2odt.so
 usr/lib/*/qt5/plugins/calligra/parts/calligrawordspart.so
-usr/share/applications/calligra_filter_odt2docx.desktop
 usr/share/applications/org.kde.calligrawords.desktop
 usr/share/applications/org.kde.calligrawords_ascii.desktop
 usr/share/kservices5/ServiceMenus/calligra/words_print.desktop
diff --git a/debian/changelog b/debian/changelog
index 5add60c..82d7c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ calligra (1:3.0.1+dfsg-3) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Drop from debian/tmp the stuff belonging to the unported calligraflow
     (they are not shipped, anyway).
+  * Do not ship calligra_filter_odt2docx.desktop, since it is not an
+    Application desktop file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Sep 2017 07:52:25 +0200
 
diff --git a/debian/rules b/debian/rules
index 782acaa..9982cec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,8 @@ override_dh_auto_install:
 	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/flow.mo
 	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/okularGenerator_odp.mo
 	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/okularGenerator_odt.mo
+	# Drop non-application desktop file, wrongly shipped
+	rm -f debian/tmp/usr/share/applications/calligra_filter_odt2docx.desktop
 
 override_dh_install:
 	dh_install --list-missing

-- 
Calligra suite packaging