[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-4-13-gd005a57

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit d005a57c05b4a9eefeeeb93c609d72562970d875
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Dec 3 09:58:39 2017 -0300

    s/qt.conf/qmake.conf
    
    It's easy to mix them :-)
---
 debian/{qt.conf.in => qmake.conf.in} | 0
 debian/rules                         | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/qt.conf.in b/debian/qmake.conf.in
similarity index 100%
rename from debian/qt.conf.in
rename to debian/qmake.conf.in
diff --git a/debian/rules b/debian/rules
index 36890ec..06f9814 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,13 +257,13 @@ endif
 
 	# Helper files for cross-building
 	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5
-	sed s/DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/ debian/qt.conf.in \
-		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
+	sed s/DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/ debian/qmake.conf.in \
+		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qmake.conf
 
 	mkdir -p 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" \
+		"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qmake.conf" \
 		'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
 		'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
 		'QMAKE_LINK=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \

-- 
qtbase packaging