[neon/qt6/qt6-webchannel/Neon/release] debian: merge stable into release for 6.5.2

Carlos De Maine null at kde.org
Fri Jul 21 01:34:43 BST 2023


Git commit 533cedf2d55f11ca6e79efd236fb81d5964bdf00 by Carlos De Maine.
Committed on 21/07/2023 at 00:34.
Pushed by carlosdem into branch 'Neon/release'.

merge stable into release for 6.5.2

M  +1    -1    debian/changelog
M  +8    -25   debian/qt6-webchannel-dev.install
M  +1    -3    debian/qt6-webchannel.install
M  +2    -1    debian/watch

https://invent.kde.org/neon/qt6/qt6-webchannel/-/commit/533cedf2d55f11ca6e79efd236fb81d5964bdf00

diff --git a/debian/changelog b/debian/changelog
index ca34e55..3f26eee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-webchannel (6.5.1-0neon) UNRELEASED; urgency=medium
+qt6-webchannel (6.5.2-0neon) UNRELEASED; urgency=medium
 
   * New release
 
diff --git a/debian/qt6-webchannel-dev.install b/debian/qt6-webchannel-dev.install
index 15f803f..7d3d0ab 100644
--- a/debian/qt6-webchannel-dev.install
+++ b/debian/qt6-webchannel-dev.install
@@ -1,27 +1,10 @@
-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/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}/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/${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/
diff --git a/debian/qt6-webchannel.install b/debian/qt6-webchannel.install
index 74c9235..cb6ee54 100644
--- a/debian/qt6-webchannel.install
+++ b/debian/qt6-webchannel.install
@@ -1,4 +1,2 @@
 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}/qt6/qml/QtWebChannel/
diff --git a/debian/watch b/debian/watch
index 727313d..0b432fb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=4
-https://download.qt.io/archive/qt/([\d\.]*)/([\d\.]*)/submodules/qtwebchannel-everywhere-src-(.*)\.tar\.xz
+opts=uversionmangle=s/-/~/ \
+https://qt-mirror.dannhauer.de/official_releases/qt/([\d\.]+)/([\d\.]+)(\d)/submodules/qtwebchannel-everywhere-src-([\d\.]+\d).tar.xz
\ No newline at end of file


More information about the Neon-commits mailing list