[neon/qt/qtremoteobjects/Neon/release] debian: Use ${DEB_HOST_MULTIARCH} substitution in the install files.
Dmitry Shachnev
null at kde.org
Wed May 26 17:21:53 BST 2021
Git commit e2f937e62b49c6d7b8dc91464fe12381348f0559 by Dmitry Shachnev.
Committed on 20/09/2020 at 15:42.
Pushed by sitter into branch 'Neon/release'.
Use ${DEB_HOST_MULTIARCH} substitution in the install files.
M +1 -0 debian/changelog
M +43 -43 debian/libqt5remoteobjects5-dev.install
M +1 -1 debian/libqt5remoteobjects5.install
M +25 -25 debian/not-installed
M +3 -3 debian/qml-module-qtremoteobjects.install
M +1 -1 debian/qtremoteobjects5-examples.install
https://invent.kde.org/neon/qt/qtremoteobjects/commit/e2f937e62b49c6d7b8dc91464fe12381348f0559
diff --git a/debian/changelog b/debian/changelog
index 85cb5ed..35ff64f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtremoteobjects-everywhere-src (5.15.1-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> Sun, 20 Sep 2020 18:37:32 +0300
diff --git a/debian/libqt5remoteobjects5-dev.install b/debian/libqt5remoteobjects5-dev.install
index b71ee13..0b0872e 100644
--- a/debian/libqt5remoteobjects5-dev.install
+++ b/debian/libqt5remoteobjects5-dev.install
@@ -1,43 +1,43 @@
-usr/include/*/qt5/QtRemoteObjects/QAbstractItemModelReplica
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectAbstractPersistedStore
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectDynamicReplica
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectHost
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectHostBase
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectNode
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectPendingCall
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectPendingCallWatcher
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectPendingReply
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectRegistry
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectRegistryHost
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectReplica
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectSettingsStore
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectSourceLocation
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectSourceLocationInfo
-usr/include/*/qt5/QtRemoteObjects/QRemoteObjectSourceLocations
-usr/include/*/qt5/QtRemoteObjects/QtRemoteObjects
-usr/include/*/qt5/QtRemoteObjects/QtRemoteObjectsDepends
-usr/include/*/qt5/QtRemoteObjects/QtRemoteObjectsVersion
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectabstractitemmodelreplica.h
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectabstractitemmodeltypes.h
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectdynamicreplica.h
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectnode.h
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectpendingcall.h
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectregistry.h
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectreplica.h
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectsettingsstore.h
-usr/include/*/qt5/QtRemoteObjects/qremoteobjectsource.h
-usr/include/*/qt5/QtRemoteObjects/qtremoteobjectglobal.h
-usr/include/*/qt5/QtRemoteObjects/qtremoteobjectsversion.h
-usr/lib/*/cmake/Qt5RemoteObjects/Qt5RemoteObjectsConfig.cmake
-usr/lib/*/cmake/Qt5RemoteObjects/Qt5RemoteObjectsConfigExtras.cmake
-usr/lib/*/cmake/Qt5RemoteObjects/Qt5RemoteObjectsConfigVersion.cmake
-usr/lib/*/cmake/Qt5RemoteObjects/Qt5RemoteObjectsMacros.cmake
-usr/lib/*/libQt5RemoteObjects.prl
-usr/lib/*/libQt5RemoteObjects.so
-usr/lib/*/pkgconfig/Qt5RemoteObjects.pc
-usr/lib/*/qt5/mkspecs/features/remoteobjects_repc.prf
-usr/lib/*/qt5/mkspecs/features/repcclient.pri
-usr/lib/*/qt5/mkspecs/features/repccommon.pri
-usr/lib/*/qt5/mkspecs/features/repcmerged.pri
-usr/lib/*/qt5/mkspecs/features/repcserver.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_remoteobjects.pri
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QAbstractItemModelReplica
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectAbstractPersistedStore
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectDynamicReplica
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectHost
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectHostBase
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectNode
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectPendingCall
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectPendingCallWatcher
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectPendingReply
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectRegistry
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectRegistryHost
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectReplica
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectSettingsStore
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectSourceLocation
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectSourceLocationInfo
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QRemoteObjectSourceLocations
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QtRemoteObjects
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QtRemoteObjectsDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QtRemoteObjectsVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectabstractitemmodelreplica.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectabstractitemmodeltypes.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectdynamicreplica.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectnode.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectpendingcall.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectregistry.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectreplica.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectsettingsstore.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qremoteobjectsource.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qtremoteobjectglobal.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qtremoteobjectsversion.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5RemoteObjects/Qt5RemoteObjectsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5RemoteObjects/Qt5RemoteObjectsConfigExtras.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5RemoteObjects/Qt5RemoteObjectsConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5RemoteObjects/Qt5RemoteObjectsMacros.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5RemoteObjects.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5RemoteObjects.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5RemoteObjects.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/features/remoteobjects_repc.prf
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/features/repcclient.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/features/repccommon.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/features/repcmerged.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/features/repcserver.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_remoteobjects.pri
diff --git a/debian/libqt5remoteobjects5.install b/debian/libqt5remoteobjects5.install
index 3de3b10..8b38ff6 100644
--- a/debian/libqt5remoteobjects5.install
+++ b/debian/libqt5remoteobjects5.install
@@ -1 +1 @@
-usr/lib/*/*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/*.so.*
diff --git a/debian/not-installed b/debian/not-installed
index b1882b1..13018c9 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,25 +1,25 @@
-usr/include/*/qt5/QtRemoteObjects/5.*
-usr/include/*/qt5/QtRemoteObjects/QIOQnxSource
-usr/include/*/qt5/QtRemoteObjects/QIntHash
-usr/include/*/qt5/QtRemoteObjects/QQnxNativeIo
-usr/include/*/qt5/QtRemoteObjects/QQnxNativeServer
-usr/include/*/qt5/QtRemoteObjects/qconnection_qnx_qiodevices.h
-usr/include/*/qt5/QtRemoteObjects/qconnection_qnx_server.h
-usr/include/*/qt5/QtRepParser/QRegexParser
-usr/include/*/qt5/QtRepParser/QtRepParser
-usr/include/*/qt5/QtRepParser/QtRepParserDepends
-usr/include/*/qt5/QtRepParser/QtRepParserVersion
-usr/include/*/qt5/QtRepParser/parser.g
-usr/include/*/qt5/QtRepParser/qregexparser.h
-usr/include/*/qt5/QtRepParser/qtrepparserversion.h
-usr/lib/*/Qt5RepParser.la
-usr/lib/*/cmake/Qt5RepParser/Qt5RepParserConfig.cmake
-usr/lib/*/cmake/Qt5RepParser/Qt5RepParserConfigVersion.cmake
-usr/lib/*/libQt5RemoteObjects.la
-usr/lib/*/libQt5RepParser.prl
-usr/lib/*/pkgconfig/Qt5RepParser.pc
-usr/lib/*/qt5/mkspecs/features/repparser.prf
-usr/lib/*/qt5/mkspecs/modules/qt_lib_remoteobjects_private.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_repparser.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_repparser_private.pri
-usr/lib/*/qt5/qml/QtQml
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/5.*
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QIOQnxSource
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QIntHash
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QQnxNativeIo
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/QQnxNativeServer
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qconnection_qnx_qiodevices.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRemoteObjects/qconnection_qnx_server.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRepParser/QRegexParser
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRepParser/QtRepParser
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRepParser/QtRepParserDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRepParser/QtRepParserVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRepParser/parser.g
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRepParser/qregexparser.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtRepParser/qtrepparserversion.h
+usr/lib/${DEB_HOST_MULTIARCH}/Qt5RepParser.la
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5RepParser/Qt5RepParserConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5RepParser/Qt5RepParserConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5RemoteObjects.la
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5RepParser.prl
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5RepParser.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/features/repparser.prf
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_remoteobjects_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_repparser.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_repparser_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/qml/QtQml
diff --git a/debian/qml-module-qtremoteobjects.install b/debian/qml-module-qtremoteobjects.install
index 7528729..348a340 100644
--- a/debian/qml-module-qtremoteobjects.install
+++ b/debian/qml-module-qtremoteobjects.install
@@ -1,3 +1,3 @@
-usr/lib/*/qt5/qml/QtRemoteObjects/libqtremoteobjects.so
-usr/lib/*/qt5/qml/QtRemoteObjects/plugins.qmltypes
-usr/lib/*/qt5/qml/QtRemoteObjects/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/qml/QtRemoteObjects/libqtremoteobjects.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/qml/QtRemoteObjects/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/qml/QtRemoteObjects/qmldir
diff --git a/debian/qtremoteobjects5-examples.install b/debian/qtremoteobjects5-examples.install
index 97c4a2a..9227e59 100644
--- a/debian/qtremoteobjects5-examples.install
+++ b/debian/qtremoteobjects5-examples.install
@@ -1 +1 @@
-usr/lib/*/qt5/examples/*
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/*
More information about the Neon-commits
mailing list