[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 093f765b342f2f76924f571a651b8d56863d1a26
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 7 02:32:52 2011 +0300

    Drop 91_s390_use_gstabs.diff patch.
    
    It's no longer needed as webkit is not built from Qt sources anymore.
---
 debian/changelog                       |    2 ++
 debian/patches/91_s390_use_gstabs.diff |   24 ------------------------
 debian/patches/series                  |    1 -
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e8e056..b076366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
     -fstrict-volatile-bitfields for QBasicAtomicInt::fetchAndStoreOrdered(int)
     method on arm. This should fix FTBFSes triggered by this inline function.
     (Closes: #625825)
+  * Drop 91_s390_use_gstabs.diff patch. It's no longer needed as webkit is not
+    built from Qt sources anymore.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 May 2011 13:08:38 +0300
 
diff --git a/debian/patches/91_s390_use_gstabs.diff b/debian/patches/91_s390_use_gstabs.diff
deleted file mode 100644
index e1fd4df..0000000
--- a/debian/patches/91_s390_use_gstabs.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Sune Vuorela <sune at debian.org>
-Description: use -gstabs debugging symbols on s390
- Build s390 debugging symbols with -gstabs instead of with -g to reduce linker
- memory usage. Thanks to Oswald Buddenhagen for the hint.
-Bug-Debian: http://bugs.debian.org/528485
-Origin: vendor
-Forwarded: no
-
---- a/src/3rdparty/webkit/WebKit.pri
-+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -47,6 +47,13 @@ CONFIG(release, debug|release) {
-     DEFINES += NDEBUG
- }
- 
-+equals(QT_ARCH, s390) {
-+	message("S/390 workaround for QtWebkit: do not build with -g, but with -gstabs")
-+	QMAKE_CXXFLAGS -= -g
-+	QMAKE_CXXFLAGS += -gstabs
-+}
-+
-+
- BASE_DIR = $$PWD
- 
- symbian {
diff --git a/debian/patches/series b/debian/patches/series
index 359d478..83664d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,7 +29,6 @@ buildable_appchooser_states_demos.patch
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
 89_powerpc_opts.diff
-91_s390_use_gstabs.diff
 92_armel_gcc43_valist_compat.diff
 x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
 94_armv6_uname_entry.diff

-- 
Qt 4 packaging