[neon/qt/qtscxml/Neon/release] debian: Use ${DEB_HOST_MULTIARCH} substitution in the install files.

[Dmitry Shachnev]

Git commit 8bb559262739451cf2c71ace7dd96c2f07f4e1b3 by Dmitry Shachnev.
Committed on 20/09/2020 at 17:34.
Pushed by jriddell into branch 'Neon/release'.

Use ${DEB_HOST_MULTIARCH} substitution in the install files.

M  +1    -0    debian/changelog
M  +39   -39   debian/libqt5scxml5-dev.install
M  +1    -1    debian/libqt5scxml5.install
M  +3    -3    debian/not-installed
M  +1    -1    debian/qml-module-qtscxml.install
M  +1    -1    debian/qtscxml5-examples.install

https://invent.kde.org/neon/qt/qtscxml/commit/8bb559262739451cf2c71ace7dd96c2f07f4e1b3

diff --git a/debian/changelog b/debian/changelog
index ea44947..5bf6f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtscxml-everywhere-src (5.15.1-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.15.1.
+  * Use ${DEB_HOST_MULTIARCH} substitution in the install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 20 Sep 2020 19:08:27 +0300
 
diff --git a/debian/libqt5scxml5-dev.install b/debian/libqt5scxml5-dev.install
index 5084f5c..771e62a 100644
--- a/debian/libqt5scxml5-dev.install
+++ b/debian/libqt5scxml5-dev.install
@@ -1,39 +1,39 @@
-usr/include/*/qt5/QtScxml/QScxmlCompiler
-usr/include/*/qt5/QtScxml/QScxmlCppDataModel
-usr/include/*/qt5/QtScxml/QScxmlDataModel
-usr/include/*/qt5/QtScxml/QScxmlDynamicScxmlServiceFactory
-usr/include/*/qt5/QtScxml/QScxmlEcmaScriptDataModel
-usr/include/*/qt5/QtScxml/QScxmlError
-usr/include/*/qt5/QtScxml/QScxmlEvent
-usr/include/*/qt5/QtScxml/QScxmlInvokableService
-usr/include/*/qt5/QtScxml/QScxmlInvokableServiceFactory
-usr/include/*/qt5/QtScxml/QScxmlNullDataModel
-usr/include/*/qt5/QtScxml/QScxmlStateMachine
-usr/include/*/qt5/QtScxml/QScxmlStaticScxmlServiceFactory
-usr/include/*/qt5/QtScxml/QScxmlTableData
-usr/include/*/qt5/QtScxml/QtScxml
-usr/include/*/qt5/QtScxml/QtScxmlDepends
-usr/include/*/qt5/QtScxml/QtScxmlVersion
-usr/include/*/qt5/QtScxml/qscxmlcompiler.h
-usr/include/*/qt5/QtScxml/qscxmlcppdatamodel.h
-usr/include/*/qt5/QtScxml/qscxmldatamodel.h
-usr/include/*/qt5/QtScxml/qscxmlecmascriptdatamodel.h
-usr/include/*/qt5/QtScxml/qscxmlerror.h
-usr/include/*/qt5/QtScxml/qscxmlevent.h
-usr/include/*/qt5/QtScxml/qscxmlexecutablecontent.h
-usr/include/*/qt5/QtScxml/qscxmlglobals.h
-usr/include/*/qt5/QtScxml/qscxmlinvokableservice.h
-usr/include/*/qt5/QtScxml/qscxmlnulldatamodel.h
-usr/include/*/qt5/QtScxml/qscxmlstatemachine.h
-usr/include/*/qt5/QtScxml/qscxmltabledata.h
-usr/include/*/qt5/QtScxml/qtscxml-config.h
-usr/include/*/qt5/QtScxml/qtscxmlversion.h
-usr/lib/*/cmake/Qt5Scxml/Qt5ScxmlConfig.cmake
-usr/lib/*/cmake/Qt5Scxml/Qt5ScxmlConfigExtras.cmake
-usr/lib/*/cmake/Qt5Scxml/Qt5ScxmlConfigVersion.cmake
-usr/lib/*/cmake/Qt5Scxml/Qt5ScxmlMacros.cmake
-usr/lib/*/libQt5Scxml.prl
-usr/lib/*/libQt5Scxml.so
-usr/lib/*/pkgconfig/Qt5Scxml.pc
-usr/lib/*/qt5/mkspecs/features/qscxmlc.prf
-usr/lib/*/qt5/mkspecs/modules/qt_lib_scxml.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlCompiler
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlCppDataModel
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlDataModel
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlDynamicScxmlServiceFactory
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlEcmaScriptDataModel
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlError
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlEvent
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlInvokableService
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlInvokableServiceFactory
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlNullDataModel
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlStateMachine
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlStaticScxmlServiceFactory
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QScxmlTableData
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QtScxml
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QtScxmlDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/QtScxmlVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlcompiler.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlcppdatamodel.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmldatamodel.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlecmascriptdatamodel.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlerror.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlevent.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlexecutablecontent.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlglobals.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlinvokableservice.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlnulldatamodel.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmlstatemachine.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qscxmltabledata.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qtscxml-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/qtscxmlversion.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Scxml/Qt5ScxmlConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Scxml/Qt5ScxmlConfigExtras.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Scxml/Qt5ScxmlConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Scxml/Qt5ScxmlMacros.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5Scxml.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5Scxml.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5Scxml.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/features/qscxmlc.prf
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_scxml.pri
diff --git a/debian/libqt5scxml5.install b/debian/libqt5scxml5.install
index 3de3b10..8b38ff6 100644
--- a/debian/libqt5scxml5.install
+++ b/debian/libqt5scxml5.install
@@ -1 +1 @@
-usr/lib/*/*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/*.so.*
diff --git a/debian/not-installed b/debian/not-installed
index 8f3b6af..5732c6f 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,3 @@
-usr/include/*/qt5/QtScxml/5.*
-usr/lib/*/libQt5Scxml.la
-usr/lib/*/qt5/mkspecs/modules/qt_lib_scxml_private.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtScxml/5.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5Scxml.la
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_scxml_private.pri
diff --git a/debian/qml-module-qtscxml.install b/debian/qml-module-qtscxml.install
index 02c87d4..7ce9690 100644
--- a/debian/qml-module-qtscxml.install
+++ b/debian/qml-module-qtscxml.install
@@ -1 +1 @@
-usr/lib/*/qt5/qml/QtScxml/
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/qml/QtScxml/
diff --git a/debian/qtscxml5-examples.install b/debian/qtscxml5-examples.install
index 97c4a2a..9227e59 100644
--- a/debian/qtscxml5-examples.install
+++ b/debian/qtscxml5-examples.install
@@ -1 +1 @@
-usr/lib/*/qt5/examples/*
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/*