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

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 1786df340b962f8d94324aac065926612819f233
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Aug 18 16:34:58 2012 +0300

    Really add --no-relax on Alpha (forgot to export appropriate variable).
    
    (Closes: #684932)
---
 debian/changelog |    2 ++
 debian/rules     |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7d02a8..abfe845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 amarok (2.6.0-2) UNRELEASED; urgency=low
 
+  * Really add --no-relax on Alpha (forgot to export appropriate variable).
+    (Closes: #684932)
 
  -- Modestas Vainius <modax at debian.org>  Sat, 18 Aug 2012 16:19:58 +0300
 
diff --git a/debian/rules b/debian/rules
index 0dfb38e..bf8d02a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 
 # 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
+    export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-relax
 endif
 
 override_dh_auto_configure:

-- 
Amarok packaging