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

[Patrick Franz]

Git commit a3464e236f7e408c80be425d0d0a52fcde8c4106 by Patrick Franz.
Committed on 26/09/2020 at 01:43.
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/libqt5webview5-dev.install
M  +2    -2    debian/libqt5webview5.install
M  +3    -3    debian/not-installed
M  +1    -1    debian/qml-module-qtwebview.install
M  +1    -1    debian/qtwebview5-examples.install

https://invent.kde.org/neon/qt/qtwebview/commit/a3464e236f7e408c80be425d0d0a52fcde8c4106

diff --git a/debian/changelog b/debian/changelog
index 8f2ef47..b9e049c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebview-opensource-src (5.15.1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.15.1.
   * Update debian/libqt5webview5.symbols from the current build log.
+  * Use ${DEB_HOST_MULTIARCH} substitution in the install files.
 
  -- Patrick Franz <patfra71 at gmail.com>  Fri, 25 Sep 2020 16:03:04 +0200
 
diff --git a/debian/libqt5webview5-dev.install b/debian/libqt5webview5-dev.install
index ab7830b..92bd750 100644
--- a/debian/libqt5webview5-dev.install
+++ b/debian/libqt5webview5-dev.install
@@ -1,13 +1,13 @@
-usr/include/*/qt5/QtWebView/QtWebView
-usr/include/*/qt5/QtWebView/QtWebViewDepends
-usr/include/*/qt5/QtWebView/QtWebViewVersion
-usr/include/*/qt5/QtWebView/qtwebviewfunctions.h
-usr/include/*/qt5/QtWebView/qtwebviewversion.h
-usr/include/*/qt5/QtWebView/qwebview_global.h
-usr/lib/*/cmake/Qt5WebView/Qt5WebViewConfig.cmake
-usr/lib/*/cmake/Qt5WebView/Qt5WebViewConfigVersion.cmake
-usr/lib/*/cmake/Qt5WebView/Qt5WebView_QWebEngineWebViewPlugin.cmake
-usr/lib/*/libQt5WebView.prl
-usr/lib/*/libQt5WebView.so
-usr/lib/*/pkgconfig/Qt5WebView.pc
-usr/lib/*/qt5/mkspecs/modules/qt_lib_webview.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebView/QtWebView
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebView/QtWebViewDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebView/QtWebViewVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebView/qtwebviewfunctions.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebView/qtwebviewversion.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebView/qwebview_global.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebView/Qt5WebViewConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebView/Qt5WebViewConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebView/Qt5WebView_QWebEngineWebViewPlugin.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebView.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebView.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5WebView.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_webview.pri
diff --git a/debian/libqt5webview5.install b/debian/libqt5webview5.install
index 1d7a033..7663199 100644
--- a/debian/libqt5webview5.install
+++ b/debian/libqt5webview5.install
@@ -1,2 +1,2 @@
-usr/lib/*/libQt5WebView.so.5*
-usr/lib/*/qt5/plugins/webview/libqtwebview_webengine.so
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebView.so.5*
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/plugins/webview/libqtwebview_webengine.so
diff --git a/debian/not-installed b/debian/not-installed
index 52edead..258e269 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,3 @@
-usr/include/*/qt5/QtWebView/5.*
-usr/lib/*/libQt5WebView.la
-usr/lib/*/qt5/mkspecs/modules/qt_lib_webview_private.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebView/5.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebView.la
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_webview_private.pri
diff --git a/debian/qml-module-qtwebview.install b/debian/qml-module-qtwebview.install
index 44b6e0d..eb87989 100644
--- a/debian/qml-module-qtwebview.install
+++ b/debian/qml-module-qtwebview.install
@@ -1 +1 @@
-usr/lib/*/qt5/qml/QtWebView/*
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/qml/QtWebView/*
diff --git a/debian/qtwebview5-examples.install b/debian/qtwebview5-examples.install
index 31e1e3d..aee0cdc 100644
--- a/debian/qtwebview5-examples.install
+++ b/debian/qtwebview5-examples.install
@@ -1 +1 @@
-usr/lib/*/qt5/examples/webview/
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/webview/