[SCM] qtbase packaging branch, experimental, updated. debian/5.3.0+dfsg-2-5-gf9e24c5

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit f9e24c5bff86d89890715682c939127344affbe1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jun 1 12:10:25 2014 -0300

    Add Peter Green's changes.
    
    Closes #750047.
    arm64 was already included as no pch arch.
---
 debian/changelog | 5 +++++
 debian/rules     | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 80ffa77..0757457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ qtbase-opensource-src (5.3.0+dfsg-3) UNRELEASED; urgency=medium
     - Remove do_not_pass_wcast-align_on_sparc.patch, it s now not needed
       anymore.
 
+  [ Peter Michael Green ]
+  * arm64 changes cherry picked from ubuntu (Closes: #750047).
+    + Add arm64 to list of 64-bit architectures that should not use -m64
+  * Remove .device.vars and .qmake.vars in clean target.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 May 2014 00:31:54 -0300
 
 qtbase-opensource-src (5.3.0+dfsg-2) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index e02ef4f..56f867f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ ifneq ($(DEB_HOST_ARCH_OS),linux)
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el))
+  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
@@ -198,6 +198,9 @@ override_dh_auto_clean:
 	rm -f debian/shlibs.local
 	rm -f debian/stamp-makefile-build-tools
 
+	# more leftovers
+	rm -f .device.vars .qmake.vars
+
 ifeq ($(vendor),Ubuntu)
 	rm -rf po
 endif

-- 
qtbase packaging