[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-1-4-g8c99aab

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 6981cfa2e87d7bbc82a1016bd0763b0fbf188b64
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 17 07:53:49 2016 +0200

    calligra-data: remove extra mimes
---
 debian/calligra-data.install | 2 --
 debian/changelog             | 3 +++
 debian/rules                 | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 7b261f6..c580cd9 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -334,6 +334,4 @@ usr/share/kde4/servicetypes/presentationeventaction.desktop
 usr/share/kde4/servicetypes/scripteventaction.desktop
 usr/share/kde4/servicetypes/texteditingplugin.desktop
 usr/share/mime/packages/calligra_svm.xml
-usr/share/mime/packages/msooxml-all.xml
 usr/share/mime/packages/wiki-format.xml
-usr/share/mime/packages/x-iwork-keynote-sffkey.xml
diff --git a/debian/changelog b/debian/changelog
index 4bb55cf..ac76cd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 calligra (1:2.9.11+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Drop from calligra-data the two mimetype definitions msooxml-all.xml, and
+    x-iwork-keynote-sffkey.xml, since shared-mime-info provides them already.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Sep 2016 07:48:13 +0200
 
diff --git a/debian/rules b/debian/rules
index 0adfe3c..0222530 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,9 @@ override_dh_auto_install:
 	rm -rfv debian/tmp/usr/include
 	# - cmake configuration files
 	rm -rfv debian/tmp/usr/share/kde4/apps/cmake
+	# Remove mimetypes already provided by shared-mime-info
+	rm -f debian/tmp/usr/share/mime/packages/msooxml-all.xml
+	rm -f debian/tmp/usr/share/mime/packages/x-iwork-keynote-sffkey.xml
 
 override_dh_install:
 	dh_install --list-missing

-- 
Calligra suite packaging