[SCM] qbs packaging branch, master, updated. debian/1.5.0+dfsg-3-2-gcbc08a3

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit cbc08a3f3aaff15d75872c8a6bdf03e14ee04d0c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jun 18 12:12:27 2016 +0300

    Refresh skip_test_concurrent.diff.
---
 debian/changelog                         | 1 +
 debian/patches/skip_test_concurrent.diff | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8aa92ba..9acb04b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qbs (1.5.1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh skip_test_concurrent.diff.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 18 Jun 2016 12:11:44 +0300
 
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index 327b2fd..fc3edf3 100644
--- a/debian/patches/skip_test_concurrent.diff
+++ b/debian/patches/skip_test_concurrent.diff
@@ -5,7 +5,7 @@ Last-Update: 2016-03-20
 
 --- a/tests/auto/blackbox/tst_blackbox.cpp
 +++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -1124,6 +1124,7 @@
+@@ -1125,6 +1125,7 @@
  
  void TestBlackbox::concurrentExecutor()
  {

-- 
qbs packaging