[SCM] qtbase packaging branch, ubuntu+1, updated. ubuntu/5.9.2+dfsg-4ubuntu6-16-g389bae5

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit 67b31ec5be40e1eb3830504bc06a06bb947d5a9f
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Wed Nov 29 22:51:57 2017 -0600

    Update config paths for new release.
---
 debian/qt5-qmake.install | 2 +-
 debian/rules             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install
index c00a21e..9752f1c 100644
--- a/debian/qt5-qmake.install
+++ b/debian/qt5-qmake.install
@@ -1,3 +1,3 @@
 usr/bin/*-qmake
 usr/lib/*/qt5/mkspecs/
-usr/lib/*/qt5/qmake.conf
+usr/lib/*/qt5/qt.conf
diff --git a/debian/rules b/debian/rules
index dcf469c..0532cf8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -258,6 +258,7 @@ endif
 	sed s/DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/ debian/qt.conf.in \
 		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
 
+	mkdir -pv debian/tmp/usr/bin/
 	echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 	echo "exec /usr/lib/qt5/bin/qmake" \
 		"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \

-- 
qtbase packaging