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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 34733282a3504d7eca2f226587db408d99d92a74
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Dec 18 11:21:22 2017 +0300

    Use dh_auto_configure provided by debhelper.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 8 +-------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 464b002..7d52ccf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qbs (1.10.0+dfsg-1) UNRELEASED; urgency=medium
   * Build-depend on qtdeclarative5-private-dev, for Qt.quick module.
   * Update symbols files for the new release.
   * Use dh_missing instead of deprecated dh_install --fail-missing.
+  * Use dh_auto_configure provided by debhelper.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 12 Sep 2017 16:02:55 +0300
 
diff --git a/debian/control b/debian/control
index a31ee84..928bc1b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Dmitry Shachnev <mitya57 at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Adam Majer <adamm at zombino.com>,
            Simon Quigley <tsimonq2 at ubuntu.com>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 10.9.2~),
                pkg-kde-tools,
                qtbase5-dev (>= 5.6.0),
                qtdeclarative5-private-dev,
diff --git a/debian/rules b/debian/rules
index 4992999..fdeac8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,6 @@ include /usr/share/dpkg/pkg-info.mk
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 TMP_HOME_DIR = $(CURDIR)/debian/home
 
-export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
 %:
@@ -23,14 +20,11 @@ override_dh_auto_clean:
 	find . -type f -name .gitignore -delete -print
 
 override_dh_auto_configure:
-	qmake qbs.pro \
+	dh_auto_configure -- qbs.pro \
 		CONFIG+=debug \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \
 		CONFIG+=qbs_enable_unit_tests \
-		QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
-		QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
-		QMAKE_LFLAGS+="${LDFLAGS}" \
 		QBS_INSTALL_PREFIX=/usr \
 		QBS_LIBEXEC_INSTALL_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/qbs \
 		QBS_LIBEXEC_DESTDIR=../../../lib/${DEB_HOST_MULTIARCH}/qbs \

-- 
qbs packaging