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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit bbf335c6d3c870f01884d9302361c261541ea505
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 7 10:25:23 2014 +0400

    Do not apply install_tools_headers.diff for now.
    
    Upstream said we should not do that.
    
    Keep that patch in debian/patches/ for now.
---
 debian/changelog       | 4 +---
 debian/patches/series  | 1 -
 debian/qbs-dev.install | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7ebbe3..f47d2ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,10 @@ qbs (1.3.1+dfsg-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Enable disable_rpath and qbs_enable_project_file_updates
-    configuration flags, thanks Adam Majer for the patch
-    (really closes: #763365).
+    configuration flags, thanks Adam Majer for the patch.
   * 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/series b/debian/patches/series
index f3cc3df..4101251 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 endianness.diff
-install_tools_headers.diff
diff --git a/debian/qbs-dev.install b/debian/qbs-dev.install
index b8fc7ed..c44b014 100644
--- a/debian/qbs-dev.install
+++ b/debian/qbs-dev.install
@@ -14,7 +14,6 @@ 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