[SCM] qbs packaging branch, master, updated. debian/1.3.1+dfsg-1-2-g0d677b1

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 0d677b1a1bb1654346ce894afdbb851fcc271eaf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 6 11:49:45 2014 +0400

    Enable disable_rpath and qbs_enable_project_file_updates config flags.
    
    Thanks Adam Majer for the patch.
---
 debian/changelog | 4 ++++
 debian/rules     | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ccbeae3..b8ec772 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qbs (1.3.1+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Enable disable_rpath and qbs_enable_project_file_updates
+    configuration flags, thanks Adam Majer for the patch
+    (really closes: #763365).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Oct 2014 11:48:38 +0400
 
diff --git a/debian/rules b/debian/rules
index 7d471e1..6bf4c33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,8 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	qmake qbs.pro \
 		CONFIG+=debug \
+		CONFIG+=disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
 		QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
 		QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
 		QMAKE_LFLAGS+="${LDFLAGS}" \

-- 
qbs packaging