[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=846325c

The following commit has been merged in the master branch:
commit 846325c3f0fa3b33e1b408ea5423b2c660224933
Author: Scott Kitterman <scott at kitterman.com>
Date:   Wed Sep 2 23:51:25 2009 -0400

    Add another armel build fix to the pile.
---
 debian/changelog                               |  6 ++++++
 debian/patches/kubuntu_01_fix_armel_build.diff | 21 +++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a6eeed..3d382e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdeplasma-addons (4:4.3.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Add another fix to kubuntu_01_fix_armel_build.diff
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 02 Sep 2009 23:47:42 -0400
+
 kdeplasma-addons (4:4.3.1-0ubuntu1) karmic; urgency=low
 
   [ Christian Mangold ]
diff --git a/debian/patches/kubuntu_01_fix_armel_build.diff b/debian/patches/kubuntu_01_fix_armel_build.diff
index 1e7414a..7160914 100644
--- a/debian/patches/kubuntu_01_fix_armel_build.diff
+++ b/debian/patches/kubuntu_01_fix_armel_build.diff
@@ -1,7 +1,7 @@
 Index: kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp
 ===================================================================
---- kdeplasma-addons-4.3.1.orig/applets/pastebin/pastebin.cpp	2009-08-30 20:08:28.000000000 +0200
-+++ kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp	2009-08-30 20:09:18.000000000 +0200
+--- kdeplasma-addons-4.3.1.orig/applets/pastebin/pastebin.cpp	2009-07-29 07:13:00.000000000 -0400
++++ kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp	2009-09-02 23:36:13.000000000 -0400
 @@ -253,7 +253,7 @@
  {
      if (constraints & (Plasma::FormFactorConstraint | Plasma::SizeConstraint)) {
@@ -11,3 +11,20 @@ Index: kdeplasma-addons-4.3.1/applets/pastebin/pastebin.cpp
          //kDebug() << "Min : Dyn" << minSize << dynSize << qMax(minSize, dynSize);
          m_font.setPointSize(qMax(minSize, dynSize));
      }
+Index: kdeplasma-addons-4.3.1/applets/mediaplayer/mediaplayer.cpp
+===================================================================
+--- kdeplasma-addons-4.3.1.orig/applets/mediaplayer/mediaplayer.cpp	2009-09-02 23:36:40.000000000 -0400
++++ kdeplasma-addons-4.3.1/applets/mediaplayer/mediaplayer.cpp	2009-09-02 23:47:07.000000000 -0400
+@@ -223,10 +223,10 @@
+         PlayPause();
+         break;
+     case Qt::Key_Up:
+-        audio->setVolume(qMin(qreal(1.0), audio->volume() + 0.1));
++        audio->setVolume(qMin(qreal(1.0), (qreal)(audio->volume() + 0.1)));
+         break;
+     case Qt::Key_Down:
+-        audio->setVolume(qMax(qreal(0.0), audio->volume() - 0.1));
++        audio->setVolume(qMax(qreal(0.0), (qreal)(audio->volume() - 0.1)));
+         break;
+     case Qt::Key_R:
+         RaiseLower();

-- 
KDE Plasma Addons module packaging