[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-14-gd43b1c8

Timo Jyrinki timo at moszumanska.debian.org
Fri Sep 2 11:06:01 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit d43b1c8c9bf4fe630aee1a74c417272aee51377f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Aug 31 08:34:39 2016 +0000

    Disable printsupport tests that started failing but only on builders,  possibly with new glibc. See LP: #1612767 for details.
---
 debian/changelog                  |  2 ++
 debian/patches/enable-tests.patch | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba43683..d31ce95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ qtbase-opensource-src (5.6.1+dfsg-3ubuntu3) UNRELEASED; urgency=medium
   * debian/patches/Make-sure-connection-is-not-null-before-using-it.patch:
     - Fix unity8 crasher (LP: #1612309)
   * Update symbols with pkgkde-mark-qt5-private-symbols.
+  * Disable printsupport tests that started failing but only on builders, 
+    possibly with new glibc. See LP: #1612767 for details.
 
   [ Dmitry Shachnev ]
   * Backport some upstream patches to add support for D-Bus global menus,
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index 9867317..d3d3bcf 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -23783,3 +23783,14 @@ diff -urN qtbase-opensource-src-5.6.1.old/tests/auto/corelib/tools/tools.pro qtb
      qalgorithms \
      qarraydata \
      qarraydata_strictiterators \
+diff -urN qtbase-opensource-src-5.6.1.old/tests/auto/auto.pro qtbase-opensource-src-5.6.1/tests/auto/auto.pro
+--- qtbase-opensource-src-5.6.1.old/tests/auto/auto.pro	2016-05-25 15:46:17.000000000 +0000
++++ qtbase-opensource-src-5.6.1/tests/auto/auto.pro	2016-08-31 08:31:31.779859269 +0000
+@@ -13,7 +13,6 @@
+     concurrent \
+     other \
+     widgets \
+-    printsupport \
+     cmake \
+     installed_cmake
+ 

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list