[SCM] qtbase packaging branch, experimental, updated. debian/5.10.0+dfsg-2-7-gb3721f2

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit b3721f20fcc6368bf5e4776c835c57ae0fdca291
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jan 9 16:46:33 2018 +0300

    Use consistent substitution syntax in both .in files.
---
 debian/qt.conf.in | 20 ++++++++++----------
 debian/rules      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/qt.conf.in b/debian/qt.conf.in
index e1afaba..aba2bcd 100644
--- a/debian/qt.conf.in
+++ b/debian/qt.conf.in
@@ -1,18 +1,18 @@
 [Paths]
 Prefix=/usr
-ArchData=lib/DEB_HOST_MULTIARCH/qt5
+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
+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
+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 6bec003..f4b1364 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,7 +257,7 @@ 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 \
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' debian/qt.conf.in \
 		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
 
 	mkdir -p debian/tmp/usr/bin

-- 
qtbase packaging