[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 162cc9a1f33723fd83ec625bd6e407a67d0a9908
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Nov 1 13:58:35 2013 -0300

    armel and sh4 remain with qreal = float.
    
    The rest of the archs will use double.
---
 debian/changelog | 4 ++++
 debian/rules     | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f082df1..cecec4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.2.0~beta1+dfsg-2) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Qt switches qreal to double for all archs. In Debian's case we will only
+    keep armel and sh4 with qreal as float.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 Nov 2013 13:48:48 -0300
 
 qtbase-opensource-src (5.2.0~beta1+dfsg-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 6d5c8b7..9d506d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,11 @@ else
 	extra_configure_opts += -opengl desktop
 endif
 
+qreal_as_float_architectures := armel sh4
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(qreal_as_float_architectures)))
+	extra_configure_opts += -qreal float
+endif
+
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64))
 	platform_arg = linux-g++

-- 
qtbase packaging