[neon/extras/qcoro/Neon/release] debian: no qt6 for now

Jonathan Esk-Riddell null at kde.org
Tue Aug 9 12:26:25 BST 2022


Git commit 4097fac25ad0d253acccef3cc62f691366a9a8c7 by Jonathan Esk-Riddell.
Committed on 09/08/2022 at 11:26.
Pushed by jriddell into branch 'Neon/release'.

no qt6 for now

M  +0    -50   debian/control
M  +0    -4    debian/rules

https://invent.kde.org/neon/extras/qcoro/commit/4097fac25ad0d253acccef3cc62f691366a9a8c7

diff --git a/debian/control b/debian/control
index e7cad51..21cc96d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ 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
@@ -46,37 +45,6 @@ Description: C++20 coroutines for Qt5 - Network
  coroutines in connection with certain asynchronous Qt5 actions.
  .
  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
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: C++20 coroutines for Qt5 - WebSockets
- 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 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
@@ -107,21 +75,3 @@ Description: C++20 coroutines for Qt5 - development
  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 dddcd2f..b211ed4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,15 +16,12 @@ execute_after_dh_auto_clean:
 
 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
@@ -33,4 +30,3 @@ execute_after_dh_install-indep:
 
 override_dh_auto_test:
 	dh_auto_test --no-parallel
-	dh_auto_test --no-parallel --builddirectory=build-Qt6


More information about the Neon-commits mailing list