[SCM] qtbase packaging branch, master, updated. debian/5.9.1+dfsg-11-2-g1f0b1d8

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=1f0b1d8

The following commit has been merged in the master branch:
commit 1f0b1d8551bd1dcf6ff315aa34dd33b527493cd3
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Oct 1 18:13:49 2017 +0300

    Use the linux-g++ mkspec on all Linux architectures.
    
    We do not need the -m64 compiler flag which linux-g++-64 adds.
---
 debian/changelog | 3 +++
 debian/rules     | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 692c01f..07bb8c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.9.1+dfsg-12) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Use the linux-g++ mkspec on all Linux architectures. We do not need
+    the -m64 compiler flag which linux-g++-64 adds.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Oct 2017 18:05:54 +0300
 
diff --git a/debian/rules b/debian/rules
index 5bc3797..ae7495b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,13 +44,7 @@ ifeq ($(DEB_HOST_ARCH_CPU),i386)
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el arm64))
 	platform_arg = linux-g++
-  else ifeq ($(DEB_HOST_ARCH_BITS),64)
-	platform_arg = linux-g++-64
-  else
-	platform_arg = linux-g++
-  endif
 else ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	platform_arg = hurd-g++
 else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)

-- 
qtbase packaging