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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 0d02e0cb4d19875b1740384294fd617a355567e2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 4 20:49:40 2017 +0300

    Fix race condition which breaks parallel builds.
---
 debian/changelog                       |  1 +
 debian/patches/fix_race_condition.diff | 35 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9c0a2b5..71bc08a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.7.0+dfsg-2) UNRELEASED; urgency=medium
 
   * Drop ${shlibs:Depends} from qbs-dev, it does not have any binary code.
   * Update debian/copyright.
+  * Fix race condition which breaks parallel builds (fix_race_condition.diff).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 23 Dec 2016 12:49:42 +0300
 
diff --git a/debian/patches/fix_race_condition.diff b/debian/patches/fix_race_condition.diff
new file mode 100644
index 0000000..a171781
--- /dev/null
+++ b/debian/patches/fix_race_condition.diff
@@ -0,0 +1,35 @@
+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 a0e8336..b980c0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove_rpaths.diff
 disable_tests_qtscript.diff
 skip_test_concurrent.diff
 fix_ftbfs_gcc6.diff
+fix_race_condition.diff

-- 
qbs packaging