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

[Dmitry Shachnev]

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

Use ${DEB_HOST_MULTIARCH} substitution in the install files.

M  +1    -0    debian/changelog
M  +13   -13   debian/libqt5x11extras5-dev.install
M  +1    -1    debian/libqt5x11extras5.install
M  +2    -2    debian/not-installed

https://invent.kde.org/neon/qt/qtx11extras/commit/8eb7a3fc006b02499ef773fccbd87ebff219c1b9

diff --git a/debian/changelog b/debian/changelog
index 9ba5cf3..943d760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtx11extras-opensource-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>  Sat, 19 Sep 2020 15:58:59 +0300
 
diff --git a/debian/libqt5x11extras5-dev.install b/debian/libqt5x11extras5-dev.install
index 43a47f3..96f0edd 100644
--- a/debian/libqt5x11extras5-dev.install
+++ b/debian/libqt5x11extras5-dev.install
@@ -1,13 +1,13 @@
-usr/include/*/qt5/QtX11Extras/QX11Info
-usr/include/*/qt5/QtX11Extras/QtX11Extras
-usr/include/*/qt5/QtX11Extras/QtX11ExtrasDepends
-usr/include/*/qt5/QtX11Extras/QtX11ExtrasVersion
-usr/include/*/qt5/QtX11Extras/qtx11extrasglobal.h
-usr/include/*/qt5/QtX11Extras/qtx11extrasversion.h
-usr/include/*/qt5/QtX11Extras/qx11info_x11.h
-usr/lib/*/cmake/Qt5X11Extras/Qt5X11ExtrasConfig.cmake
-usr/lib/*/cmake/Qt5X11Extras/Qt5X11ExtrasConfigVersion.cmake
-usr/lib/*/libQt5X11Extras.prl
-usr/lib/*/libQt5X11Extras.so
-usr/lib/*/pkgconfig/Qt5X11Extras.pc
-usr/lib/*/qt5/mkspecs/modules/qt_lib_x11extras.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtX11Extras/QX11Info
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtX11Extras/QtX11Extras
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtX11Extras/QtX11ExtrasDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtX11Extras/QtX11ExtrasVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtX11Extras/qtx11extrasglobal.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtX11Extras/qtx11extrasversion.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtX11Extras/qx11info_x11.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5X11Extras/Qt5X11ExtrasConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5X11Extras/Qt5X11ExtrasConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5X11Extras.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5X11Extras.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5X11Extras.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_x11extras.pri
diff --git a/debian/libqt5x11extras5.install b/debian/libqt5x11extras5.install
index ffc4283..222e2c3 100644
--- a/debian/libqt5x11extras5.install
+++ b/debian/libqt5x11extras5.install
@@ -1 +1 @@
-usr/lib/*/libQt5X11Extras.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5X11Extras.so.*
diff --git a/debian/not-installed b/debian/not-installed
index c793783..1acfe7d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,2 @@
-usr/lib/*/libQt5X11Extras.la
-usr/lib/*/qt5/mkspecs/modules/qt_lib_x11extras_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5X11Extras.la
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_x11extras_private.pri