[SCM] qt5webkit packaging branch, experimental, updated. debian/5.212.0_alpha2-1-6-g5debd0d

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 403e155a4b9d5814e083c7e5e3a3709a458826da
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Sep 14 20:34:58 2017 +0300

    Use -g1 on less powerful architectures instead of no debug at all.
    
    This is what Fedora and webkit2gtk maintainers do.
---
 debian/changelog |  1 +
 debian/rules     | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f107824..5b1a518 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtwebkit-opensource-src (5.212.0~alpha2-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Add -DNDEBUG to CPPFLAGS to disable debug output.
+  * Use -g1 on less powerful architectures instead of no debug at all.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 13 Sep 2017 18:44:14 +0300
 
diff --git a/debian/rules b/debian/rules
index 2d9b2e6..58a1b61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,14 @@ DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-gstabs_architectures := amd64 powerpc ppc64el s390x
-
 export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG
-export DEB_CXXFLAGS_MAINT_STRIP = -g
 
-# Enable gstabs debugging symbols only on gstabs_architectures
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(gstabs_architectures)))
-	export DEB_CXXFLAGS_MAINT_APPEND = -gstabs
+# The debug packages produced by webkit are huge and cause problems in
+# most buildds, so use -g1 in all architectures except the ones that
+# are known to work fine
+ifeq (,$(filter $(DEB_HOST_ARCH_CPU),ppc64 ppc64el s390x))
+	export DEB_CXXFLAGS_MAINT_STRIP = -g
+	export DEB_CXXFLAGS_MAINT_APPEND = -g1
 endif
 
 # JIT is only supported on x86 / armhf / aarch64 / mips32

-- 
qt5webkit packaging