[SCM] qbs packaging branch, master, updated. debian/1.7.0+dfsg-4-3-gef1adac

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit d6da81ef297544e29edc16bd88c722fb07c4caba
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue May 23 11:08:17 2017 +0300

    Update patches for 1.7.2.
---
 debian/changelog                         |  1 +
 debian/patches/fix_race_condition.diff   | 35 --------------------------------
 debian/patches/series                    |  1 -
 debian/patches/skip_test_concurrent.diff |  2 +-
 4 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f04437e..50ec27b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qbs (1.7.2+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop skip_test_concurrent.diff, applied upstream.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 23 May 2017 11:07:24 +0300
 
diff --git a/debian/patches/fix_race_condition.diff b/debian/patches/fix_race_condition.diff
deleted file mode 100644
index a171781..0000000
--- a/debian/patches/fix_race_condition.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: fix race condition in qmake build
-Origin: https://codereview.qt-project.org/181319
-Bug: https://bugreports.qt.io/browse/QBS-1091
-Last-Update: 2017-01-04
-
---- a/tests/auto/blackbox/blackbox-clangdb.pro
-+++ b/tests/auto/blackbox/blackbox-clangdb.pro
-@@ -2,6 +2,7 @@
- 
- HEADERS = tst_blackboxbase.h tst_clangdb.h
- SOURCES = tst_blackboxbase.cpp tst_clangdb.cpp
-+OBJECTS_DIR = clangdb
- 
- include(../auto.pri)
- 
---- a/tests/auto/blackbox/blackbox-java.pro
-+++ b/tests/auto/blackbox/blackbox-java.pro
-@@ -2,6 +2,7 @@
- 
- HEADERS = tst_blackboxjava.h tst_blackboxbase.h
- SOURCES = tst_blackboxjava.cpp tst_blackboxbase.cpp
-+OBJECTS_DIR = java
- 
- include(../auto.pri)
- 
---- a/tests/auto/blackbox/blackbox.pro
-+++ b/tests/auto/blackbox/blackbox.pro
-@@ -2,6 +2,7 @@
- 
- HEADERS = tst_blackbox.h tst_blackboxbase.h
- SOURCES = tst_blackbox.cpp tst_blackboxbase.cpp
-+OBJECTS_DIR = generic
- 
- include(../auto.pri)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 97c365a..3c5aa07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@ remove_rpaths.diff
 disable_tests_qtscript.diff
 skip_test_concurrent.diff
 fix_ftbfs_gcc6.diff
-fix_race_condition.diff
 kfreebsd_soname.diff
 qmake_documentation.diff
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index a698269..c016d87 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
-@@ -967,6 +967,7 @@
+@@ -1029,6 +1029,7 @@
  
  void TestBlackbox::concurrentExecutor()
  {

-- 
qbs packaging