[SCM] qbs packaging branch, master, updated. debian/1.8.1+dfsg-4-17-g60b7cfd

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 60b7cfd553fb4a64959da8fd10bd8018ae8673e6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 19 14:17:10 2017 +0300

    Do not install dmgbuild Python code.
    
    It relies on /usr/bin/hdiutil executable, which is only available
    on macOS.
---
 debian/changelog          |  1 +
 debian/qbs-common.install | 23 -----------------------
 debian/qbs.install        |  1 -
 debian/rules              |  2 ++
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ceebdaf..264889e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qbs (1.10.0+dfsg-1) UNRELEASED; urgency=medium
   * Use dh_missing instead of deprecated dh_install --fail-missing.
   * Use dh_auto_configure provided by debhelper.
   * Update debian/copyright.
+  * Do not install dmgbuild Python code, it is only working on macOS.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 12 Sep 2017 16:02:55 +0300
 
diff --git a/debian/qbs-common.install b/debian/qbs-common.install
index 611a942..bb7b4fc 100644
--- a/debian/qbs-common.install
+++ b/debian/qbs-common.install
@@ -108,26 +108,3 @@ usr/share/qbs/modules/vcs/vcs-module.qbs
 usr/share/qbs/modules/wix/WiXModule.qbs
 usr/share/qbs/modules/xcode/xcode.js
 usr/share/qbs/modules/xcode/xcode.qbs
-usr/share/qbs/python/biplist/LICENSE
-usr/share/qbs/python/biplist/__init__.py
-usr/share/qbs/python/biplist/qt_attribution.json
-usr/share/qbs/python/dmgbuild/LICENSE
-usr/share/qbs/python/dmgbuild/__init__.py
-usr/share/qbs/python/dmgbuild/badge.py
-usr/share/qbs/python/dmgbuild/colors.py
-usr/share/qbs/python/dmgbuild/core.py
-usr/share/qbs/python/dmgbuild/licensing.py
-usr/share/qbs/python/dmgbuild/qt_attribution.json
-usr/share/qbs/python/dmgbuild/resources.py
-usr/share/qbs/python/ds_store/LICENSE
-usr/share/qbs/python/ds_store/__init__.py
-usr/share/qbs/python/ds_store/buddy.py
-usr/share/qbs/python/ds_store/qt_attribution.json
-usr/share/qbs/python/ds_store/store.py
-usr/share/qbs/python/mac_alias/LICENSE
-usr/share/qbs/python/mac_alias/__init__.py
-usr/share/qbs/python/mac_alias/alias.py
-usr/share/qbs/python/mac_alias/bookmark.py
-usr/share/qbs/python/mac_alias/osx.py
-usr/share/qbs/python/mac_alias/qt_attribution.json
-usr/share/qbs/python/mac_alias/utils.py
diff --git a/debian/qbs.install b/debian/qbs.install
index 38be7f4..562ec5c 100644
--- a/debian/qbs.install
+++ b/debian/qbs.install
@@ -6,7 +6,6 @@ usr/bin/qbs-qmltypes
 usr/bin/qbs-setup-android
 usr/bin/qbs-setup-qt
 usr/bin/qbs-setup-toolchains
-usr/lib/*/qbs/dmgbuild
 usr/lib/*/qbs/plugins/libclangcompilationdbgenerator.so
 usr/lib/*/qbs/plugins/libqbs_cpp_scanner.so
 usr/lib/*/qbs/plugins/libqbs_qt_scanner.so
diff --git a/debian/rules b/debian/rules
index fdeac8c..665e031 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,8 @@ override_dh_auto_test-indep:
 override_dh_install:
 	rm -fv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libqbscore.so.1
 	rm -fv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libqbsqtprofilesetup.so.1
+	rm -fv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/qbs/dmgbuild
+	rm -rfv debian/tmp/usr/share/qbs/python
 	dh_install
 
 override_dh_missing:

-- 
qbs packaging