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

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 5d37835bf25f6aadaad4884c29c6acf074fa66f7
Author: Adam Majer <adamm at zombino.com>
Date:   Sun Jul 31 22:49:54 2016 +0200

    Remove /usr/include from INCLUDEPATH list
    
    Adding this default included path causes FTBFS
    for software using qbs with GCC 6
---
 debian/changelog                   |  9 +++++++++
 debian/patches/fix_ftbfs_gcc6.diff | 13 +++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e78d7a0..6b3b359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+qbs (1.5.1+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Adam Majer ]
+  * Remove /usr/include from INCLUDEPATH list of installed
+    .pri file. Adding this default included path causes FTBFS
+    for software using qbs with GCC 6 (fix_ftbfs_gcc6.diff)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jul 2016 22:39:33 +0200
+
 qbs (1.5.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/fix_ftbfs_gcc6.diff b/debian/patches/fix_ftbfs_gcc6.diff
new file mode 100644
index 0000000..f3927d4
--- /dev/null
+++ b/debian/patches/fix_ftbfs_gcc6.diff
@@ -0,0 +1,13 @@
+Index: qbs/src/lib/corelib/use_installed_corelib.pri
+===================================================================
+--- qbs.orig/src/lib/corelib/use_installed_corelib.pri
++++ qbs/src/lib/corelib/use_installed_corelib.pri
+@@ -29,7 +29,7 @@ win32 {
+     LIBS += $$QBSCORELIB
+ }
+ 
+-INCLUDEPATH += $${PWD} $${PWD}/..
++INCLUDEPATH += $${PWD}
+ 
+ CONFIG(static, static|shared) {
+     DEFINES += QBS_STATIC_LIB
diff --git a/debian/patches/series b/debian/patches/series
index ff017cc..e4d1fa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ remove_rpaths.diff
 disable_tests_qtscript.diff
 kfreebsd.diff
 skip_test_concurrent.diff
+fix_ftbfs_gcc6.diff

-- 
qbs packaging