[SCM] Amarok packaging branch, master, updated. debian/2.4.2-2

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 4c7cc2a3b0a87ea302a68dfa82a7459e75eee635
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jul 24 17:28:33 2011 +0300

    Fix FTBFS on armel.
---
 debian/changelog                            |    1 +
 debian/patches/backport_arm_build_fix.patch |   16 ++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46f656c..56840fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 amarok (2.4.2-2) UNRELEASED; urgency=low
 
+  * Fix FTBFS on armel (backport_arm_build_fix.patch).
 
  -- Modestas Vainius <modax at debian.org>  Sun, 24 Jul 2011 17:26:53 +0300
 
diff --git a/debian/patches/backport_arm_build_fix.patch b/debian/patches/backport_arm_build_fix.patch
new file mode 100644
index 0000000..ab7a0cb
--- /dev/null
+++ b/debian/patches/backport_arm_build_fix.patch
@@ -0,0 +1,16 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Fix building on armel
+Origin: vendor
+Last-Update: 2011-07-24
+
+--- a/src/dynamic/biases/PartBias.cpp
++++ b/src/dynamic/biases/PartBias.cpp
+@@ -568,7 +568,7 @@ Dynamic::PartBias::changeBiasWeight( int
+     if( biasNum != 0 )
+     {
+         qreal oldV = m_weights.at(0);
+-        qreal newV = qBound( qreal( 0.0 ), 1.0 - (sum - oldV), qreal( 1.0 ) );
++        qreal newV = qBound<qreal>( qreal( 0.0 ), 1.0 - (sum - oldV), qreal( 1.0 ) );
+         m_weights[0] = newV;
+ 
+         sum = sum - oldV + newV;
diff --git a/debian/patches/series b/debian/patches/series
index d9189e1..9568447 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 backport_no_kwallet_prompt_on_track_change.patch
+backport_arm_build_fix.patch
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff

-- 
Amarok packaging