[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-2-13-gb72e86a

[Modestas Vainius]

The following commit has been merged in the master branch:
commit b72e86aeff0d0fc3cebcf49e47568952492862c6
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Apr 11 22:34:08 2010 +0300

    Do not depend on dpkg-architecture in qmake scripts, use QT_ARCH.
---
 debian/patches/91_s390_use_gstabs.diff       |    7 +++----
 debian/patches/96_webkit_no_gc_sections.diff |    3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/patches/91_s390_use_gstabs.diff b/debian/patches/91_s390_use_gstabs.diff
index 0494ae8..e879bd4 100644
--- a/debian/patches/91_s390_use_gstabs.diff
+++ b/debian/patches/91_s390_use_gstabs.diff
@@ -8,13 +8,12 @@ Forwarded: no
 
 --- a/src/3rdparty/webkit/WebKit.pri
 +++ b/src/3rdparty/webkit/WebKit.pri
-@@ -43,6 +43,14 @@ CONFIG(release, debug|release) {
+@@ -43,6 +43,13 @@ CONFIG(release, debug|release) {
      DEFINES += NDEBUG
  }
  
-+arch=$$system(dpkg-architecture -qDEB_BUILD_ARCH)
-+equals(arch, s390) {
-+	message("S/390 workaround: do not build with -g, but with -gstabs")
++equals(QT_ARCH, s390) {
++	message("S/390 workaround for QtWebkit: do not build with -g, but with -gstabs")
 +	QMAKE_CXXFLAGS -= -g
 +	QMAKE_CXXFLAGS += -gstabs
 +}
diff --git a/debian/patches/96_webkit_no_gc_sections.diff b/debian/patches/96_webkit_no_gc_sections.diff
index 2f7f236..998b25d 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -1,7 +1,6 @@
 Description: Don't link QtWebkit with --gc-sections on powerpc and s390
  This works around a binutils bug that results in a segfault on powerpc
  and an internal link error on s390.
- NOTE: s390 part depends on the 91_s390_webkit_ftbfs_fixes.diff patch.
 Author: Steve Langasek <steve.langasek at ubuntu.com>
 Author: Modestas Vainius <modax at debian.org>
 Origin: vendor
@@ -15,7 +14,7 @@ Last-Update: 2010-04-11 (s390 added)
  
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
-+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(arch, s390):QMAKE_LFLAGS += -Wl,--gc-sections
++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):QMAKE_LFLAGS += -Wl,--gc-sections
  
  CONFIG(release):!CONFIG(QTDIR_build) {
      contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols

-- 
Qt 4 Debian packaging