[neon/extras/qcoro/Neon/release] debian: Merge remote-tracking branch 'salsa/master' into Neon/release_focal

[Jonathan Esk-Riddell]

Git commit 1a9ba89e3a7548702092d71b1651637520a75186 by Jonathan Esk-Riddell.
Committed on 04/05/2022 at 11:30.
Pushed by jriddell into branch 'Neon/release'.

Merge remote-tracking branch 'salsa/master' into Neon/release_focal

M  +16   -9    debian/control
M  +10   -6    debian/rules

https://invent.kde.org/neon/extras/qcoro/commit/1a9ba89e3a7548702092d71b1651637520a75186

diff --cc debian/control
index 04b383a,b13b8be..97efd64
--- a/debian/control
+++ b/debian/control
@@@ -86,27 -92,19 +92,28 @@@ Multi-Arch: sam
  Depends: libqcoro5core0 (= ${binary:Version}),
           libqcoro5dbus0 (= ${binary:Version}),
           libqcoro5network0 (= ${binary:Version}),
+          qtbase5-dev (>= 5.15.0~),
           ${misc:Depends},
-          ${shlibs: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: libqcoro-dev
 +Architecture: all
 +Section: oldlibs
 +Priority: extra
 +Description: transitional dummy for qcoro-qt5-dev
 + This package can be removed.
 +
  Package: qcoro-qt6-dev
  Architecture: any
+ Multi-Arch: same
  Depends: libqcoro6core0 (= ${binary:Version}),
           libqcoro6dbus0 (= ${binary:Version}),
           libqcoro6network0 (= ${binary:Version}),
diff --cc debian/rules
index f23bf60,3348419..8d2513f
--- a/debian/rules
+++ b/debian/rules
@@@ -2,10 -2,9 +2,12 @@@
  # -*- makefile -*-
  
  export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 +export CC=gcc-10
 +export CXX=g++-10
 +
  
+ CMAKE_ARGS = -DBUILD_SHARED_LIBS=ON -DQCORO_BUILD_EXAMPLES=OFF
+ 
  %:
  	dh $@ --with pkgkde_symbolshelper