[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+git49-gbc62005+dfsg-1-3-ga5d2ad9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit a5d2ad9f0ae5a91930b0f6420c1bb4ce50f38ce2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Aug 16 11:36:09 2014 -0300

    Make arm64 use linux-g++ as platform_arg.
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 850e71d..83c3e59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-2) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Disable the use of system proxies by default. It seems that if http_proxy
     is setted then all protocols try to use the proxy.
+  * Make arm64 use linux-g++ as platform_arg.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Aug 2014 12:02:33 -0300
 
diff --git a/debian/rules b/debian/rules
index 049b4bb..a7fe81c 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 mips64 mips64el))
+  ifneq (,$(filter $(DEB_HOST_ARCH),alpha arm64 ia64 mips64 mips64el))
 	platform_arg = linux-g++
   else ifeq ($(DEB_HOST_ARCH_BITS),64)
 	platform_arg = linux-g++-64

-- 
Qt 4 packaging