[SCM] Calligra suite packaging branch, master, updated. debian/2.4.3-2-360-gee8ce7f

[Adrien Grellier]

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

The following commit has been merged in the master branch:
commit 0418e520871b428f92d1288d3c10bf58ca75c6bc
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 7 02:07:09 2011 +0200

    do not install krita_ora.xml
    
    shared-mime-info even in squeeze already provides the image/openraster mimetype,
    so there is no need for krita to install its copy
---
 debian/krita-data.install |    1 -
 debian/not-installed      |    4 ++++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/krita-data.install b/debian/krita-data.install
index ae9b7b8..e3984b8 100644
--- a/debian/krita-data.install
+++ b/debian/krita-data.install
@@ -47,4 +47,3 @@ usr/share/kde4/config/krita.knsrc
 usr/share/kde4/config/kritapatterns.knsrc
 usr/share/kde4/config/kritapresets.knsrc
 usr/share/kde4/config/kritarc
-usr/share/mime/packages/krita_ora.xml
diff --git a/debian/not-installed b/debian/not-installed
index 7c40ec2..c7bdb62 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -4,3 +4,7 @@
 ./usr/lib/libkformulaprivate.so
 ./usr/lib/libplanprivate.so
 ./usr/lib/libwordsprivate.so
+
+# image/openraster is provided by shared-mime-info >= 0.70
+# (and stable/squeeze has 0.71)
+./usr/share/mime/packages/krita_ora.xml

-- 
Calligra suite packaging