[SCM] kcoreaddons packaging branch, master, updated. debian/5.7.0-1-8-gc6af7c1
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Mar 25 18:23:19 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=c6af7c1
The following commit has been merged in the master branch:
commit c6af7c1a42ce09eee1502ce5925f11d2721cc484
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Mar 24 13:19:18 2015 +0100
Remove colliding webp mime info.
---
debian/changelog | 7 ++++
debian/control | 6 ++--
debian/libkf5coreaddons-data.install | 1 +
debian/libkf5coreaddons-dev.install | 1 -
debian/patches/colliding_webp_mime_info | 57 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 692452b..f5a59d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kcoreaddons (5.8.0-2) UNRELEASED; urgency=medium
+
+ * Remove colliding webp mime info.
+ * New patch: colliding_webp_mime_info
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 24 Mar 2015 13:11:42 +0100
+
kcoreaddons (5.8.0-1) experimental; urgency=medium
* New upstream release (5.8.0).
diff --git a/debian/control b/debian/control
index e60071a..24c9026 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: cmake (>= 2.8.12),
qtbase5-dev (>= 5.2.0),
qttools5-dev,
qttools5-dev-tools,
- shared-mime-info (>= 0.70)
+ shared-mime-info (>= 1.3)
Standards-Version: 3.9.6
Section: libs
XS-Testsuite: autopkgtest
@@ -41,7 +41,7 @@ Section: libs
Architecture: any
Multi-Arch: same
Depends: libkf5coreaddons-data (= ${source:Version}),
- shared-mime-info (>= 0.70),
+ shared-mime-info (>= 1.3),
${misc:Depends},
${shlibs:Depends}
Description: KDE Frameworks 5 addons to QtCore
@@ -57,6 +57,8 @@ Section: libs
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libkf5coreaddons-dev (<= 5.8.0-1)
+Breaks: libkf5coreaddons-dev (<= 5.8.0-1)
Description: KDE Frameworks 5 addons to QtCore - data files
KCoreAddons provides classes built on top of QtCore to perform various tasks
such as manipulating mime types, autosaving files, creating backup files,
diff --git a/debian/libkf5coreaddons-data.install b/debian/libkf5coreaddons-data.install
index d44731b..4b0ee82 100644
--- a/debian/libkf5coreaddons-data.install
+++ b/debian/libkf5coreaddons-data.install
@@ -1 +1,2 @@
usr/share/locale/*/*/kcoreaddons5_qt.*
+usr/share/mime/packages/kde5.xml
diff --git a/debian/libkf5coreaddons-dev.install b/debian/libkf5coreaddons-dev.install
index 85a3902..52f9707 100644
--- a/debian/libkf5coreaddons-dev.install
+++ b/debian/libkf5coreaddons-dev.install
@@ -4,4 +4,3 @@ usr/include/KF5/kcoreaddons_version.h
usr/lib/*/cmake/KF5CoreAddons/
usr/lib/*/libKF5CoreAddons.so
usr/lib/*/qt5/mkspecs/modules/qt_KCoreAddons.pri
-usr/share/mime/packages/kde5.xml
diff --git a/debian/patches/colliding_webp_mime_info b/debian/patches/colliding_webp_mime_info
new file mode 100644
index 0000000..695b4da
--- /dev/null
+++ b/debian/patches/colliding_webp_mime_info
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 0000000..ed53714
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+colliding_webp_mime_info
--
kcoreaddons packaging
More information about the pkg-kde-commits
mailing list