[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-5-12-gf2952ec

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=f2952ec

The following commit has been merged in the master branch:
commit f2952ec5058c15074a737e5ad64bae8ba5ae0d6e
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue May 1 15:18:43 2012 +0300

    Build with -gstabs on armhf instead of -g, like armel.
---
 debian/changelog |    1 +
 debian/rules     |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c935a7..6e56517 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtwebkit (2.2.1-2) UNRELEASED; urgency=low
 
   * Upload to Sid.
+  * Build with -gstabs on armhf instead of -g, like armel.
 
  -- Fathi Boudra <fabo at debian.org>  Tue, 01 May 2012 15:07:39 +0300
 
diff --git a/debian/rules b/debian/rules
index 1f28932..dad2122 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ QWEBVIEW_DIR=debian/plugins/qwebview
 # Filter -g from environment on troublesome arches. Replace it with -gstabs
 # See also: stabs_format_debug_info.diff
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel))
+ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel))
     export DEB_CFLAGS_MAINT_STRIP := -g
     export DEB_CFLAGS_MAINT_APPEND := -gstabs
     export DEB_CXXFLAGS_MAINT_STRIP := -g

-- 
QtWebKit packaging