[SCM] qbs packaging branch, master, updated. debian/1.4.3+dfsg-1-3-gd2fbb17

Thu Oct 29 12:04:33 UTC 2015

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

The following commit has been merged in the master branch:
commit d2fbb1767cbcdb447f74cb801b1393b59f9e7268
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Oct 29 14:55:06 2015 +0300

    Split files in /usr/share into new qbs-common package.
---
 debian/changelog                           |  1 +
 debian/control                             | 13 +++++-
 debian/{qbs.install => qbs-common.install} |  9 ----
 debian/qbs.install                         | 74 ------------------------------
 debian/rules                               |  1 +
 5 files changed, 14 insertions(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c998eb7..a34d70c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qbs (1.4.3+dfsg-2) UNRELEASED; urgency=medium
 
   * Do not try to run tests during arch-indep builds.
+  * Split files in /usr/share into new qbs-common package.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 29 Oct 2015 11:22:24 +0300
 
diff --git a/debian/control b/debian/control
index 2847f61..d4e03ad 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qbs.git
 Package: qbs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qbs-common, ${misc:Depends}, ${shlibs:Depends}
 Breaks: qtcreator (<< 3.2.1+dfsg-8~)
 Replaces: qtcreator (<< 3.2.1+dfsg-8~)
 Description: Qt Build Suite
@@ -28,6 +28,17 @@ Description: Qt Build Suite
  .
  This package contains Qt Build Suite, a cross-platform build tool.
 
+Package: qbs-common
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: qbs (<< 1.4.3+dfsg-2~)
+Replaces: qbs (<< 1.4.3+dfsg-2~)
+Description: Qt Build Suite static files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains Qt Build Suite shared static files.
+
 Package: libqbscore1
 Architecture: any
 Section: libs
diff --git a/debian/qbs.install b/debian/qbs-common.install
similarity index 93%
copy from debian/qbs.install
copy to debian/qbs-common.install
index 0431ae3..92323d2 100644
--- a/debian/qbs.install
+++ b/debian/qbs-common.install
@@ -1,12 +1,3 @@
-usr/bin/qbs
-usr/bin/qbs-config
-usr/bin/qbs-config-ui
-usr/bin/qbs-qmltypes
-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
 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
diff --git a/debian/qbs.install b/debian/qbs.install
index 0431ae3..788935f 100644
--- a/debian/qbs.install
+++ b/debian/qbs.install
@@ -7,77 +7,3 @@ 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/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/AndroidNdkProbe.qbs
-usr/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
-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/JdkProbe.qbs
-usr/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
-usr/share/qbs/imports/qbs/Probes/PathProbe.qbs
-usr/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
-usr/share/qbs/imports/qbs/Probes/TypeScriptProbe.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
-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/XPCService.qbs
-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/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
-usr/share/qbs/modules/cpp/UnixGCC.qbs
-usr/share/qbs/modules/cpp/gcc.js
-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/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/io/qt/qbs/Artifact.java
-usr/share/qbs/modules/java/io/qt/qbs/ArtifactListJsonWriter.java
-usr/share/qbs/modules/java/io/qt/qbs/ArtifactListTextWriter.java
-usr/share/qbs/modules/java/io/qt/qbs/ArtifactListWriter.java
-usr/share/qbs/modules/java/io/qt/qbs/ArtifactListXmlWriter.java
-usr/share/qbs/modules/java/io/qt/qbs/tools/JavaCompilerScannerTool.java
-usr/share/qbs/modules/java/io/qt/qbs/tools/utils/JavaCompilerOptions.java
-usr/share/qbs/modules/java/io/qt/qbs/tools/utils/JavaCompilerScanner.java
-usr/share/qbs/modules/java/io/qt/qbs/tools/utils/NullFileObject.java
-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
-usr/share/qbs/modules/typescript/TypeScriptModule.qbs
-usr/share/qbs/modules/typescript/qbs-tsc-scan/qbs-tsc-scan.ts
-usr/share/qbs/modules/typescript/typescript.js
-usr/share/qbs/modules/wix/WiXModule.qbs
diff --git a/debian/rules b/debian/rules
index d9ec75c..54998c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ override_dh_auto_build-indep:
 
 override_dh_auto_install-indep:
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-pro-install_subtargets
 
 	# Remove empty directories
 	rmdir $(CURDIR)/debian/tmp/usr/share/doc/qbs/html/images/used-in-examples/

-- 
qbs packaging

