[SCM] qbs packaging branch, experimental, updated. debian/1.4-7fd456-1-5-gd187b8e

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit e0bc9b21ede3edb7d91212a2ef3254d5c003d34d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Mar 14 13:39:01 2015 +0300

    Sort debian/qbs.install.
---
 debian/changelog   |  1 +
 debian/qbs.install | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe1274c..bd58f79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.4~7fd456-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Fix a typo in previous changelog entry.
+  * Sort debian/qbs.install.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Mar 2015 13:35:25 +0300
 
diff --git a/debian/qbs.install b/debian/qbs.install
index d277fef..3f26401 100644
--- a/debian/qbs.install
+++ b/debian/qbs.install
@@ -2,8 +2,8 @@ usr/bin/qbs
 usr/bin/qbs-config
 usr/bin/qbs-config-ui
 usr/bin/qbs-qmltypes
-usr/bin/qbs-setup-qt
 usr/bin/qbs-setup-android
+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
@@ -19,9 +19,17 @@ 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/imports/qbs/base/AndroidApk.qbs
 usr/share/qbs/imports/qbs/base/Application.qbs
+usr/share/qbs/imports/qbs/base/ApplicationExtension.qbs
+usr/share/qbs/imports/qbs/base/AutotestRunner.qbs
 usr/share/qbs/imports/qbs/base/CppApplication.qbs
 usr/share/qbs/imports/qbs/base/DynamicLibrary.qbs
+usr/share/qbs/imports/qbs/base/InstallPackage.qbs
+usr/share/qbs/imports/qbs/base/JavaClassCollection.qbs
+usr/share/qbs/imports/qbs/base/JavaJarFile.qbs
+usr/share/qbs/imports/qbs/base/Library.qbs
+usr/share/qbs/imports/qbs/base/LoadableModule.qbs
 usr/share/qbs/imports/qbs/base/NSISSetup.qbs
 usr/share/qbs/imports/qbs/base/NodeJSApplication.qbs
 usr/share/qbs/imports/qbs/base/QtApplication.qbs
@@ -29,23 +37,13 @@ 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/base/AndroidApk.qbs
 usr/share/qbs/imports/qbs/base/XPCService.qbs
-usr/share/qbs/imports/qbs/base/AutotestRunner.qbs
-usr/share/qbs/imports/qbs/base/Library.qbs
-usr/share/qbs/imports/qbs/base/LoadableModule.qbs
-usr/share/qbs/imports/qbs/base/JavaJarFile.qbs
-usr/share/qbs/imports/qbs/base/InstallPackage.qbs
-usr/share/qbs/imports/qbs/base/JavaClassCollection.qbs
-usr/share/qbs/imports/qbs/base/ApplicationExtension.qbs
-usr/share/qbs/modules/java/JavaModule.qbs
-usr/share/qbs/modules/java/utils.js
 usr/share/qbs/modules/Android/ndk/ndk.qbs
 usr/share/qbs/modules/Android/ndk/utils.js
 usr/share/qbs/modules/Android/sdk/sdk.qbs
 usr/share/qbs/modules/Android/sdk/utils.js
-usr/share/qbs/modules/bundle/BundleModule.qbs
 usr/share/qbs/modules/archiver/archiver.qbs
+usr/share/qbs/modules/bundle/BundleModule.qbs
 usr/share/qbs/modules/cpp/CppModule.qbs
 usr/share/qbs/modules/cpp/DarwinGCC.qbs
 usr/share/qbs/modules/cpp/GenericGCC.qbs
@@ -60,6 +58,8 @@ usr/share/qbs/modules/cpp/windows-mingw.qbs
 usr/share/qbs/modules/cpp/windows-msvc.qbs
 usr/share/qbs/modules/ib/IBModule.qbs
 usr/share/qbs/modules/ib/ib.js
+usr/share/qbs/modules/java/JavaModule.qbs
+usr/share/qbs/modules/java/utils.js
 usr/share/qbs/modules/nodejs/NodeJS.qbs
 usr/share/qbs/modules/nsis/NSISModule.qbs
 usr/share/qbs/modules/qbs/common.qbs

-- 
qbs packaging