[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=7783e20

The following commit has been merged in the master branch:
commit 7783e204a0165d358fa6b60585ec678767f32040
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jan 29 08:44:26 2018 +0100

    drop handling of calligra_filter_odt2docx.desktop
    
    the issue is fixed upstream
---
 debian/changelog | 2 --
 debian/rules     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 740f8b7..7ac807e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,6 @@ calligra (1:3.1.0+dfsg-0r1) UNRELEASED; urgency=medium
     provided by a separate calligraplan source.
   * 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.
   * Change priority of calligra-reports-web-element to optional (even if
     it is a transitional package), according to Policy §2.5.
 
diff --git a/debian/rules b/debian/rules
index 9982cec..782acaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,6 @@ 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