[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week09-2

[Modestas Vainius]

The following commit has been merged in the master branch:
commit eac325faf72326eec6607f9c56bf04c4ea2cd38f
Author: Modestas Vainius <modax at debian.org>
Date:   Thu Mar 24 16:12:06 2011 +0200

    Build with -gstabs on armel (Closes: #618325).
    
    Added to the stabs_format_debug_info.diff patch (former
    07_s390_stabs_format_debugging_information.diff).
---
 debian/changelog                                   |    5 +++++
 debian/patches/series                              |    2 +-
 ...formation.diff => stabs_format_debug_info.diff} |    6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e90689..14bcf04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ qtwebkit (2.1.0~2011week09-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Build-depend on libphonon-dev on non-Linux architectures. (Closes: #617656)
 
+  [ Modestas Vainius ]
+  * Build with -gstabs on armel (Closes: #618325). Added to the
+    stabs_format_debug_info.diff patch (former
+    07_s390_stabs_format_debugging_information.diff).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 24 Mar 2011 14:02:36 +0100
 
 qtwebkit (2.1.0~2011week09-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 6e82e53..565b0ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,7 @@
 04_enable_debug_information.diff
 05_sparc_unaligned_access.diff
 06_kfreebsd_strnstr.diff
-07_s390_stabs_format_debugging_information.diff
+stabs_format_debug_info.diff
 08_powerpc_s390_no_gc_sections.diff
 09_hurd.diff
 webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch
diff --git a/debian/patches/07_s390_stabs_format_debugging_information.diff b/debian/patches/stabs_format_debug_info.diff
similarity index 65%
rename from debian/patches/07_s390_stabs_format_debugging_information.diff
rename to debian/patches/stabs_format_debug_info.diff
index 019d9eb..83785f2 100644
--- a/debian/patches/07_s390_stabs_format_debugging_information.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -2,7 +2,9 @@ Description: build s390 debugging symbols with -gstabs instead of with -g
              to reduce linker memory usage.
              Thanks to Oswald Buddenhagen for the hint.
 author: Sune Vuorela <sune at debian.org>
+Author: Modestas Vainius <modax at debian.org>
 Bug-Debian: http://bugs.debian.org/528485
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618325
 
 --- a/WebKit.pri
 +++ b/WebKit.pri
@@ -10,8 +12,8 @@ Bug-Debian: http://bugs.debian.org/528485
      DEFINES += NDEBUG
  }
  
-+equals(QT_ARCH, s390) {
-+	message("S/390 workaround for QtWebkit: do not build with -g, but with -gstabs")
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm) {
++	message("S/390 and armel workaround for QtWebkit: do not build with -g, but with -gstabs")
 +	QMAKE_CXXFLAGS -= -g
 +	QMAKE_CXXFLAGS += -gstabs
 +}

-- 
QtWebKit packaging