[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+dfsg-2-2-g84a2533

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=84a2533

The following commit has been merged in the master branch:
commit 84a2533fc054c4cba15e69dbb8500efecf2a9e29
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jun 26 01:23:24 2014 -0300

    Update a patch and rules to let mips64[el] build.
---
 debian/changelog                                    | 4 ++++
 debian/patches/07_trust_dpkg-arch_over_uname-m.diff | 2 +-
 debian/rules                                        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index acd248d..4294653 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qt4-x11 (4:4.8.6+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Update 07_trust_dpkg-arch_over_uname-m.diff and debian/rules in order to
+    let mips64[el] build (Closes: #719763). Thanks Yunqiang Su for the patch.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Jun 2014 01:19:21 -0300
 
 qt4-x11 (4:4.8.6+dfsg-2) unstable; urgency=medium
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index 09cbcd9..2c1d0fe 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -45,7 +45,7 @@ Trolltech task ID : 181882
 +	lpia)
 +		UNAME_MACHINE="i686"
 +	;;
-+	mipsel)
++	mips*)
 +		UNAME_MACHINE="mips"
 +	;;
 +	powerpc)
diff --git a/debian/rules b/debian/rules
index 2840f4f..049b4bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ else
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64))
+  ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el))
 	platform_arg = linux-g++
   else ifeq ($(DEB_HOST_ARCH_BITS),64)
 	platform_arg = linux-g++-64

-- 
Qt 4 packaging