[SCM] kcoreaddons packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-4-gda1a01d

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=da1a01d

The following commit has been merged in the kubuntu_unstable branch:
commit da1a01d9764375759caa37982792c72a77ec3774
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue May 12 14:28:14 2015 +0200

    Remove upstream applied patch: colliding_webp_mime_info
---
 debian/changelog                        |  1 +
 debian/patches/colliding_webp_mime_info | 57 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a2d009..dc42a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kcoreaddons (5.10.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.10.0).
+  * Remove upstream applied patch: colliding_webp_mime_info
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 11 May 2015 12:19:25 +0200
 
diff --git a/debian/patches/colliding_webp_mime_info b/debian/patches/colliding_webp_mime_info
deleted file mode 100644
index 695b4da..0000000
--- a/debian/patches/colliding_webp_mime_info
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: kcoreaddons/src/mimetypes/kde5.xml
-===================================================================
---- kcoreaddons.orig/src/mimetypes/kde5.xml	2015-03-14 12:17:50.581261002 +0100
-+++ kcoreaddons/src/mimetypes/kde5.xml	2015-03-24 13:15:00.812334230 +0100
-@@ -3648,52 +3648,4 @@
-       <match type="string" offset="60" value="BOOKMOBI" />
-     </magic>
-   </mime-type>
--  <!-- Will be in s-m-i 1.3, remove when we can depend on it -->
--  <mime-type type="image/x-webp">
--    <comment>WebP image</comment>
--    <comment xml:lang="ca">imatge WebP</comment>
--    <comment xml:lang="ca at valencia">imatge WebP</comment>
--    <comment xml:lang="cs">Obrázek WebP</comment>
--    <comment xml:lang="da">WebP-billede</comment>
--    <comment xml:lang="de">WebP-Bild</comment>
--    <comment xml:lang="el">Εικόνα WebP</comment>
--    <comment xml:lang="en_GB">WebP image</comment>
--    <comment xml:lang="es">Imagen WebP</comment>
--    <comment xml:lang="fi">WebP-kuva</comment>
--    <comment xml:lang="fr">Image WebP</comment>
--    <comment xml:lang="gl">Imaxe WebP</comment>
--    <comment xml:lang="hu">WebP-kép</comment>
--    <comment xml:lang="ia">Imagine de WebP</comment>
--    <comment xml:lang="it">immagine WebP</comment>
--    <comment xml:lang="ko">WebP 그림</comment>
--    <comment xml:lang="lt">WebP paveikslėlis</comment>
--    <comment xml:lang="mr">WebP प्रतिमा</comment>
--    <comment xml:lang="nb">WebP-bilde</comment>
--    <comment xml:lang="nds">WebP-Bild</comment>
--    <comment xml:lang="nl">WebP-image</comment>
--    <comment xml:lang="pa">WebP ਚਿੱਤਰ</comment>
--    <comment xml:lang="pl">Obraz WebP</comment>
--    <comment xml:lang="pt">Imagem WebP</comment>
--    <comment xml:lang="pt_BR">Imagem WebP</comment>
--    <comment xml:lang="ro">Imagine WebP</comment>
--    <comment xml:lang="ru">изображение WebP</comment>
--    <comment xml:lang="sk">WebP obrázok</comment>
--    <comment xml:lang="sl">Slika WebP</comment>
--    <comment xml:lang="sr">вебП слика</comment>
--    <comment xml:lang="sr at ijekavian">вебП слика</comment>
--    <comment xml:lang="sr at ijekavianlatin">WebP slika</comment>
--    <comment xml:lang="sr at latin">WebP slika</comment>
--    <comment xml:lang="sv">WebP-bild</comment>
--    <comment xml:lang="tr">WebP resmi</comment>
--    <comment xml:lang="uk">зображення WebP</comment>
--    <comment xml:lang="zh_CN">WebP 图像</comment>
--    <comment xml:lang="zh_TW">WebP 影像</comment>
--    <magic priority="50">
--      <match type="string" value="RIFF" offset="0">
--        <match type="string" value="WEBP" offset="8"/>
--      </match>
--    </magic>
--    <alias type="image/webp"/>
--    <glob pattern="*.webp"/>
--  </mime-type>
- </mime-info>
diff --git a/debian/patches/series b/debian/patches/series
index ed53714..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-colliding_webp_mime_info

-- 
kcoreaddons packaging