[SCM] qbs packaging branch, master, updated. debian/1.3.3+dfsg-3-3-g57c4075

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 57c40756c584b49a52a7e5fcecaf87154faa21ec
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Feb 13 13:40:14 2015 +0300

    Use qbs-config instead of modifying configuration files manually.
    
    Thanks Jake Petroules for the suggestion.
---
 debian/changelog | 2 ++
 debian/rules     | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c56d8d..0695a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qbs (1.3.3+dfsg-4) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Drop no longer needed chmod calls from debian/rules, thanks Jake
     Petroules for the suggestion.
+  * Use qbs-config instead of modifying configuration files manually,
+    thanks Jake Petroules for the suggestion.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 13 Feb 2015 12:45:44 +0300
 
diff --git a/debian/rules b/debian/rules
index 8b02dee..726ffb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,9 +54,8 @@ override_dh_auto_test:
 		export LD_LIBRARY_PATH=$(CURDIR)/lib/:$$LD_LIBRARY_PATH; \
 		$(CURDIR)/bin/qbs-setup-toolchains --detect --settings-dir $(CONFIG_DIR)/QtProject; \
 		$(CURDIR)/bin/qbs-setup-qt /usr/bin/qmake qbs_autotests; \
-		grep baseProfile $(CONFIG_DIR)/QtProject/qbs.conf || \
-			/bin/echo "qt-project\qbs\profiles\qbs_autotestsaseProfile=gcc" \
-			>> $(CONFIG_DIR)/QtProject/qbs.conf; \
+		[ -n "`$(CURDIR)/bin/qbs-config --settings-dir $(CONFIG_DIR)/QtProject --list profiles.qbs_autotests.baseProfile`" ] || \
+			$(CURDIR)/bin/qbs-config --settings-dir $(CONFIG_DIR)/QtProject profiles.qbs_autotests.baseProfile gcc; \
 		dh_auto_test
 
 override_dh_install:

-- 
qbs packaging