[SCM] qtlocation packaging branch, master, updated. debian/5.3.0-1-9-g0b42fdc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit f32d7918005d447b609be66a858625d85972aac7
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 27 15:43:32 2014 -0300

    Don't deactivate tests.
---
 debian/changelog                        |  2 +
 debian/patches/series                   |  1 -
 debian/patches/skip_failing_tests.patch | 86 ---------------------------------
 3 files changed, 2 insertions(+), 87 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9aeccef..4f42aab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtlocation-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * Install headers in their new m-a path. Mark development package as
     Multi-Arch: same.
   * Remove transitional package qtdeclarative5-qtpositioning-plugin.
+  * Remove skip_failing_tests.patch. If the test are failing then they should
+    not be deactivated but solved, except we have a good reason to do it.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2014 15:28:31 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 17a5fb9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-skip_failing_tests.patch
diff --git a/debian/patches/skip_failing_tests.patch b/debian/patches/skip_failing_tests.patch
deleted file mode 100644
index a3d8bf3..0000000
--- a/debian/patches/skip_failing_tests.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Description: Skip failing tests
- While enabling tests during build, skip those found failing pending
- investigation.
- .
-Author: Allan LeSage <allan.lesage at canonical.com>
-Forwarded: no
-Last-Updated: 2014-01-08
-
---- a/tests/auto/auto.pro
-+++ b/tests/auto/auto.pro
-@@ -59,7 +59,5 @@
-     qtHaveModule(quick) {
--        SUBDIRS += declarative_core
- 
--        !mac: SUBDIRS += declarative_ui
-     }
- }
- 
-@@ -75,7 +75,8 @@
-            qgeocoordinate \
-            qgeolocation \
-            qgeopositioninfo \
--           qgeopositioninfosource \
-+           # skip this failing test
-+           #qgeopositioninfosource \
-            qgeosatelliteinfo \
-            qgeosatelliteinfosource \
-            qnmeapositioninfosource
-diff -urN qtlocation-opensource-src-5.2.0.old/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp qtlocation-opensource-src-5.2.0/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
---- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp	2013-12-08 17:10:20.000000000 +0000
-+++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp	2014-01-20 06:57:05.501045608 +0000
-@@ -459,12 +459,12 @@
-                 << QGeoCoordinate() << BRISBANE << qreal(0.0);
-         QTest::newRow("invalid coord 2")
-                 << BRISBANE << QGeoCoordinate() << qreal(0.0);
--        QTest::newRow("brisbane -> melbourne")
--                << BRISBANE << MELBOURNE << qreal(1374820.1618767744);
--        QTest::newRow("london -> new york")
--                << LONDON << NEW_YORK << qreal(5570538.4987236429);
--        QTest::newRow("north pole -> south pole")
--                << NORTH_POLE << SOUTH_POLE << qreal(20015109.4154876769);
-+        //QTest::newRow("brisbane -> melbourne")
-+        //        << BRISBANE << MELBOURNE << qreal(1374820.1618767744);
-+        //QTest::newRow("london -> new york")
-+        //        << LONDON << NEW_YORK << qreal(5570538.4987236429);
-+        //QTest::newRow("north pole -> south pole")
-+        //        << NORTH_POLE << SOUTH_POLE << qreal(20015109.4154876769);
-     }
- 
-     void azimuthTo()
-@@ -486,12 +486,12 @@
-                 << QGeoCoordinate() << BRISBANE << qreal(0.0);
-         QTest::newRow("invalid coord 2")
-                 << BRISBANE << QGeoCoordinate() << qreal(0.0);
--        QTest::newRow("brisbane -> melbourne")
--                << BRISBANE << MELBOURNE << qreal(211.1717286649);
--        QTest::newRow("london -> new york")
--                << LONDON << NEW_YORK << qreal(288.3388804508);
--        QTest::newRow("north pole -> south pole")
--                << NORTH_POLE << SOUTH_POLE << qreal(180.0);
-+        //QTest::newRow("brisbane -> melbourne")
-+        //        << BRISBANE << MELBOURNE << qreal(211.1717286649);
-+        //QTest::newRow("london -> new york")
-+        //        << LONDON << NEW_YORK << qreal(288.3388804508);
-+        //QTest::newRow("north pole -> south pole")
-+        //        << NORTH_POLE << SOUTH_POLE << qreal(180.0);
-     }
- 
-     void atDistanceAndAzimuth()
-@@ -516,6 +516,7 @@
-             << qreal(1000.0)
-             << qreal(10.0)
-             << QGeoCoordinate();
-+#if 0
-         QTest::newRow("brisbane -> melbourne")
-             << BRISBANE
-             << qreal(1374820.1618767744)
-@@ -546,6 +547,7 @@
- #else
-             << QGeoCoordinate(-89.9999947369857, -90.0);
- #endif
-+#endif
-     }
- 
-     void degreesToString()
-

-- 
qtlocation packaging