[SCM] qtlocation packaging branch, master, updated. debian/5.3.0-3-4-g67aae5c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 67aae5c2bdd693d408d0589eea83a1a37dc93b37
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jul 1 13:08:35 2014 -0300

    Remove remove_qreal_check.patch, applied upstream.
---
 debian/changelog                        |  1 +
 debian/patches/remove_qreal_check.patch | 88 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60c632a..3793e3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtlocation-opensource-src (5.3.1-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Bump Qt build dependencies.
+  * Remove remove_qreal_check.patch, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 01 Jul 2014 12:58:46 -0300
 
diff --git a/debian/patches/remove_qreal_check.patch b/debian/patches/remove_qreal_check.patch
deleted file mode 100644
index 49d9ca2..0000000
--- a/debian/patches/remove_qreal_check.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: remove wrong qreal check, not needed since Qt 5.2
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Forwarded: yes, https://codereview.qt-project.org/87066
-Last-Update: 2014-06-08
-
---- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
-+++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
-@@ -520,32 +520,17 @@ private slots:
-             << BRISBANE
-             << qreal(1374820.1618767744)
-             << qreal(211.1717286649)
--// the following platforms use float for qreal
--#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-             << MELBOURNE;
--#else
--            << QGeoCoordinate(-37.8142515084775, 144.963170622944);
--#endif
-         QTest::newRow("london -> new york")
-             << LONDON
-             << qreal(5570538.4987236429)
-             << qreal(288.3388804508)
--// the following platforms use float for qreal
--#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-             << NEW_YORK;
--#else
--            << QGeoCoordinate(40.7145220608416, -74.0071216045375);
--#endif
-         QTest::newRow("north pole -> south pole")
-             << NORTH_POLE
-             << qreal(20015109.4154876769)
-             << qreal(180.0)
--// the following platforms use float for qreal
--#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-             << SOUTH_POLE;
--#else
--            << QGeoCoordinate(-89.9999947369857, -90.0);
--#endif
-     }
- 
-     void degreesToString()
---- a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
-+++ b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
-@@ -73,21 +73,15 @@ QList<qreal> tst_qgeopositioninfo_qrealTestValues()
- {
-     QList<qreal> values;
- 
--// the following platforms use float for qreal
--#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-     if (qreal(DBL_MIN) == DBL_MIN)
-         values << DBL_MIN;
--#endif
- 
-     values << FLT_MIN;
-     values << -1.0 << 0.0 << 1.0;
-     values << FLT_MAX;
- 
--// the following platforms use float for qreal
--#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-     if (qreal(DBL_MAX) == DBL_MAX)
-         values << DBL_MAX;
--#endif
- 
-     return values;
- }
---- a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
-+++ b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
-@@ -73,21 +73,15 @@ QList<qreal> tst_qgeosatelliteinfo_qrealTestValues()
- {
-     QList<qreal> values;
- 
--// the following platforms use float for qreal
--#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-     if (qreal(DBL_MIN) == DBL_MIN)
-         values << DBL_MIN;
--#endif
- 
-     values << FLT_MIN;
-     values << -1.0 << 0.0 << 1.0;
-     values << FLT_MAX;
- 
--// the following platforms use float for qreal
--#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-     if (qreal(DBL_MAX) == DBL_MAX)
-         values << DBL_MAX;
--#endif
- 
-     return values;
- }
diff --git a/debian/patches/series b/debian/patches/series
index c620f28..726d5ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable_failing_tests.patch
-remove_qreal_check.patch

-- 
qtlocation packaging