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

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 932765c2ac214635d98f6c13947606bbe26bd0d9
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jan 19 11:47:39 2016 +0000

    Temporarily disable tests.
---
 debian/changelog | 7 +++++--
 debian/rules     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 683b6fb..1fecc63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-qtbase-opensource-src (5.6.0~beta+dfsg-5) UNRELEASED; urgency=medium
+qtbase-opensource-src (5.6.0~beta+dfsg-4ubuntu1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Fix URLs pointing to our "How to package Qt based stuff" page
     (Closes: #810282). Thanks Jakob Haufe for the pointer.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Jan 2016 12:17:40 -0300
+  [ Timo Jyrinki ]
+  * New upstream release. 
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 
 qtbase-opensource-src (5.6.0~beta+dfsg-4) experimental; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index e1beecd..868f189 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,7 +182,7 @@ endif
 override_dh_auto_test:
 ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(testrun_architectures)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-		xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH) -k
+		#xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH) -k
 endif
 endif
 

-- 
qtbase packaging