[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=ba53339

The following commit has been merged in the master branch:
commit ba53339bce8066aedca084ad4b9ca9bbc00f6012
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Dec 12 13:08:26 2013 -0300

    Revert "Keep armel and sh4 with qreal == double."
    
    This reverts commit 5a631eadc16cefa7c5502b90281feb80527336d1.
    
    We will simply go ahead with qreal == double for all archs.
---
 debian/changelog | 2 --
 debian/rules     | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3252ed7..33a1b7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,6 @@ 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.
   * Update install files.
   * Update symbols files, marking private symbols as such.
   * Remove Disallow_deep_or_widely_nested_entity_references.patch, it has been
diff --git a/debian/rules b/debian/rules
index c721e1e..6f72c34 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 mips64 mips64el))
 	platform_arg = linux-g++

-- 
qtbase packaging