[SCM] qtlocation packaging branch, ubuntu, updated. ubuntu/5.4.2-1ubuntu1-8-g8b493ef

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit ba34fc86fab88f0cd33622097c877dfd5d05f9e6
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 14 12:25:27 2015 +0000

    Skip qmlinterface tests since they fail to use the module.
---
 debian/changelog                        |  1 +
 debian/patches/skip_failing_tests.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 308c219..c3c1d8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtlocation-opensource-src (5.5.0-0ubuntu1) UNRELEASED; urgency=medium
   * Update .install files.
   * Update symbols from build logs.
   * Rebase debian/patches/appSpecificTileCache.diff.
+  * Skip qmlinterface tests since they fail to use the module.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 27 Mar 2015 07:03:26 +0000
 
diff --git a/debian/patches/skip_failing_tests.patch b/debian/patches/skip_failing_tests.patch
index 57450ff..3e237cc 100644
--- a/debian/patches/skip_failing_tests.patch
+++ b/debian/patches/skip_failing_tests.patch
@@ -16,6 +16,15 @@ Last-Updated: 2014-01-08
             qplacemanager_unsupported \
             placesplugin_unsupported
  
+@@ -30,7 +30,7 @@
+            placesplugin_unsupported
+ 
+     #misc tests
+-    SUBDIRS +=  qmlinterface \
++    SUBDIRS += \
+            cmake \
+            doublevectors
+ 
 @@ -53,7 +52,6 @@
             qgeoroutexmlparser \
             qgeomapcontroller \
@@ -84,3 +93,4 @@ diff -urN qtlocation-opensource-src-5.2.0.old/tests/auto/qgeocoordinate/tst_qgeo
      }
  
      void atDistanceAndAzimuth()
+

-- 
qtlocation packaging