[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.2-3-5-g9a7e9fe

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 9a7e9fe07b7e736487c906143340dc55d8025c3a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Dec 7 17:31:42 2017 +0300

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

diff --git a/debian/changelog b/debian/changelog
index dd89672..8ffae7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtdeclarative-opensource-src (5.10.0-1) UNRELEASED; urgency=medium
   * Update debian/watch for the new tarball names.
   * Drop revert_singletons_change.diff, QTBUG-64017 was fixed upstream.
   * Bump Qt build-dependencies to 5.10.0.
+  * Use dh_auto_configure provided by debhelper.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Dec 2017 16:37:42 +0300
 
diff --git a/debian/control b/debian/control
index b15cc61..32b7394 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Timo Jyrinki <timo at debian.org>,
            Dmitry Shachnev <mitya57 at debian.org>,
            Simon Quigley <tsimonq2 at ubuntu.com>
-Build-Depends: debhelper (>= 10.3),
+Build-Depends: debhelper (>= 10.9.2~),
                dpkg-dev (>= 1.17.14),
                libgl1-mesa-dri,
                libqt5opengl5-dev (>= 5.10.0+dfsg~),
diff --git a/debian/rules b/debian/rules
index ae31985..d6404e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-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
 
 %:
@@ -20,7 +17,7 @@ override_dh_auto_clean:
 	rm -rf $(CURDIR)/.local
 
 override_dh_auto_configure:
-	qmake QT_BUILD_PARTS+=" tests"
+	dh_auto_configure -- QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs

-- 
qtdeclarative packaging