[neon/extras/qcoro/Neon/unstable] debian: add back qt6

[Jonathan Esk-Riddell]

Git commit 4efecfebb6cc39d854dc201544ded66e62cf7ba1 by Jonathan Esk-Riddell.
Committed on 04/11/2022 at 16:18.
Pushed by jriddell into branch 'Neon/unstable'.

add back qt6

M  +60   -2    debian/control
M  +7    -3    debian/rules

https://invent.kde.org/neon/extras/qcoro/commit/4efecfebb6cc39d854dc201544ded66e62cf7ba1

diff --git a/debian/control b/debian/control
index 8094e46..6475e41 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,8 @@ Build-Depends: cmake (>= 3.18.4~),
                pkg-kde-tools,
                qtbase5-dev (>= 5.15.0~),
                libqt5websockets5-dev (>= 5.15.0~),
+               qt6-base-dev (>= 6.2.0~),
+               libqt6websockets6-dev (>= 6.2.0~),
 Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/qcoro
 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/qcoro.git
@@ -25,6 +27,16 @@ Description: C++20 coroutines for Qt5 - Core
  .
  This is the core library.
 
+Package: libqcoro6core0
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: C++20 coroutines for Qt6 - Core
+ QCoro is a C++ library that provide set of tools to make use of C++20
+ coroutines in connection with certain asynchronous Qt6 actions.
+ .
+ This is the core library.
+
 Package: libqcoro5dbus0
 Architecture: any
 Multi-Arch: same
@@ -35,6 +47,16 @@ Description: C++20 coroutines for Qt5 - DBus
  .
  This is the DBus library.
 
+Package: libqcoro6dbus0
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: C++20 coroutines for Qt6 - DBus
+ QCoro is a C++ library that provide set of tools to make use of C++20
+ coroutines in connection with certain asynchronous Qt6 actions.
+ .
+ This is the DBus library.
+
 Package: libqcoro5network0
 Architecture: any
 Multi-Arch: same
@@ -45,6 +67,16 @@ Description: C++20 coroutines for Qt5 - Network
  .
  This is the network library.
 
+Package: libqcoro6network0
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: C++20 coroutines for Qt6 - Network
+ QCoro is a C++ library that provide set of tools to make use of C++20
+ coroutines in connection with certain asynchronous Qt6 actions.
+ .
+ This is the network library.
+
 Package: libqcoro5websockets0
 Architecture: any
 Multi-Arch: same
@@ -55,6 +87,16 @@ Description: C++20 coroutines for Qt5 - WebSockets
  .
  This is the web sockets library.
 
+Package: libqcoro6websockets0
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: C++20 coroutines for Qt6 - WebSockets
+ QCoro is a C++ library that provide set of tools to make use of C++20
+ coroutines in connection with certain asynchronous Qt6 actions.
+ .
+ This is the web sockets library.
+
 Package: qcoro-doc
 Architecture: all
 Multi-Arch: foreign
@@ -78,10 +120,26 @@ Depends: libqcoro5core0 (= ${binary:Version}),
          ${misc:Depends},
 Recommends: qcoro-doc
 Section: libdevel
-Breaks: libqcoro-dev (<< ${source:Version}~ciBuild)
-Replaces: libqcoro-dev (<< ${source:Version}~ciBuild)
 Description: C++20 coroutines for Qt5 - development
  QCoro is a C++ library that provide set of tools to make use of C++20
  coroutines in connection with certain asynchronous Qt5 actions.
  .
  This package has the development files.
+
+Package: qcoro-qt6-dev
+Architecture: any
+Multi-Arch: same
+Depends: libqcoro6core0 (= ${binary:Version}),
+         libqcoro6dbus0 (= ${binary:Version}),
+         libqcoro6network0 (= ${binary:Version}),
+         libqcoro6websockets0 (= ${binary:Version}),
+         qt6-base-dev (>= 6.1.2~),
+         libqt6websockets6-dev (>= 6.2.0~),
+         ${misc:Depends},
+Recommends: qcoro-doc
+Section: libdevel
+Description: C++20 coroutines for Qt6 - development
+ QCoro is a C++ library that provide set of tools to make use of C++20
+ coroutines in connection with certain asynchronous Qt6 actions.
+ .
+ This package has the development files.
diff --git a/debian/rules b/debian/rules
index 52c2b18..180aa6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,23 +2,26 @@
 # -*- makefile -*-
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export CC=gcc-11
-export CXX=g++-11
-
 
 CMAKE_ARGS = -DBUILD_SHARED_LIBS=ON -DQCORO_BUILD_EXAMPLES=OFF
 
 %:
 	dh $@ --with pkgkde_symbolshelper
 
+execute_after_dh_auto_clean:
+	rm -rf build-Qt6
+
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_ARGS) -DUSE_QT_VERSION=5
+	dh_auto_configure --builddirectory=build-Qt6 -- $(CMAKE_ARGS) -DUSE_QT_VERSION=6
 
 override_dh_auto_build:
 	dh_auto_build
+	dh_auto_build --builddirectory=build-Qt6
 
 override_dh_auto_install:
 	dh_auto_install
+	dh_auto_install --builddirectory=build-Qt6
 
 execute_after_dh_install-indep:
 	rm debian/qcoro-doc/usr/share/doc/qcoro-doc/docs/changelog.md
@@ -27,3 +30,4 @@ execute_after_dh_install-indep:
 
 override_dh_auto_test:
 	dh_auto_test --no-parallel
+	dh_auto_test --no-parallel --builddirectory=build-Qt6