[SCM] qbs packaging branch, master, updated. debian/1.7.0+dfsg-4-12-g0050de0

Dmitry Shachnev mitya57 at moszumanska.debian.org
Tue Jun 6 12:40:15 UTC 2017


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

The following commit has been merged in the master branch:
commit 0050de0ecacfb3472e31df7bc79f97e3c80c2dcb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jun 6 15:40:04 2017 +0300

    Update install files for the new release.
---
 debian/changelog          | 1 +
 debian/qbs-common.install | 4 ++++
 debian/qbs-dev.install    | 2 ++
 debian/qbs.install        | 2 ++
 debian/rules              | 1 +
 5 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5c520fa..63d331d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qbs (1.8.0+dfsg-1) UNRELEASED; urgency=medium
   * Improve package descriptions, thanks Joerg Bornemann (closes: #863874).
   * Update debian/copyright.
   * Update docs installation code for the new release.
+  * Update install files for the new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 06 Jun 2017 13:58:02 +0300
 
diff --git a/debian/qbs-common.install b/debian/qbs-common.install
index 182aaf3..a531828 100644
--- a/debian/qbs-common.install
+++ b/debian/qbs-common.install
@@ -61,11 +61,14 @@ usr/share/qbs/modules/cpp/GenericGCC.qbs
 usr/share/qbs/modules/cpp/LinuxGCC.qbs
 usr/share/qbs/modules/cpp/UnixGCC.qbs
 usr/share/qbs/modules/cpp/android-gcc.qbs
+usr/share/qbs/modules/cpp/freebsd-gcc.qbs
+usr/share/qbs/modules/cpp/freebsd.js
 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/macos-gcc.qbs
 usr/share/qbs/modules/cpp/msvc.js
+usr/share/qbs/modules/cpp/qnx-qcc.qbs
 usr/share/qbs/modules/cpp/tvos-gcc.qbs
 usr/share/qbs/modules/cpp/watchos-gcc.qbs
 usr/share/qbs/modules/cpp/windows-mingw.qbs
@@ -92,6 +95,7 @@ usr/share/qbs/modules/nodejs/NodeJS.qbs
 usr/share/qbs/modules/nodejs/nodejs.js
 usr/share/qbs/modules/nsis/NSISModule.qbs
 usr/share/qbs/modules/qbs/common.qbs
+usr/share/qbs/modules/qnx/qnx.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
diff --git a/debian/qbs-dev.install b/debian/qbs-dev.install
index d363f44..5052082 100644
--- a/debian/qbs-dev.install
+++ b/debian/qbs-dev.install
@@ -29,5 +29,7 @@ usr/include/qbs/tools/setupprojectparameters.h
 usr/include/qbs/tools/toolchains.h
 usr/include/qbs/use_installed_corelib.pri
 usr/include/qbs/use_installed_qtprofilesetup.pri
+usr/lib/*/libqbscore.prl
 usr/lib/*/libqbscore.so
+usr/lib/*/libqbsqtprofilesetup.prl
 usr/lib/*/libqbsqtprofilesetup.so
diff --git a/debian/qbs.install b/debian/qbs.install
index 788935f..60f0e89 100644
--- a/debian/qbs.install
+++ b/debian/qbs.install
@@ -1,9 +1,11 @@
 usr/bin/qbs
 usr/bin/qbs-config
 usr/bin/qbs-config-ui
+usr/bin/qbs-create-project
 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/lib/*/qbs/qbs_processlauncher
diff --git a/debian/rules b/debian/rules
index 9869a44..fd164cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ override_dh_auto_configure:
 		QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
 		QMAKE_LFLAGS+="${LDFLAGS}" \
 		QBS_INSTALL_PREFIX=/usr \
+		QBS_LIBEXEC_INSTALL_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/qbs \
 		QBS_LIBRARY_DIRNAME=lib/${DEB_HOST_MULTIARCH}
 
 override_dh_auto_build-indep:

-- 
qbs packaging



More information about the pkg-kde-commits mailing list