[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=89491f7

The following commit has been merged in the master branch:
commit 89491f764532e0f29a00e069e212b75bff97e830
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Nov 7 23:26:52 2013 -0300

    Revert "armel and sh4 remain with qreal = float."
    
    This reverts commit 162cc9a1f33723fd83ec625bd6e407a67d0a9908.
    Let's include this whenever rc1 is shipped.
---
 debian/changelog | 3 ---
 debian/rules     | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f985aeb..1634660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,5 @@
 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.
   * Install KMS/EGL CMake's configuration files for armhf.
     - Create debian/qtbase5-dev.install-armhf.
     - Move debian/qtbase5-dev.install to debian/qtbase5-dev.install-common.
diff --git a/debian/rules b/debian/rules
index 9d506d1..6d5c8b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,11 +65,6 @@ 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