[SCM] qtlocation packaging branch, experimental, updated. debian/5.3.2-2-7-g82f176b

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 3c3d1b9e069c7f7d9d27a6bb24297141e27cb9c1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 27 15:38:31 2014 +0300

    Drop disable_qgeocircle_extendShape_tests.patch, no longer needed.
---
 debian/changelog                                   |  1 +
 .../disable_qgeocircle_extendShape_tests.patch     | 41 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c2db26..33ee06d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtlocation-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.4.0.
+  * Drop disable_qgeocircle_extendShape_tests.patch, no longer needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Dec 2014 15:35:49 +0300
 
diff --git a/debian/patches/disable_qgeocircle_extendShape_tests.patch b/debian/patches/disable_qgeocircle_extendShape_tests.patch
deleted file mode 100644
index 4acd086..0000000
--- a/debian/patches/disable_qgeocircle_extendShape_tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: disable qgeocircle::extendShape* tests.
- This tests fail on i386 most probably due to qFuzzyCompare() being used.
- Filled https://bugreports.qt-project.org/browse/QTBUG-41447 for it.
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Bug-Qt: https://bugreports.qt-project.org/browse/QTBUG-41447
-Forwarded: not-needed
-
----
- tests/auto/qgeocircle/tst_qgeocircle.cpp |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/tests/auto/qgeocircle/tst_qgeocircle.cpp
-+++ b/tests/auto/qgeocircle/tst_qgeocircle.cpp
-@@ -73,8 +73,9 @@ private slots:
-     void contains_data();
-     void contains();
- 
--    void extendShape();
--    void extendShape_data();
-+    // Failing on i386, see https://bugreports.qt-project.org/browse/QTBUG-41447
-+    //void extendShape();
-+    //void extendShape_data();
- 
-     void areaComparison();
-     void areaComparison_data();
-@@ -316,6 +317,7 @@ void tst_QGeoCircle::contains()
-     QCOMPARE(area.contains(probe), result);
- }
- 
-+/*
- void tst_QGeoCircle::extendShape()
- {
-     QFETCH(QGeoCircle, circle);
-@@ -364,6 +366,7 @@ void tst_QGeoCircle::extendShape_data()
-             << false
-             << false;
- }
-+*/
- 
- void tst_QGeoCircle::areaComparison_data()
- {
diff --git a/debian/patches/series b/debian/patches/series
index cf8feec..726d5ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-disable_qgeocircle_extendShape_tests.patch
 disable_failing_tests.patch

-- 
qtlocation packaging