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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit dce51cb6fb1ef343f1150616ff84c5db8891b99f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Nov 25 15:34:43 2017 +0300

    Use a template for generating qt.conf instead of echo lines.
    
    Also add all possible settings there, so that output of ‘qmake -query’
    with and without using the generated file is identical.
---
 debian/qt.conf.in | 18 ++++++++++++++++++
 debian/rules      |  7 ++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/qt.conf.in b/debian/qt.conf.in
new file mode 100644
index 0000000..e1afaba
--- /dev/null
+++ b/debian/qt.conf.in
@@ -0,0 +1,18 @@
+[Paths]
+Prefix=/usr
+ArchData=lib/DEB_HOST_MULTIARCH/qt5
+Binaries=lib/qt5/bin
+Data=share/qt5
+Documentation=share/qt5/doc
+Examples=lib/DEB_HOST_MULTIARCH/qt5/examples
+Headers=include/DEB_HOST_MULTIARCH/qt5
+HostBinaries=lib/qt5/bin
+HostData=lib/DEB_HOST_MULTIARCH/qt5
+HostLibraries=lib/DEB_HOST_MULTIARCH
+Imports=lib/DEB_HOST_MULTIARCH/qt5/imports
+Libraries=lib/DEB_HOST_MULTIARCH
+LibraryExecutables=lib/DEB_HOST_MULTIARCH/qt5/libexec
+Plugins=lib/DEB_HOST_MULTIARCH/qt5/plugins
+Qml2Imports=lib/DEB_HOST_MULTIARCH/qt5/qml
+Settings=/etc/xdg
+Translations=share/qt5/translations
diff --git a/debian/rules b/debian/rules
index 43bbcd5..1534f37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -255,11 +255,8 @@ endif
 		-exec chmod a-x {} \;
 
 	# Helper files for cross-building
-	echo "[Paths]" > debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
-	echo "Prefix=/usr" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
-	echo "HostData=lib/$(DEB_HOST_MULTIARCH)/qt5" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
-	echo "HostBinaries=lib/qt5/bin" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
-	echo "Headers=include/$(DEB_HOST_MULTIARCH)/qt5" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
+	sed s/DEB_HOST_MULTIARCH/$(DEB_HOST_MULTIARCH)/ debian/qt.conf.in \
+		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
 
 	echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
 	echo "exec /usr/lib/qt5/bin/qmake" \

-- 
qtbase packaging