[SCM] qtconnectivity packaging branch, master, updated. debian/5.9.2-2-2-g0e44922

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 0e44922fe30cc5bb7d2f0e0baeaa6c0e9606f860
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 12 23:56:51 2017 +0300

    Fix cross-building failures.
    
    - Use dh_auto_configure provided by debhelper.
    - Pass custom PKG_CONFIG_LIBDIR and QMAKE_QMAKE.
    
    Closes: #880931.
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 debian/rules     | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dfb23da..92f9ce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtconnectivity-opensource-src (5.9.2-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Fix FTCBFS: use dh_auto_configure provided by debhelper, pass custom
+    PKG_CONFIG_LIBDIR and QMAKE_QMAKE (closes: #880931).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 12 Dec 2017 23:50:27 +0300
 
diff --git a/debian/control b/debian/control
index eba06b8..841c93d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Felix Geyer <fgeyer at debian.org>,
            Timo Jyrinki <timo at debian.org>,
            Dmitry Shachnev <mitya57 at debian.org>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 10.9.2~),
                libbluetooth-dev [linux-any],
                pkg-config,
                pkg-kde-tools,
diff --git a/debian/rules b/debian/rules
index a0de530..17a3720 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-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
+include /usr/share/dpkg/architecture.mk
+
 export QT_SELECT := qt5
 
 %:
@@ -15,7 +14,8 @@ override_dh_auto_configure:
 	# Be sure to regenerate the DBus cpp files
 	cd src/bluetooth/bluez/ ; ./generate
 	# Now call qmake
-	qmake
+	dh_auto_configure -- QMAKE_QMAKE=/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake \
+		PKG_CONFIG_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs

-- 
qtconnectivity packaging