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

[Carlos De Maine]

Git commit 1380263680abec4dd953676dda779f8c8725a216 by Carlos De Maine.
Committed on 21/07/2023 at 00:33.
Pushed by carlosdem into branch 'Neon/release'.

merge stable into release for 6.5.2

M  +2    -2    debian/changelog
M  +0    -6    debian/not-installed
M  +8    -33   debian/qt6-websockets-dev.install
M  +2    -1    debian/watch

https://invent.kde.org/neon/qt6/qt6-websockets/-/commit/1380263680abec4dd953676dda779f8c8725a216

diff --git a/debian/changelog b/debian/changelog
index f08cbfb..604d27f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-websockets (6.5.1-0neon) UNRELEASED; urgency=medium
+qt6-websockets (6.5.2-0neon) UNRELEASED; urgency=medium
 
   * New release
 
@@ -105,4 +105,4 @@ qt6-websockets (6.2.1-1) experimental; urgency=medium
 
   * Initial release (Closes: #1000167)
 
- -- Patrick Franz <deltaone at debian.org>  Wed, 24 Nov 2021 13:40:44 +0100
+ -- Patrick Franz <deltaone at debian.org>  Wed, 24 Nov 2021 13:40:44 +0100
\ No newline at end of file
diff --git a/debian/not-installed b/debian/not-installed
index c661a82..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,6 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qmlwebsocketsAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qmlwebsocketsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qmlwebsocketsConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qmlwebsocketsConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qmlwebsocketsTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qmlwebsocketsTargets.cmake
diff --git a/debian/qt6-websockets-dev.install b/debian/qt6-websockets-dev.install
index fe255ba..23d97bb 100644
--- a/debian/qt6-websockets-dev.install
+++ b/debian/qt6-websockets-dev.install
@@ -1,35 +1,10 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/6.*/QtWebSockets/private/*_p.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QMaskGenerator
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QWebSocket
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QWebSocketCorsAuthenticator
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QWebSocketHandshakeOptions
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QWebSocketProtocol
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QWebSocketServer
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QtWebSockets
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QtWebSocketsDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/QtWebSocketsVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qmaskgenerator.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qtwebsocketsexports.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qtwebsocketsversion.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qwebsocket.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qwebsocketcorsauthenticator.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qwebsockethandshakeoptions.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qwebsocketprotocol.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qwebsockets_global.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/qwebsocketserver.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtWebSocketsTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/Qt6WebSocketsAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/Qt6WebSocketsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/Qt6WebSocketsConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/Qt6WebSocketsConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/Qt6WebSocketsDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/Qt6WebSocketsTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/Qt6WebSocketsTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/Qt6WebSocketsVersionlessTargets.cmake
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebSockets/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebSockets.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebSockets.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6websockets_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6WebSockets.pc
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_websockets.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_websockets_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/WebSockets.json
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/watch b/debian/watch
index 7bd102c..b958ab2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=4
-https://download.qt.io/archive/qt/([\d\.]*)/([\d\.]*)/submodules/qtwebsockets-everywhere-src-(.*)\.tar\.xz
+opts=uversionmangle=s/-/~/ \
+https://qt-mirror.dannhauer.de/official_releases/qt/([\d\.]+)/([\d\.]+)(\d)/submodules/qtwebsockets-everywhere-src-([\d\.]+\d).tar.xz
\ No newline at end of file