[neon/qt6/qt6-webchannel/Neon/stable] debian: manual cherry pick

Carlos De Maine null at kde.org
Thu Jul 20 07:11:32 BST 2023


Git commit 657e0f86ddddbb37123e5b700acbf6951021de2c by Carlos De Maine.
Committed on 20/07/2023 at 06:10.
Pushed by carlosdem into branch 'Neon/stable'.

manual cherry pick

M  +12   -25   debian/qt6-webchannel-dev.install
M  +2    -3    debian/qt6-webchannel.install

https://invent.kde.org/neon/qt6/qt6-webchannel/-/commit/657e0f86ddddbb37123e5b700acbf6951021de2c

diff --git a/debian/qt6-webchannel-dev.install b/debian/qt6-webchannel-dev.install
index 15f803f..94da3e8 100644
--- a/debian/qt6-webchannel-dev.install
+++ b/debian/qt6-webchannel-dev.install
@@ -1,27 +1,14 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QQmlWebChannel
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QWebChannel
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QWebChannelAbstractTransport
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QtWebChannel
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QtWebChannelDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QtWebChannelVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qqmlwebchannel.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qtwebchannelexports.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qtwebchannelversion.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qwebchannel.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qwebchannelabstracttransport.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qwebchannelglobal.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtWebChannelTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelVersionlessTargets.cmake
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannelQuick/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannelQuick/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebChannel.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebChannel.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6webchannel_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6WebChannel.pc
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_webchannel.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/WebChannel.json
+usr/lib/aarch64-linux-gnu/libQt6WebChannelQuick.prl
+usr/lib/aarch64-linux-gnu/libQt6WebChannelQuick.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
\ No newline at end of file
diff --git a/debian/qt6-webchannel.install b/debian/qt6-webchannel.install
index 74c9235..c4f85e8 100644
--- a/debian/qt6-webchannel.install
+++ b/debian/qt6-webchannel.install
@@ -1,4 +1,3 @@
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebChannel.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebChannel/libwebchannelplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebChannel/plugins.qmltypes
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebChannel/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebChannelQuick.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebChannel/
\ No newline at end of file



More information about the Neon-commits mailing list