[SCM] qbs packaging branch, master, updated. debian/1.6.0+dfsg-2-5-g0e8d833

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 5e614adbf7b0f80e2a0c8dd26636c7f84a890d56
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Nov 13 19:27:59 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 922406b..f10419e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qbs (1.6.1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh skip_test_concurrent.diff.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 13 Nov 2016 19:25:30 +0300
 
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index ff06922..e25cb4b 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
-@@ -1177,6 +1177,7 @@
+@@ -1171,6 +1171,7 @@
  
  void TestBlackbox::concurrentExecutor()
  {

-- 
qbs packaging