[SCM] qtdeclarative packaging branch, ubuntu, updated. ubuntu/5.5.1-2ubuntu7-1-ga97c2aa

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit a97c2aa64aaf444c9c43df9dd86be92b2cc04ebc
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon May 23 05:57:13 2016 +0000

    Rebuild for arm64 gles switch.
---
 debian/changelog                           | 7 +++++++
 debian/patches/disable_failing_tests.patch | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a59bd78..319f2c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtdeclarative-opensource-src (5.5.1-2ubuntu8~2) yakkety; urgency=medium
+
+  * Rebuild for arm64 gles switch.
+  * Skip some widget tests that fail due to mesa software rendering shaders.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 23 May 2016 05:56:56 +0000
+
 qtdeclarative-opensource-src (5.5.1-2ubuntu7) yakkety; urgency=medium
 
   [ Timo Jyrinki ]
diff --git a/debian/patches/disable_failing_tests.patch b/debian/patches/disable_failing_tests.patch
index 639812f..684f766 100644
--- a/debian/patches/disable_failing_tests.patch
+++ b/debian/patches/disable_failing_tests.patch
@@ -1,7 +1,7 @@
 diff -urN qtdeclarative-opensource-src-5.5.0.old/tests/auto/auto.pro qtdeclarative-opensource-src-5.5.0/tests/auto/auto.pro
 --- qtdeclarative-opensource-src-5.5.0.old/tests/auto/auto.pro	2015-06-29 20:12:24.000000000 +0000
 +++ qtdeclarative-opensource-src-5.5.0/tests/auto/auto.pro	2015-07-08 07:34:54.694933159 +0000
-@@ -1,10 +1,10 @@
+@@ -1,15 +1,14 @@
  TEMPLATE=subdirs
  SUBDIRS=\
 -    qml \
@@ -15,6 +15,11 @@ diff -urN qtdeclarative-opensource-src-5.5.0.old/tests/auto/auto.pro qtdeclarati
      cmake \
      installed_cmake \
      toolsupport
+ 
+-qtHaveModule(widgets): SUBDIRS += quickwidgets
+ 
+ qmldevtools.CONFIG = host_build
+ 
 diff -urN qtdeclarative-opensource-src-5.5.0.old/tests/auto/qml/debugger/debugger.pro qtdeclarative-opensource-src-5.5.0/tests/auto/qml/debugger/debugger.pro
 --- qtdeclarative-opensource-src-5.5.0.old/tests/auto/qml/debugger/debugger.pro	2015-06-29 20:12:19.000000000 +0000
 +++ qtdeclarative-opensource-src-5.5.0/tests/auto/qml/debugger/debugger.pro	2015-07-08 07:35:10.794933489 +0000

-- 
qtdeclarative packaging