[SCM] kamoso packaging branch, 2.0, updated. e33d78a25e89a1c01fdb1fdb9a075ab5d2b8129e

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kamoso.git;a=commitdiff;h=e33d78a

The following commit has been merged in the 2.0 branch:
commit e33d78a25e89a1c01fdb1fdb9a075ab5d2b8129e
Author: Pino Toscano <pino at debian.org>
Date:   Fri Jul 19 15:24:27 2013 +0200

    rename the youtube icon to kipiplugin_youtube
    
    backport part of upstream commit b8b03322d58a920deac198c2360d65deddccd610;
    rename the actual icons at installation time
---
 debian/changelog                          |    4 ++++
 debian/patches/series                     |    1 +
 debian/patches/upstream_rename-icons.diff |   18 ++++++++++++++++++
 debian/rules                              |    6 ++++++
 4 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 44ae1c5..89c471c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ kamoso (2.0.2-2) UNRELEASED; urgency=low
   * Backport upstream commits a0aec903b36b52bda1a9a5d2e875af1063747a86 and
     9f32257a1e930b16e64508e6fbfa9390fc0322ee to fix compatibility with libkipi
     2.x; patch upstream_libkipi-2.x.diff.
+  * Backport part of upstream commit b8b03322d58a920deac198c2360d65deddccd610
+    to rename the youtube icon to kipiplugin_youtube; patch
+    upstream_rename-icons.diff. Since renaming sources is not viable, rename
+    the actual icons at installation time.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 19 Jul 2013 15:01:06 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 89155bd..c252ced 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ proper_version_kaboutdata.diff
 dont_build_plugin_tester.diff
 upstream_add-include.patch
 upstream_libkipi-2.x.diff
+upstream_rename-icons.diff
diff --git a/debian/patches/upstream_rename-icons.diff b/debian/patches/upstream_rename-icons.diff
new file mode 100644
index 0000000..5b01c0f
--- /dev/null
+++ b/debian/patches/upstream_rename-icons.diff
@@ -0,0 +1,18 @@
+Author: Rex Dieter <rdieter at fedoraproject.org>
+Description: rename icons to avoid conflict
+ .
+ kamoso's youtube.* icons conflict with kdeplasma-addons' youtube krunner
+ plugin.  Avoid that via simple rename here for now.
+Origin: upstream, commit:b8b03322d58a920deac198c2360d65deddccd610
+
+--- a/src/plugins/youtube/kipiplugin_youtube.desktop
++++ b/src/plugins/youtube/kipiplugin_youtube.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ Exec=blubb
+-Icon=youtube
++Icon=kipiplugin_youtube
+ Comment=Upload videos directly to YouTube
+ Comment[cs]=Nahrát videa přímo na YouTube
+ Comment[da]=Upload videoer direkte til YouTube
diff --git a/debian/rules b/debian/rules
index ec024de..74dbe30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,9 @@
 
 %:
 	dh $@ --parallel --with kde
+
+override_dh_auto_install:
+	dh_auto_install
+	for icon in `find debian/kamoso -regextype posix-egrep -regex '.*/youtube\.(png|svgz)'`; do \
+	  mv --verbose $$icon `echo $$icon | sed -r -e 's,\<youtube\>,kipiplugin_

-- 
kamoso packaging