[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-3-2-gca26278

[Pino Toscano]

The following commit has been merged in the master branch:
commit ca262785443b07a117196fdc5317916dd1fb69a4
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jan 16 10:34:57 2012 +0100

    add -Wl,--no-relax to the LDFLAGS on alpha (#656056)
---
 debian/changelog |    2 ++
 debian/rules     |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 056123f..da7986a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtwebkit (2.2.0-4) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Add -Wl,--no-relax to the LDFLAGS on alpha. (Closes: #656056)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 16 Jan 2012 10:29:18 +0100
 
diff --git a/debian/rules b/debian/rules
index f41c4c5..beb6331 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,9 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel))
     export CFLAGS := $(filter-out -g,$(CFLAGS)) -gstabs
     export CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) -gstabs
 endif
+ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
+    export LDFLAGS := $(LDFLAGS) -Wl,--no-relax
+endif
 
 %:
 	dh $@ --sourcedirectory=Source --buildsystem=qmake --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper

-- 
QtWebKit packaging