[SCM] Amarok packaging branch, master, updated. debian/2.6.0-1

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 0c559a12eb7f18c715c0ab5a28001d0717315472
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Aug 18 11:41:09 2012 +0300

    Add --no-relax when linking to fix FTBFS on Alpha.
    
    (Closes: #684932)
---
 debian/changelog |    2 ++
 debian/rules     |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a119c62..a15326b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 amarok (2.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Add --no-relax when linking on Alpha in order to fix FTBFS.
+    (Closes: #684932)
 
  -- Modestas Vainius <modax at debian.org>  Sat, 18 Aug 2012 11:35:10 +0300
 
diff --git a/debian/rules b/debian/rules
index c19090b..0dfb38e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 
 #DEB_KDE_LINK_WITH_AS_NEEDED := yes
 
+# Add --no-relax when linking on Alpha in order to fix FTBFS (#684932)
+ifeq (alpha,$(shell dpkg-architecture -qDEB_HOST_ARCH))
+    DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-relax
+endif
+
 override_dh_auto_configure:
 	dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON
 

-- 
Amarok packaging