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

[Dmitry Shachnev]

Git commit e500b7ccbf5de982f844be92d849cba3c960a3a5 by Dmitry Shachnev.
Committed on 19/09/2020 at 13:13.
Pushed by sitter into branch 'Neon/testing'.

Use ${DEB_HOST_MULTIARCH} substitution in the install files.

M  +1    -0    debian/changelog
M  +1    -1    debian/libqt5hunspellinputmethod5.install
M  +23   -23   debian/libqt5virtualkeyboard5-dev.install
M  +1    -1    debian/libqt5virtualkeyboard5.install
M  +12   -12   debian/not-installed
M  +1    -1    debian/qml-module-qtquick-virtualkeyboard.install
M  +1    -1    debian/qtvirtualkeyboard-plugin.install
M  +1    -1    debian/qtvirtualkeyboard5-examples.install

https://invent.kde.org/neon/qt/qtvirtualkeyboard/commit/e500b7ccbf5de982f844be92d849cba3c960a3a5

diff --git a/debian/changelog b/debian/changelog
index 05c008a..8541a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtvirtualkeyboard-opensource-src (5.15.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.15.1.
   * Stop checking for nocheck build option in test target, no longer needed.
+  * Use ${DEB_HOST_MULTIARCH} substitution in the install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Sep 2020 16:06:09 +0300
 
diff --git a/debian/libqt5hunspellinputmethod5.install b/debian/libqt5hunspellinputmethod5.install
index 1a4257c..26bd6ac 100644
--- a/debian/libqt5hunspellinputmethod5.install
+++ b/debian/libqt5hunspellinputmethod5.install
@@ -1 +1 @@
-usr/lib/*/libQt5HunspellInputMethod.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5HunspellInputMethod.so.*
diff --git a/debian/libqt5virtualkeyboard5-dev.install b/debian/libqt5virtualkeyboard5-dev.install
index e3701b9..5d1ce83 100644
--- a/debian/libqt5virtualkeyboard5-dev.install
+++ b/debian/libqt5virtualkeyboard5-dev.install
@@ -1,23 +1,23 @@
-usr/include/*/qt5/QtVirtualKeyboard/QVirtualKeyboardAbstractInputMethod
-usr/include/*/qt5/QtVirtualKeyboard/QVirtualKeyboardExtensionPlugin
-usr/include/*/qt5/QtVirtualKeyboard/QVirtualKeyboardInputContext
-usr/include/*/qt5/QtVirtualKeyboard/QVirtualKeyboardInputEngine
-usr/include/*/qt5/QtVirtualKeyboard/QVirtualKeyboardSelectionListModel
-usr/include/*/qt5/QtVirtualKeyboard/QVirtualKeyboardTrace
-usr/include/*/qt5/QtVirtualKeyboard/QtVirtualKeyboard
-usr/include/*/qt5/QtVirtualKeyboard/QtVirtualKeyboardDepends
-usr/include/*/qt5/QtVirtualKeyboard/QtVirtualKeyboardVersion
-usr/include/*/qt5/QtVirtualKeyboard/qtvirtualkeyboardversion.h
-usr/include/*/qt5/QtVirtualKeyboard/qvirtualkeyboard_global.h
-usr/include/*/qt5/QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h
-usr/include/*/qt5/QtVirtualKeyboard/qvirtualkeyboardextensionplugin.h
-usr/include/*/qt5/QtVirtualKeyboard/qvirtualkeyboardinputcontext.h
-usr/include/*/qt5/QtVirtualKeyboard/qvirtualkeyboardinputengine.h
-usr/include/*/qt5/QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h
-usr/include/*/qt5/QtVirtualKeyboard/qvirtualkeyboardtrace.h
-usr/lib/*/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboardConfig.cmake
-usr/lib/*/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboardConfigVersion.cmake
-usr/lib/*/libQt5VirtualKeyboard.prl
-usr/lib/*/libQt5VirtualKeyboard.so
-usr/lib/*/pkgconfig/Qt5VirtualKeyboard.pc
-usr/lib/*/qt5/mkspecs/modules/qt_lib_virtualkeyboard.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QVirtualKeyboardAbstractInputMethod
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QVirtualKeyboardExtensionPlugin
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QVirtualKeyboardInputContext
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QVirtualKeyboardInputEngine
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QVirtualKeyboardSelectionListModel
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QVirtualKeyboardTrace
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QtVirtualKeyboard
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QtVirtualKeyboardDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/QtVirtualKeyboardVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/qtvirtualkeyboardversion.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/qvirtualkeyboard_global.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/qvirtualkeyboardabstractinputmethod.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/qvirtualkeyboardextensionplugin.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/qvirtualkeyboardinputcontext.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/qvirtualkeyboardinputengine.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/qvirtualkeyboardtrace.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboardConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboardConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5VirtualKeyboard.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5VirtualKeyboard.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5VirtualKeyboard.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_virtualkeyboard.pri
diff --git a/debian/libqt5virtualkeyboard5.install b/debian/libqt5virtualkeyboard5.install
index 8573f8e..7aca0e0 100644
--- a/debian/libqt5virtualkeyboard5.install
+++ b/debian/libqt5virtualkeyboard5.install
@@ -1 +1 @@
-usr/lib/*/libQt5VirtualKeyboard.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5VirtualKeyboard.so.*
diff --git a/debian/not-installed b/debian/not-installed
index d25f5d2..1a68f33 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,12 +1,12 @@
-usr/include/*/qt5/QtHunspellInputMethod
-usr/include/*/qt5/QtVirtualKeyboard/5.*
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QVirtualKeyboardPlugin.cmake
-usr/lib/*/cmake/Qt5HunspellInputMethod/Qt5HunspellInputMethodConfig.cmake
-usr/lib/*/cmake/Qt5HunspellInputMethod/Qt5HunspellInputMethodConfigVersion.cmake
-usr/lib/*/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboard*Plugin.cmake
-usr/lib/*/libQt5HunspellInputMethod.la
-usr/lib/*/libQt5HunspellInputMethod.prl
-usr/lib/*/libQt5HunspellInputMethod.so
-usr/lib/*/libQt5VirtualKeyboard.la
-usr/lib/*/qt5/mkspecs/modules/qt_lib_hunspellinputmethod_private.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_virtualkeyboard_private.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtHunspellInputMethod
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtVirtualKeyboard/5.*
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Gui/Qt5Gui_QVirtualKeyboardPlugin.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5HunspellInputMethod/Qt5HunspellInputMethodConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5HunspellInputMethod/Qt5HunspellInputMethodConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5VirtualKeyboard/Qt5VirtualKeyboard_QtVirtualKeyboard*Plugin.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5HunspellInputMethod.la
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5HunspellInputMethod.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5HunspellInputMethod.so
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5VirtualKeyboard.la
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_hunspellinputmethod_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_virtualkeyboard_private.pri
diff --git a/debian/qml-module-qtquick-virtualkeyboard.install b/debian/qml-module-qtquick-virtualkeyboard.install
index ca00ea5..889d60a 100644
--- a/debian/qml-module-qtquick-virtualkeyboard.install
+++ b/debian/qml-module-qtquick-virtualkeyboard.install
@@ -1 +1 @@
-usr/lib/*/qt5/qml/QtQuick/VirtualKeyboard
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/qml/QtQuick/VirtualKeyboard
diff --git a/debian/qtvirtualkeyboard-plugin.install b/debian/qtvirtualkeyboard-plugin.install
index 527e6d6..8a84cfb 100644
--- a/debian/qtvirtualkeyboard-plugin.install
+++ b/debian/qtvirtualkeyboard-plugin.install
@@ -1 +1 @@
-usr/lib/*/qt5/plugins
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/plugins
diff --git a/debian/qtvirtualkeyboard5-examples.install b/debian/qtvirtualkeyboard5-examples.install
index f281302..c849a2a 100644
--- a/debian/qtvirtualkeyboard5-examples.install
+++ b/debian/qtvirtualkeyboard5-examples.install
@@ -1 +1 @@
-usr/lib/*/qt5/examples
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples