[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.8.4-1-3-g4e95870

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-runtime.git;a=commitdiff;h=2fd4fa9

The following commit has been merged in the master branch:
commit 2fd4fa9149eb9a83ab8ce66ea8404dc7cf98e5fc
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 8 12:08:46 2012 +0200

    not claim thumbnail support for image/x-wmf and image/x-fig
    
    backport upstream commit 9145b51c1cc4e9ecd273e8eb41de1bbcdd607e35
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 ...e-x-wmf-and-image-x-xfig-from-image-thumb.patch |   32 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e08fb7..4e7c4e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kde-runtime (4:4.8.4-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit 9145b51c1cc4e9ecd273e8eb41de1bbcdd607e35 to not
+    claim thumbnail support for the image/x-wmf and image/x-xfig mimetypes;
+    patch upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Jul 2012 12:04:09 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 8ea3a00..2d97940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kde4_information_menu.diff
 disable_usr_lib_install_rpath.diff
 khelp_htdig.diff
+upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch
diff --git a/debian/patches/upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch b/debian/patches/upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch
new file mode 100644
index 0000000..76cc2fc
--- /dev/null
+++ b/debian/patches/upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch
@@ -0,0 +1,32 @@
+From 9145b51c1cc4e9ecd273e8eb41de1bbcdd607e35 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau at kde.org>
+Date: Thu, 28 Jun 2012 20:22:41 +0200
+Subject: [PATCH] Remove image/x-wmf and image/x-xfig from image thumbnailer's
+ supported mimetypes
+
+There is no known QImageIOPlugin for these two mimetypes.
+And the image thumbnailer currently might hide a special thumbnailer for these,
+as the code of the thumbnail creation invoking code just takes the first
+in the list of found thumbnail plugins, cmp. ThumbnailProtocol::pluginForMimeType(...)
+in kde-runtime/kioslave/thumbnail/thumbnail.cpp
+
+REVIEW: 105371
+---
+ kioslave/thumbnail/imagethumbnail.desktop |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kioslave/thumbnail/imagethumbnail.desktop b/kioslave/thumbnail/imagethumbnail.desktop
+index 17263a9..b4ea0f4 100644
+--- a/kioslave/thumbnail/imagethumbnail.desktop
++++ b/kioslave/thumbnail/imagethumbnail.desktop
+@@ -68,6 +68,6 @@ Name[x-test]=xxImages (GIF, PNG, BMP, ...)xx
+ Name[zh_CN]=图像 (GIF、PNG、BMP ...)
+ Name[zh_TW]=影像（GIF、PNG、BMP...）
+ X-KDE-ServiceTypes=ThumbCreator
+-MimeType=image/cgm;image/fax-g3;image/gif;image/jp2;image/png;image/tiff;image/bmp;image/x-dds;image/x-ico;image/x-jng;image/x-pcx;image/x-photo-cd;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-rgb;image/x-tga;image/x-wmf;image/x-xbitmap;image/x-xcf;image/x-xfig;image/x-xpixmap;image/x-sun-raster;image/vnd.adobe.photoshop;image/x-psd;image/x-hdr;image/x-pic;image/vnd.microsoft.icon;image/x-icon;
++MimeType=image/cgm;image/fax-g3;image/gif;image/jp2;image/png;image/tiff;image/bmp;image/x-dds;image/x-ico;image/x-jng;image/x-pcx;image/x-photo-cd;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-rgb;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-sun-raster;image/vnd.adobe.photoshop;image/x-psd;image/x-hdr;image/x-pic;image/vnd.microsoft.icon;image/x-icon;
+ X-KDE-Library=imagethumbnail
+ CacheThumbnail=true
+-- 
+1.7.10.4
+

-- 
KDE Base Runtime module packaging