[SCM] qbs packaging branch, master, updated. debian/1.8.1+dfsg-4-10-g0947d48

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 447979c22b9be10d4df689c21e86ccf5ef839f7d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 16 20:43:28 2017 +0300

    Update to 1.10.0.
---
 debian/changelog                           | 2 +-
 debian/patches/disable_tests_qtscript.diff | 2 +-
 debian/patches/skip_test_concurrent.diff   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75d3329..8ac745f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qbs (1.9.0+dfsg-1) UNRELEASED; urgency=medium
+qbs (1.10.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop install_missing_header.diff, it was coming from upstream.
diff --git a/debian/patches/disable_tests_qtscript.diff b/debian/patches/disable_tests_qtscript.diff
index 84b18da..e6e2e05 100644
--- a/debian/patches/disable_tests_qtscript.diff
+++ b/debian/patches/disable_tests_qtscript.diff
@@ -18,7 +18,7 @@ Last-Update: 2017-09-11
 
 --- a/tests/auto/auto.pro
 +++ b/tests/auto/auto.pro
-@@ -13,5 +13,10 @@
+@@ -14,5 +14,10 @@
      blackbox/blackbox-apple.pro \
      blackbox/blackbox-clangdb.pro \
      blackbox/blackbox-java.pro \
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index 156e383..e89aea5 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
-@@ -1008,6 +1008,7 @@
+@@ -1297,6 +1297,7 @@
  
  void TestBlackbox::concurrentExecutor()
  {

-- 
qbs packaging