[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=5a631ea

The following commit has been merged in the master branch:
commit 5a631eadc16cefa7c5502b90281feb80527336d1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Nov 29 12:25:21 2013 -0300

    Keep armel and sh4 with qreal == double.
    
    Upstream switched all archs to qreal==double. This means an ABI change
    for armhf which will not have a soname bump. Hopefully we only have three
    packages that would need a binNMU, and Qt5 has not been part of a stable
    release yet.
---
 debian/changelog | 2 ++
 debian/rules     | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 74a673d..5daf611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtbase-opensource-src (5.2.0~rc1+dfsg-1) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
+  * Upstream switched 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>  Tue, 26 Nov 2013 19:31:35 +0400
 
diff --git a/debian/rules b/debian/rules
index 6f72c34..c721e1e 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 mips64 mips64el))
 	platform_arg = linux-g++

-- 
qtbase packaging