[SCM] qbs packaging branch, master, updated. debian/1.8.1+dfsg-3-3-g1ebc5b8

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 1ebc5b8cbe3a3b9e01a1a1ac4542950257d7b34a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Sep 11 17:15:16 2017 +0300

    Refresh and rebase other patches.
---
 debian/changelog                           |  1 +
 debian/patches/disable_tests_qtscript.diff | 12 ++++++------
 debian/patches/kfreebsd_soname.diff        |  2 +-
 debian/patches/skip_test_concurrent.diff   |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad4e50a..c01e2b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.9.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop install_missing_header.diff, it was coming from upstream.
+  * Refresh and rebase other patches.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 11 Sep 2017 16:36:28 +0300
 
diff --git a/debian/patches/disable_tests_qtscript.diff b/debian/patches/disable_tests_qtscript.diff
index ab6a9e0..84b18da 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: 2016-12-20
+Last-Update: 2017-09-11
 
 --- a/tests/auto/auto.pro
 +++ b/tests/auto/auto.pro
-@@ -11,5 +11,10 @@
-     cmdlineparser \
-     blackbox/blackbox.pro \
+@@ -13,5 +13,10 @@
+     blackbox/blackbox-apple.pro \
      blackbox/blackbox-clangdb.pro \
--    blackbox/blackbox-java.pro \
+     blackbox/blackbox-java.pro \
+-    blackbox/blackbox-qt.pro \
 -    api
-+    blackbox/blackbox-java.pro
++    blackbox/blackbox-qt.pro
 +
 +equals(QT_ARCH, i386) | equals(QT_ARCH, x86_64) | \
 +equals(QT_ARCH, arm) | equals(QT_ARCH, arm64) | \
diff --git a/debian/patches/kfreebsd_soname.diff b/debian/patches/kfreebsd_soname.diff
index 234515f..293787b 100644
--- a/debian/patches/kfreebsd_soname.diff
+++ b/debian/patches/kfreebsd_soname.diff
@@ -5,7 +5,7 @@ Last-Update: 2017-01-04
 
 --- a/src/lib/library.pri
 +++ b/src/lib/library.pri
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  include(../../qbs_version.pri)
  VERSION = $${QBS_VERSION}
  
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index ff06922..156e383 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 @@
+@@ -1008,6 +1008,7 @@
  
  void TestBlackbox::concurrentExecutor()
  {

-- 
qbs packaging