[SCM] qbs packaging branch, master, updated. debian/1.2.2+dfsg-1-10-gd2c89ad

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit d2c89ad9d15fcc11ffdfe034f9dfa19603fdd2c1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 3 11:01:44 2014 +0400

    Update .install files.
---
 debian/changelog       |  1 +
 debian/qbs-dev.install |  1 +
 debian/qbs.install     | 34 ++++++++++++++++++++--------------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5be16d..8fa10dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.3.1+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+    + Update .install files.
   * Fix build failure when multiple compilers are installed.
   * Properly clean up after tests.
   * Update my e-mail address.
diff --git a/debian/qbs-dev.install b/debian/qbs-dev.install
index 851e8ce..c44b014 100644
--- a/debian/qbs-dev.install
+++ b/debian/qbs-dev.install
@@ -8,6 +8,7 @@ usr/include/qbs/language/forward_decls.h
 usr/include/qbs/logging/ilogsink.h
 usr/include/qbs/qbs.h
 usr/include/qbs/qbs_version.pri
+usr/include/qbs/qtenvironment.h
 usr/include/qbs/qtprofilesetup.h
 usr/include/qbs/tools/buildoptions.h
 usr/include/qbs/tools/cleanoptions.h
diff --git a/debian/qbs.install b/debian/qbs.install
index d01e36a..2855728 100644
--- a/debian/qbs.install
+++ b/debian/qbs.install
@@ -6,38 +6,44 @@ usr/bin/qbs-setup-qt
 usr/bin/qbs-setup-toolchains
 usr/lib/*/qbs/plugins/libqbs_cpp_scanner.so
 usr/lib/*/qbs/plugins/libqbs_qt_scanner.so
-usr/share/qbs/imports/qbs/FileInfo/fileinfo.js
-usr/share/qbs/imports/qbs/ModUtils/utils.js
-usr/share/qbs/imports/qbs/Probes/BinaryProbe.qbs
-usr/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
-usr/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
-usr/share/qbs/imports/qbs/Probes/PathProbe.qbs
-usr/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
-usr/share/qbs/imports/qbs/Probes/utils.js
 usr/share/qbs/imports/qbs/base/Application.qbs
 usr/share/qbs/imports/qbs/base/CppApplication.qbs
 usr/share/qbs/imports/qbs/base/DynamicLibrary.qbs
+usr/share/qbs/imports/qbs/base/NodeJSApplication.qbs
 usr/share/qbs/imports/qbs/base/NSISSetup.qbs
+usr/share/qbs/imports/qbs/base/QtApplication.qbs
+usr/share/qbs/imports/qbs/base/QtGuiApplication.qbs
 usr/share/qbs/imports/qbs/base/StaticLibrary.qbs
 usr/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
 usr/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs
+usr/share/qbs/imports/qbs/BundleTools/bundle-tools.js
+usr/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
+usr/share/qbs/imports/qbs/FileInfo/fileinfo.js
+usr/share/qbs/imports/qbs/ModUtils/utils.js
+usr/share/qbs/imports/qbs/PathTools/path-tools.js
+usr/share/qbs/imports/qbs/Probes/BinaryProbe.qbs
+usr/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
+usr/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
+usr/share/qbs/imports/qbs/Probes/PathProbe.qbs
+usr/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
+usr/share/qbs/imports/qbs/UnixUtils/unix-utils.js
+usr/share/qbs/imports/qbs/WindowsUtils/windows-utils.js
 usr/share/qbs/modules/cpp/CppModule.qbs
 usr/share/qbs/modules/cpp/DarwinGCC.qbs
-usr/share/qbs/modules/cpp/GenericGCC.qbs
-usr/share/qbs/modules/cpp/UnixGCC.qbs
-usr/share/qbs/modules/cpp/bundle-tools.js
-usr/share/qbs/modules/cpp/darwin-tools.js
 usr/share/qbs/modules/cpp/gcc.js
+usr/share/qbs/modules/cpp/GenericGCC.qbs
 usr/share/qbs/modules/cpp/genericunix-gcc.qbs
 usr/share/qbs/modules/cpp/ios-gcc.qbs
 usr/share/qbs/modules/cpp/linux-gcc.qbs
 usr/share/qbs/modules/cpp/msvc.js
 usr/share/qbs/modules/cpp/osx-gcc.qbs
-usr/share/qbs/modules/cpp/path-tools.js
+usr/share/qbs/modules/cpp/UnixGCC.qbs
 usr/share/qbs/modules/cpp/windows-mingw.qbs
 usr/share/qbs/modules/cpp/windows-msvc.qbs
-usr/share/qbs/modules/cpp/windows.js
+usr/share/qbs/modules/ib/ib.js
 usr/share/qbs/modules/ib/IBModule.qbs
+usr/share/qbs/modules/nodejs/NodeJS.qbs
 usr/share/qbs/modules/nsis/NSISModule.qbs
 usr/share/qbs/modules/qbs/common.qbs
+usr/share/qbs/modules/typescript/TypeScriptModule.qbs
 usr/share/qbs/modules/wix/WiXModule.qbs

-- 
qbs packaging