[SCM] qbs packaging branch, master, updated. debian/1.3.1+dfsg-1-8-g4712caa

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 4712caa95e4ab4072619c8ee4c5332b5c67dbd0c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Oct 6 11:08:36 2014 -0300

    Modify the patch to let qmake install the header.
---
 debian/patches/install_tools_headers.diff | 34 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/debian/patches/install_tools_headers.diff b/debian/patches/install_tools_headers.diff
index d89ceb9..5da1377 100644
--- a/debian/patches/install_tools_headers.diff
+++ b/debian/patches/install_tools_headers.diff
@@ -1,23 +1,21 @@
 Description: move hostosinfo.h to public API, qtcreator needs it
+ This is done in tools.pri. If qbs is at some point built usin qbs
+ itself the previous version of this patch should be used.
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-yet
 Last-Update: 2014-10-06
 
---- a/src/lib/corelib/corelib.qbs
-+++ b/src/lib/corelib/corelib.qbs
-@@ -296,7 +296,6 @@
-             "fileinfo.cpp",
-             "fileinfo.h",
-             "filetime.h",
--            "hostosinfo.h",
-             "id.cpp",
-             "id.h",
-             "installoptions.cpp",
-@@ -336,6 +335,7 @@
-             "cleanoptions.h",
-             "codelocation.h",
-             "error.h",
-+            "hostosinfo.h",
-             "installoptions.h",
-             "preferences.h",
-             "processresult.h",
+---
+ src/lib/corelib/tools/tools.pri |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/lib/corelib/tools/tools.pri
++++ b/src/lib/corelib/tools/tools.pri
+@@ -72,6 +72,7 @@ all_tests {
+         $$PWD/cleanoptions.h \
+         $$PWD/codelocation.h \
+         $$PWD/error.h \
++        $$PWD/hostosinfo.h \
+         $$PWD/settings.h \
+         $$PWD/preferences.h \
+         $$PWD/profile.h \

-- 
qbs packaging