[SCM] qbs packaging branch, master, updated. debian/1.6.1+dfsg-1-2-g6b5e40f

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 6b5e40f81cd1c59934fe9c1e6512bf6a82a8d59c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 20 15:35:27 2016 +0300

    Refresh and rebase the patches for the new release.
---
 debian/changelog                           |  1 +
 debian/patches/disable_tests_qtscript.diff | 12 ++++++------
 debian/patches/skip_test_concurrent.diff   |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fcef5c..f40bbd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qbs (1.7.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh and rebase the patches for the new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 20 Dec 2016 15:33:48 +0300
 
diff --git a/debian/patches/disable_tests_qtscript.diff b/debian/patches/disable_tests_qtscript.diff
index 27cdbd4..ab6a9e0 100644
--- a/debian/patches/disable_tests_qtscript.diff
+++ b/debian/patches/disable_tests_qtscript.diff
@@ -14,17 +14,17 @@ Description: limit API tests to only common architectures
  API tests on non-common architectures to make the build pass.
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
-Last-Update: 2015-07-18
+Last-Update: 2016-12-20
 
 --- a/tests/auto/auto.pro
 +++ b/tests/auto/auto.pro
-@@ -9,5 +9,10 @@
- 
- SUBDIRS += \
+@@ -11,5 +11,10 @@
      cmdlineparser \
--    blackbox \
+     blackbox/blackbox.pro \
+     blackbox/blackbox-clangdb.pro \
+-    blackbox/blackbox-java.pro \
 -    api
-+    blackbox
++    blackbox/blackbox-java.pro
 +
 +equals(QT_ARCH, i386) | equals(QT_ARCH, x86_64) | \
 +equals(QT_ARCH, arm) | equals(QT_ARCH, arm64) | \
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index e25cb4b..a698269 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
-@@ -1171,6 +1171,7 @@
+@@ -967,6 +967,7 @@
  
  void TestBlackbox::concurrentExecutor()
  {

-- 
qbs packaging