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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 86d1770c083f7dd6cf75f262560e11c0db3a1608
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 24 17:22:14 2012 -0300

    Remove patch taken from upstream.
    
    Already included in the current release.
---
 debian/changelog                                   |    3 --
 debian/patches/series                              |    1 -
 ...e-x-wmf-and-image-x-xfig-from-image-thumb.patch |   32 --------------------
 3 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ad80db..dc1ae20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ kde-runtime (4:4.8.5-0r0) UNRELEASED; urgency=low
   * New upstream release.
 
   [ 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.
   * Backport upstream commit d9234cca36319cb6895d4a7d36030a95923d1373 (from
     the nepomuk-core repository) to remove a spammy "FIXME" debug message;
     patch upstream_Remove-a-FIXME-debug-message.patch. (Closes: #677625)
diff --git a/debian/patches/series b/debian/patches/series
index 4abe996..1d59935 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +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
 upstream_Remove-a-FIXME-debug-message.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
deleted file mode 100644
index 76cc2fc..0000000
--- a/debian/patches/upstream_Remove-image-x-wmf-and-image-x-xfig-from-image-thumb.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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