[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-3-8-g327d24b

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit 6d8c373f7123feab92aa8f7c4bba9c88206eecaa
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Mar 31 01:11:36 2012 +0200

    Bump debhelper compat level to v9.
    
    Use DEB_<flag>_MAINT variables instead of manipulating the flag variables
    directly.
---
 debian/changelog |    3 +++
 debian/compat    |    2 +-
 debian/control   |    2 +-
 debian/rules     |   10 ++++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 666d193..52e81c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ qtwebkit (2.2.0-4) UNRELEASED; urgency=low
   [ Felix Geyer ]
   * Add Fix_build_with_GLib_2.31_changeset_r97269.patch, cherry-picked from
     upstream. (Closes: #665679)
+  * Bump debhelper compat level to v9.
+    - Use DEB_<flag>_MAINT variables instead of manipulating the flag variables
+      directly.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 16 Jan 2012 10:29:18 +0100
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 2943475..332bb66 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: qtwebkit
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends: debhelper (>= 9),
                gperf,
                libgstreamer-plugins-base0.10-dev,
                libgstreamer0.10-dev,
diff --git a/debian/rules b/debian/rules
index beb6331..1f28932 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,15 @@ QWEBVIEW_DIR=debian/plugins/qwebview
 
 # Filter -g from environment on troublesome arches. Replace it with -gstabs
 # See also: stabs_format_debug_info.diff
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel))
-    export CFLAGS := $(filter-out -g,$(CFLAGS)) -gstabs
-    export CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) -gstabs
+    export DEB_CFLAGS_MAINT_STRIP := -g
+    export DEB_CFLAGS_MAINT_APPEND := -gstabs
+    export DEB_CXXFLAGS_MAINT_STRIP := -g
+    export DEB_CXXFLAGS_MAINT_APPEND := -gstabs
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
-    export LDFLAGS := $(LDFLAGS) -Wl,--no-relax
+    export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-relax
 endif
 
 %:

-- 
QtWebKit packaging