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

Dmitry Shachnev null at kde.org
Tue May 18 13:59:16 BST 2021


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

Use ${DEB_HOST_MULTIARCH} substitution in the install files.

M  +1    -0    debian/changelog
M  +16   -16   debian/libqt5serialport5-dev.install
M  +2    -2    debian/libqt5serialport5.install
M  +3    -3    debian/not-installed
M  +1    -1    debian/qt5serialport-examples.install

https://invent.kde.org/neon/qt/qtserialport/commit/dd7a99ce3dc536c62e9b6a4f1f34942d2a9ece1e

diff --git a/debian/changelog b/debian/changelog
index ccf3f8a..bfcf145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtserialport-opensource-src (5.15.1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.15.1.
   * Bump years in debian/copyright.
+  * 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:50:06 +0300
 
diff --git a/debian/libqt5serialport5-dev.install b/debian/libqt5serialport5-dev.install
index 0fa8d91..8135248 100644
--- a/debian/libqt5serialport5-dev.install
+++ b/debian/libqt5serialport5-dev.install
@@ -1,16 +1,16 @@
-usr/include/*/qt5/QtSerialPort/QSerialPort
-usr/include/*/qt5/QtSerialPort/QSerialPortInfo
-usr/include/*/qt5/QtSerialPort/QtSerialPort
-usr/include/*/qt5/QtSerialPort/QtSerialPortDepends
-usr/include/*/qt5/QtSerialPort/QtSerialPortVersion
-usr/include/*/qt5/QtSerialPort/qserialport.h
-usr/include/*/qt5/QtSerialPort/qserialportglobal.h
-usr/include/*/qt5/QtSerialPort/qserialportinfo.h
-usr/include/*/qt5/QtSerialPort/qtserialport-config.h
-usr/include/*/qt5/QtSerialPort/qtserialportversion.h
-usr/lib/*/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake
-usr/lib/*/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
-usr/lib/*/libQt5SerialPort.prl
-usr/lib/*/libQt5SerialPort.so
-usr/lib/*/pkgconfig/Qt5SerialPort.pc
-usr/lib/*/qt5/mkspecs/modules/qt_lib_serialport.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/QSerialPort
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/QSerialPortInfo
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/QtSerialPort
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/QtSerialPortDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/QtSerialPortVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/qserialport.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/qserialportglobal.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/qserialportinfo.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/qtserialport-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/qtserialportversion.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5SerialPort.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5SerialPort.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5SerialPort.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_serialport.pri
diff --git a/debian/libqt5serialport5.install b/debian/libqt5serialport5.install
index e0f14df..93f73a4 100644
--- a/debian/libqt5serialport5.install
+++ b/debian/libqt5serialport5.install
@@ -1,2 +1,2 @@
-usr/lib/*/libQt5SerialPort.so.5
-usr/lib/*/libQt5SerialPort.so.5.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5SerialPort.so.5
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5SerialPort.so.5.*
diff --git a/debian/not-installed b/debian/not-installed
index e7eff6a..ac906c6 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,3 @@
-usr/include/*/qt5/QtSerialPort/5.*
-usr/lib/*/libQt5SerialPort.la
-usr/lib/*/qt5/mkspecs/modules/qt_lib_serialport_private.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtSerialPort/5.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5SerialPort.la
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_serialport_private.pri
diff --git a/debian/qt5serialport-examples.install b/debian/qt5serialport-examples.install
index cadc1d9..5a096c5 100644
--- a/debian/qt5serialport-examples.install
+++ b/debian/qt5serialport-examples.install
@@ -1 +1 @@
-usr/lib/*/qt5/examples/
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/



More information about the Neon-commits mailing list