[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.1+dfsg-2-5-gaba00e4

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit aba00e4f35aa7a1735313aa0c0ed618053b9c2ec
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Feb 25 12:47:26 2014 -0300

    Remove stabs_format_debug_info.diff, no longer needed.
---
 debian/changelog                            |  1 +
 debian/patches/series                       |  1 -
 debian/patches/stabs_format_debug_info.diff | 39 -----------------------------
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 542a76c..81a34a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtwebkit-opensource-src (5.2.1+dfsg-3) UNRELEASED; urgency=medium
     - Use gstabs on i386, powerpc and s390x.
     - Use full debugging only on amd64.
     - Set libqt5webkit5-dbg's Architecture list accordingly.
+    - Remove stabs_format_debug_info.diff, no longer needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Feb 2014 23:37:15 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index b2e81a4..8f98791 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ fix_ftbfs_in_archs_without_jit_support.patch
 
 # debian patches
 05_sparc_unaligned_access.diff
-stabs_format_debug_info.diff
 no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
deleted file mode 100644
index c9ad56d..0000000
--- a/debian/patches/stabs_format_debug_info.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: build s390, armel, mips*, iX86 debugging symbols with -gstabs
- -g exhausts memory on these arches. Thanks to Oswald Buddenhagen for the hint.
-Author: Sune Vuorela <sune at debian.org>
-Author: Modestas Vainius <modax at debian.org>
-Author: Timo Jyrinki <timo at debian.org>
-Bug-Debian: http://bugs.debian.org/528485
-Bug-Debian: http://bugs.debian.org/618325
-Last-Update: 2013-02-07 (add iX86)
- 
---- a/Source/WebKit/WebKit1.pri
-+++ b/Source/WebKit/WebKit1.pri
-@@ -7,6 +7,12 @@
- 
- SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit
- 
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, m68k) {
-+    message("s390, armel, armhf, mipsel, i386 workaround for QtWebkit: do not build with -g, but with -gstabs")
-+    QMAKE_CXXFLAGS -= -g
-+    QMAKE_CXXFLAGS += -gstabs
-+}
-+
- INCLUDEPATH += \
-     $$SOURCE_DIR/qt/Api \
-     $$SOURCE_DIR/qt/WebCoreSupport \
---- a/Source/WebKit2/WebKit2.pri
-+++ b/Source/WebKit2/WebKit2.pri
-@@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/
- 
- WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR}
- 
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, m68k) {
-+    message("s390, armel, armhf, mipsel, i686 workaround for QtWebkit: do not build with -g, but with -gstabs")
-+    QMAKE_CXXFLAGS -= -g
-+    QMAKE_CXXFLAGS += -gstabs
-+}
-+
- INCLUDEPATH += \
-     $$SOURCE_DIR \
-     $$SOURCE_DIR/Platform \

-- 
qt5webkit packaging