[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=c289a2a

The following commit has been merged in the master branch:
commit c289a2a33acf82dd73a9f3deea14f0d719fdf6f6
Author: Harald Sitter <apachelogger at ubuntu.com>
Date:   Sun Aug 30 20:12:34 2009 +0200

    Fix armel build using kubuntu_01_fix_armel_build.diff
---
 debian/changelog                               |  6 +++++-
 debian/patches/kubuntu_01_fix_armel_build.diff | 13 +++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ec2bd4e..0004ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 kdeplasma-addons (4:4.3.1-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Christian Mangold ]
   [Christian Mangold]
   * New upstream release
   * Bump version of KDE build-deps to 4.3.1
@@ -9,7 +10,10 @@ kdeplasma-addons (4:4.3.1-0ubuntu1) UNRELEASED; urgency=low
     to build compositing support for Lancelot. (LP: #408235)
     (Thanks to Khashayar Naderehvandi)
 
- -- Christian Mangold <neversfelde at ubuntu.com>  Fri, 28 Aug 2009 23:02:20 +0200
+  [ Harald Sitter ]
+  * Fix armel build using kubuntu_01_fix_armel_build.diff
+
+ -- Harald Sitter <apachelogger at ubuntu.com>  Sun, 30 Aug 2009 20:11:55 +0200
 
 kdeplasma-addons (4:4.3.0-0ubuntu4) karmic; urgency=low
 
diff --git a/debian/patches/kubuntu_01_fix_armel_build.diff b/debian/patches/kubuntu_01_fix_armel_build.diff
new file mode 100644
index 0000000..1e7414a
--- /dev/null
+++ b/debian/patches/kubuntu_01_fix_armel_build.diff
@@ -0,0 +1,13 @@
+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
+@@ -253,7 +253,7 @@
+ {
+     if (constraints & (Plasma::FormFactorConstraint | Plasma::SizeConstraint)) {
+         int minSize = KGlobalSettings::smallestReadableFont().pointSize();
+-        int dynSize = qMax(1.0, qMin(contentsRect().width(), contentsRect().height()) / 4);
++        int dynSize = qMax((qreal)1.0, (qreal)(qMin(contentsRect().width(), contentsRect().height()) / 4));
+         //kDebug() << "Min : Dyn" << minSize << dynSize << qMax(minSize, dynSize);
+         m_font.setPointSize(qMax(minSize, dynSize));
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 03cb340..1fe23b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+kubuntu_01_fix_armel_build.diff
 kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
 kubuntu_04_netbook_runners.diff

-- 
KDE Plasma Addons module packaging