[SCM] qt5webkit packaging branch, master, updated. 88a95c7ca4644f27a038072b70e3a1be5ca188fa

Timo Jyrinki timo at alioth.debian.org
Mon Jun 3 12:22:02 UTC 2013


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

The following commit has been merged in the master branch:
commit 88a95c7ca4644f27a038072b70e3a1be5ca188fa
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jun 3 15:21:42 2013 +0300

    Set DEB_HOST_MULTIARCH in rules
---
 debian/changelog |    2 ++
 debian/rules     |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37c274c..1838f26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qtwebkit-opensource-src (5.0.2-2) UNRELEASED; urgency=low
 
+  [ Timo Jyrinki ]
   * Drop save_memory.diff, not useful in its current form
+  * Set DEB_HOST_MULTIARCH in rules
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 03 Jun 2013 10:40:04 +0300
 
diff --git a/debian/rules b/debian/rules
index 54db003..793165b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ export QT_SELECT := qt5
 # 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_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel))
     export DEB_CFLAGS_MAINT_STRIP := -g
     export DEB_CFLAGS_MAINT_APPEND := -gstabs

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list