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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 1627e9813b7c705cc00e80eb6b8ba5e7dcfe3905
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 6 14:01:48 2014 +0400

    Add a patch to install hostosinfo.h, QtCreator needs it.
---
 debian/changelog                          |  1 +
 debian/patches/endianness.diff            |  2 +-
 debian/patches/install_tools_headers.diff | 23 +++++++++++++++++++++++
 debian/patches/series                     |  1 +
 debian/qbs-dev.install                    |  1 +
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 79645cf..d7ebbe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qbs (1.3.1+dfsg-2) UNRELEASED; urgency=medium
   * Add 4 new symbols introduced by the previous change.
   * Add a patch to correctly detect endianness of all supported
     by Debian architectures.
+  * Add a patch to install hostosinfo.h, QtCreator needs it.
   * Add lib/ to LD_LIBRARY_PATH when running tests (should fix
     build failures on kfreebsd and hurd).
 
diff --git a/debian/patches/endianness.diff b/debian/patches/endianness.diff
index e8a52a0..2d08c3c 100644
--- a/debian/patches/endianness.diff
+++ b/debian/patches/endianness.diff
@@ -1,6 +1,6 @@
 Description: detect endianness of all Debian supported archs
 Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not yet
+Forwarded: not-yet
 Last-Update: 2014-10-06
 
 --- a/src/lib/corelib/tools/hostosinfo.h
diff --git a/debian/patches/install_tools_headers.diff b/debian/patches/install_tools_headers.diff
new file mode 100644
index 0000000..d89ceb9
--- /dev/null
+++ b/debian/patches/install_tools_headers.diff
@@ -0,0 +1,23 @@
+Description: move hostosinfo.h to public API, qtcreator needs it
+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",
diff --git a/debian/patches/series b/debian/patches/series
index 4101251..f3cc3df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 endianness.diff
+install_tools_headers.diff
diff --git a/debian/qbs-dev.install b/debian/qbs-dev.install
index c44b014..b8fc7ed 100644
--- a/debian/qbs-dev.install
+++ b/debian/qbs-dev.install
@@ -14,6 +14,7 @@ usr/include/qbs/tools/buildoptions.h
 usr/include/qbs/tools/cleanoptions.h
 usr/include/qbs/tools/codelocation.h
 usr/include/qbs/tools/error.h
+usr/include/qbs/tools/hostosinfo.h
 usr/include/qbs/tools/installoptions.h
 usr/include/qbs/tools/preferences.h
 usr/include/qbs/tools/processresult.h

-- 
qbs packaging