[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=ae11a37

The following commit has been merged in the master branch:
commit ae11a37509f0bd1ccf40950fbcace3af429ba4cb
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Wed Jun 13 19:33:28 2012 +0100

    [ Felix Geyer ]
    [ Jonathan Riddell ]
    Move youtube.png icons into oxygen to stop overlap with kamoso http://bugs.kde.org/296280
---
 debian/changelog                     |  4 ++++
 debian/not-installed                 |  7 +++++++
 debian/plasma-runners-addons.install | 13 +++++++------
 debian/source/local-options          |  1 -
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62a8f72..9580252 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 kdeplasma-addons (4:4.8.90-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Felix Geyer ]
   * New upstream beta release.
 
+  [ Jonathan Riddell ]
+  * Move youtube.png icons into oxygen to stop overlap with kamoso http://bugs.kde.org/296280
+
  -- Felix Geyer <debfx at ubuntu.com>  Mon, 11 Jun 2012 23:17:43 +0200
 
 kdeplasma-addons (4:4.8.80-0ubuntu1) quantal; urgency=low
diff --git a/debian/not-installed b/debian/not-installed
index f176af3..92bf620 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -105,3 +105,10 @@
 ./usr/lib/liblancelot.so
 ./usr/share/kde4/apps/cmake/modules/FindLancelot-Datamodels.cmake
 ./usr/share/kde4/apps/cmake/modules/FindLancelot.cmake
+
+./usr/share/icons/hicolor/16x16/actions/youtube.png
+./usr/share/icons/hicolor/22x22/actions/youtube.png
+./usr/share/icons/hicolor/32x32/actions/youtube.png
+./usr/share/icons/hicolor/48x48/actions/youtube.png
+./usr/share/icons/hicolor/64x64/actions/youtube.png
+./usr/share/icons/hicolor/scalable/actions/youtube.svgz
diff --git a/debian/plasma-runners-addons.install b/debian/plasma-runners-addons.install
index e3cb20c..021d746 100644
--- a/debian/plasma-runners-addons.install
+++ b/debian/plasma-runners-addons.install
@@ -18,12 +18,13 @@ usr/lib/kde4/krunner_spellcheckrunner.so
 usr/lib/kde4/krunner_youtube.so
 usr/lib/kde4/plasma_runner_datetime.so
 usr/lib/kde4/plasma_runner_events.so
-usr/share/icons/hicolor/16x16/actions/youtube.png
-usr/share/icons/hicolor/22x22/actions/youtube.png
-usr/share/icons/hicolor/32x32/actions/youtube.png
-usr/share/icons/hicolor/48x48/actions/youtube.png
-usr/share/icons/hicolor/64x64/actions/youtube.png
-usr/share/icons/hicolor/scalable/actions/youtube.svgz
+#workaround to stop overlap with files in kamoso
+usr/share/icons/hicolor/16x16/actions/youtube.png usr/share/icons/oxygen/16x16/actions/
+usr/share/icons/hicolor/22x22/actions/youtube.png usr/share/icons/oxygen/22x22/actions/
+usr/share/icons/hicolor/32x32/actions/youtube.png usr/share/icons/oxygen/32x32/actions/
+usr/share/icons/hicolor/48x48/actions/youtube.png usr/share/icons/oxygen/48x48/actions/
+usr/share/icons/hicolor/64x64/actions/youtube.png usr/share/icons/oxygen/64x64/actions/
+usr/share/icons/hicolor/scalable/actions/youtube.svgz usr/share/icons/oxygen/scalable/actions/
 usr/share/kde4/services/CharRunner_config.desktop
 usr/share/kde4/services/CharacterRunner.desktop
 usr/share/kde4/services/browserhistory.desktop
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
KDE Plasma Addons module packaging