[neon/qt6/qt6-websockets/Neon/release] debian: revert to salsa experimental for qt 6.4.1 and run qt_sixy

Jonathan Esk-Riddell null at kde.org
Tue Dec 6 13:33:52 GMT 2022 

Git commit 05a057aa235df5ce6e876118b7ae276c80ade4f3 by Jonathan Esk-Riddell.
Committed on 06/12/2022 at 13:30.
Pushed by jriddell into branch 'Neon/release'.

revert to salsa experimental for qt 6.4.1 and run qt_sixy

A  +1    -0    debian/.gitattributes
A  +1    -0    debian/.gitignore
M  +78   -3    debian/changelog
M  +27   -10   debian/control
M  +1    -1    debian/copyright
M  +0    -2    debian/not-installed
M  +35   -7    debian/qt6-websockets-dev.install
M  +4    -2    debian/qt6-websockets.install
M  +1    -0    debian/rules

https://invent.kde.org/neon/qt6/qt6-websockets/commit/05a057aa235df5ce6e876118b7ae276c80ade4f3

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..027271b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+files
diff --git a/debian/changelog b/debian/changelog
index d87a897..3b1d6e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,83 @@
-qt6-websockets (6.4.0-0neon) UNRELEASED; urgency=medium
+qt6-websockets (6.4.1-1) experimental; urgency=medium
 
-  * New release
+  [ Patrick Franz ]
+  * New upstream release (6.4.1).
+  * Bump Qt B-Ds to 6.4.1.
+  * Update ABI to 6.4.1.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 16 Nov 2022 06:59:48 +0100
+
+qt6-websockets (6.4.0-2) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Rename libqt6websockets6-dev to qt6-websockets-dev.
+  * New binary package qt6-websockets-private-dev.
+  * Update d/copyright.
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 06 Nov 2022 13:25:45 +0100
+
+qt6-websockets (6.4.0-1) experimental; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Bump minimum CMake version in order to get pkg-config's .pc files.
+
+  [ Patrick Franz ]
+  * Increase CMake verbosity level.
+  * New upstream release (6.4.0).
+  * Bump Qt B-Ds to 6.4.0.
+  * Update list of installed files.
+  * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org>  Thu, 13 Oct 2022 12:37:43 +0200
+
+qt6-websockets (6.3.1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 15 Aug 2022 19:24:16 +0200
+
+qt6-websockets (6.3.1-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.3.1).
+  * Bump Qt B-Ds to 6.3.1.
+  * Bump Standards-Version to 4.6.1 (no changes needed).
+  * Update list of installed files.
+  * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 17 Jul 2022 03:43:52 +0200
+
+qt6-websockets (6.3.0-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.3.0).
+  * Bump Qt B-Ds to 6.3.0.
+  * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 14 Jun 2022 21:01:13 +0200
+
+qt6-websockets (6.2.4-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 22 Apr 2022 20:08:04 +0200
+
+qt6-websockets (6.2.4-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.2.4).
+  * Bump Qt B-Ds to 6.2.4.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 30 Mar 2022 21:14:07 +0200
+
+qt6-websockets (6.2.2-3) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
 
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 02 Feb 2022 15:13:50 +0000
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:04:38 +0100
 
 qt6-websockets (6.2.2-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index bd80bdc..1834eda 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
                debhelper-compat (= 13),
                libgl-dev,
                libssl-dev,
@@ -12,9 +12,9 @@ Build-Depends: cmake (>= 3.18~),
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.4.0),
-               qt6-declarative-dev (>= 6.4.0)
-Standards-Version: 4.6.0
+               qt6-base-dev (>= 6.4.1+dfsg~),
+               qt6-declarative-dev (>= 6.4.1+dfsg~)
+Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-websockets
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-websockets.git
@@ -23,9 +23,8 @@ Rules-Requires-Root: no
 Package: qt6-websockets
 Architecture: any
 Section: kde
-Provides: libqt6websockets6, qml6-module-qtwebsockets
-Breaks: libqt6websockets6 (<< 6.4), qml6-module-qtwebsockets (<< 6.4)
-Replaces: libqt6websockets6 (<< 6.4), qml6-module-qtwebsockets (<< 6.4)
+X-Neon-MergedPackage: true
+Provides: qt6-websockets-abi (= 6.4.1)
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 6 WebSockets library
@@ -38,13 +37,31 @@ Description: Qt 6 WebSockets library
 Package: qt6-websockets-dev
 Architecture: any
 Section: kde
-Provides: libqt6websockets6-dev
-Breaks: libqt6websockets6-dev (<< 6.4)
-Replaces: libqt6websockets6-dev (<< 6.4)
+X-Neon-MergedPackage: true
 Depends: qt6-base-dev, qt6-websockets (= ${binary:Version}), ${misc:Depends}
+Breaks: libqt6websockets6-dev
+Replaces: libqt6websockets6-dev
 Description: Qt 6 WebSockets library - development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  This package contains the development files needed to build Qt applications
  using Qt 6 WebSockets library.
+
+Package: libqt6websockets6
+Architecture: all
+Depends: qt6-websockets
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtwebsockets
+Architecture: all
+Depends: qt6-websockets
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-websockets-private-dev
+Architecture: all
+Depends: qt6-websockets-dev
+Description: Dummy transitional
+  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 7a9c6d2..9f3e8b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Copyright: 2016 Kurt Pattyn <pattyn.kurt at gmail.com>
 License: LGPL-3 or GPL-2
 
 Files: debian/*
-Copyright: 2021 Patrick Franz <deltaone at debian.org>
+Copyright: 2022 Patrick Franz <deltaone at debian.org>
 License: LGPL-3 or GPL-2
 
 Files: src/websockets/qwebsocket_wasm_p.cpp
diff --git a/debian/not-installed b/debian/not-installed
index 5c25f24..c661a82 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,8 +1,6 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebSockets/6.*
 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
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_websockets_private.pri
diff --git a/debian/qt6-websockets-dev.install b/debian/qt6-websockets-dev.install
index acc62df..ee9a4db 100644
--- a/debian/qt6-websockets-dev.install
+++ b/debian/qt6-websockets-dev.install
@@ -1,7 +1,35 @@
-usr/include/
-usr/lib/*/cmake/
-usr/lib/*/libQt6*.prl
-usr/lib/*/libQt6*.so
-usr/lib/*/metatypes/qt6*metatypes.json
-usr/lib/*/pkgconfig/Qt6*.pc
-usr/lib/*/qt6/mkspecs/
+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/lib/${DEB_HOST_MULTIARCH}/libQt6WebSockets.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebSockets.so
+usr/lib/${DEB_HOST_MULTIARCH}/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/share/qt6/modules/WebSockets.json
diff --git a/debian/qt6-websockets.install b/debian/qt6-websockets.install
index b1d32b1..efc8ab2 100644
--- a/debian/qt6-websockets.install
+++ b/debian/qt6-websockets.install
@@ -1,2 +1,4 @@
-usr/lib/*/libQt6*.so.6*
-usr/lib/*/qt6/qml
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebSockets.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebSockets/libqmlwebsocketsplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebSockets/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebSockets/qmldir
diff --git a/debian/rules b/debian/rules
index 149018d..9d5ad89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		--log-level=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
 execute_after_dh_auto_install:

More information about the Neon-commits mailing list