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

Dmitry Shachnev null at kde.org
Tue May 18 14:23:03 BST 2021


Git commit 443a4011630fa45301d4e30a2f4250216f1ce91f by Dmitry Shachnev.
Committed on 19/09/2020 at 17:15.
Pushed by sitter into branch 'Neon/testing'.

Use ${DEB_HOST_MULTIARCH} substitution in the install files.

M  +1    -0    debian/changelog
M  +7    -7    debian/libqt5networkauth5-dev.install
M  +1    -1    debian/libqt5networkauth5.install
M  +3    -3    debian/not-installed
M  +1    -1    debian/qtnetworkauth5-examples.install

https://invent.kde.org/neon/qt/qtnetworkauth/commit/443a4011630fa45301d4e30a2f4250216f1ce91f

diff --git a/debian/changelog b/debian/changelog
index 03feaa3..e2ec8d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtnetworkauth-everywhere-src (5.15.1-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Drop dh_missing override, not needed with debhelper compat 13.
+  * Use ${DEB_HOST_MULTIARCH} substitution in the install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Sep 2020 12:56:28 -0700
 
diff --git a/debian/libqt5networkauth5-dev.install b/debian/libqt5networkauth5-dev.install
index ba260a1..5a3b0b5 100644
--- a/debian/libqt5networkauth5-dev.install
+++ b/debian/libqt5networkauth5-dev.install
@@ -1,7 +1,7 @@
-usr/include/*/qt5/QtNetworkAuth/
-usr/lib/*/cmake/Qt5NetworkAuth/Qt5NetworkAuthConfig.cmake
-usr/lib/*/cmake/Qt5NetworkAuth/Qt5NetworkAuthConfigVersion.cmake
-usr/lib/*/libQt5NetworkAuth.prl
-usr/lib/*/libQt5NetworkAuth.so
-usr/lib/*/pkgconfig/Qt5NetworkAuth.pc
-usr/lib/*/qt5/mkspecs/modules/qt_lib_networkauth.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtNetworkAuth/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5NetworkAuth/Qt5NetworkAuthConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5NetworkAuth/Qt5NetworkAuthConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5NetworkAuth.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5NetworkAuth.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5NetworkAuth.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_networkauth.pri
diff --git a/debian/libqt5networkauth5.install b/debian/libqt5networkauth5.install
index 17c2c5f..bc7fdd3 100644
--- a/debian/libqt5networkauth5.install
+++ b/debian/libqt5networkauth5.install
@@ -1 +1 @@
-usr/lib/*/libQt5NetworkAuth.so.5*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5NetworkAuth.so.5*
diff --git a/debian/not-installed b/debian/not-installed
index 6d05ab6..17b547a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,3 @@
-usr/include/*/qt5/QtNetworkAuth/5.*
-usr/lib/*/libQt5NetworkAuth.la
-usr/lib/*/qt5/mkspecs/modules/qt_lib_networkauth_private.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtNetworkAuth/5.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5NetworkAuth.la
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_networkauth_private.pri
diff --git a/debian/qtnetworkauth5-examples.install b/debian/qtnetworkauth5-examples.install
index cadc1d9..5a096c5 100644
--- a/debian/qtnetworkauth5-examples.install
+++ b/debian/qtnetworkauth5-examples.install
@@ -1 +1 @@
-usr/lib/*/qt5/examples/
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/



More information about the Neon-commits mailing list