[neon/backports-jammy/qxmpp-jammy/Neon/unstable] debian: qt5 qt6 double building

[Carlos De Maine]

Git commit 15df9e7a162821060b215e7a48bb1b738ad6f0d0 by Carlos De Maine.
Committed on 08/10/2023 at 07:41.
Pushed by carlosdem into branch 'Neon/unstable'.

qt5 qt6 double building

M  +38   -5    debian/control
M  +4    -3    debian/libqxmpp-dev.install
A  +6    -0    debian/libqxmpp-qt6-dev.install
A  +4    -0    debian/libqxmpp4-qt6.install
A  +1    -0    debian/libqxmpp4-qt6.lintian-overrides
M  +20   -3    debian/rules

https://invent.kde.org/neon/backports-jammy/qxmpp-jammy/-/commit/15df9e7a162821060b215e7a48bb1b738ad6f0d0

diff --git a/debian/control b/debian/control
index b0127fc..7aa2c33 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,16 @@ Priority: optional
 Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel at lists.alioth.debian.org>
 Uploaders: Jeremy Lainé <jeremy.laine at m4x.org>, Boris Pek <tehnick at debian.org>
 Build-Depends: cmake,
-               debhelper-compat (= 11),
+               debhelper-compat (= 13),
                doxygen,
                graphviz,
                libgstreamer1.0-dev,
                libomemo-c-dev,
                libqca-qt5-2-dev,
-               qtbase5-dev
-Standards-Version: 4.6.1
+               libqca-qt6-2-dev,
+               qt6-base-dev,
+               qtbase5-dev,
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://github.com/qxmpp-project/qxmpp
 Vcs-Git: https://salsa.debian.org/xmpp-team/qxmpp.git
@@ -28,7 +30,7 @@ Depends: gstreamer1.0-plugins-base,
          ${shlibs:Depends}
 Multi-Arch: same
 Description: QXmpp library for XMPP client and server applications
- QXmpp is a cross-platform C++ XMPP library built upon Qt. It strives to be
+ QXmpp is a cross-platform C++ XMPP library built upon Qt5. It strives to be
  as easy to use as possible.
  .
  This package contains the shared library.
@@ -48,6 +50,37 @@ Description: Development files for the QXmpp library
  .
  This package contains the development headers and libraries.
 
+Package: libqxmpp4-qt6
+Architecture: any
+Replaces: libqxmpp1, libqxmpp2, libqxmpp3
+Breaks: libqxmpp1, libqxmpp2, libqxmpp3
+Depends: gstreamer1.0-plugins-base,
+         gstreamer1.0-plugins-good,
+         gstreamer1.0-plugins-ugly,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Multi-Arch: same
+Description: QXmpp library for XMPP client and server applications
+ QXmpp is a cross-platform C++ XMPP library built upon Qt6. It strives to be
+ as easy to use as possible.
+ .
+ This package contains the shared library.
+
+Package: libqxmpp-qt6-dev
+Section: libdevel
+Architecture: any
+Depends: libgstreamer1.0-dev,
+         libqxmpp4-qt6 (= ${binary:Version}),
+         qt6-base-dev,
+         ${misc:Depends}
+Suggests: libqxmpp-doc
+Multi-Arch: same
+Description: Development files for the QXmpp library
+ QXmpp is a cross-platform C++ XMPP library built upon Qt6. It strives to be
+ as easy to use as possible.
+ .
+ This package contains the development headers and libraries.
+
 Package: libqxmpp-doc
 Section: doc
 Architecture: all
@@ -57,4 +90,4 @@ Description: Documentation for the QXmpp library
  QXmpp is a cross-platform C++ XMPP library built upon Qt. It strives to be
  as easy to use as possible.
  .
- This package contains the HTML documentation.
+ This package contains the HTML documentation.
\ No newline at end of file
diff --git a/debian/libqxmpp-dev.install b/debian/libqxmpp-dev.install
index b0e5df9..d13cf33 100644
--- a/debian/libqxmpp-dev.install
+++ b/debian/libqxmpp-dev.install
@@ -1,5 +1,6 @@
-usr/include/
-usr/lib/*/cmake/
+usr/include/QXmppQt5/
+usr/lib/*/cmake/QXmppQt5/
+usr/lib/*/cmake/QXmppOmemoQt5/
 usr/lib/*/libQXmppQt5.so
 usr/lib/*/libQXmppOmemoQt5.so
-usr/lib/*/pkgconfig/
+usr/lib/*/pkgconfig/QXmppQt5.pc
\ No newline at end of file
diff --git a/debian/libqxmpp-qt6-dev.install b/debian/libqxmpp-qt6-dev.install
new file mode 100644
index 0000000..94e3456
--- /dev/null
+++ b/debian/libqxmpp-qt6-dev.install
@@ -0,0 +1,6 @@
+usr/include/QXmppQt6/
+usr/lib/*/cmake/QXmppQt6/
+usr/lib/*/cmake/QXmppOmemoQt6/
+usr/lib/*/libQXmppQt6.so
+usr/lib/*/libQXmppOmemoQt6.so
+usr/lib/*/pkgconfig/QXmppQt6.pc
diff --git a/debian/libqxmpp4-qt6.install b/debian/libqxmpp4-qt6.install
new file mode 100644
index 0000000..bb991be
--- /dev/null
+++ b/debian/libqxmpp4-qt6.install
@@ -0,0 +1,4 @@
+usr/lib/*/libQXmppQt6.so.4
+usr/lib/*/libQXmppQt6.so.*.*.*
+usr/lib/*/libQXmppOmemoQt6.so.4
+usr/lib/*/libQXmppOmemoQt6.so.*.*.*
diff --git a/debian/libqxmpp4-qt6.lintian-overrides b/debian/libqxmpp4-qt6.lintian-overrides
new file mode 100644
index 0000000..b5e9b5a
--- /dev/null
+++ b/debian/libqxmpp4-qt6.lintian-overrides
@@ -0,0 +1 @@
+libqxmpp4: package-name-doesnt-match-sonames libQXmppOmemoQt6-4 libQXmppQt6-4
diff --git a/debian/rules b/debian/rules
index 5549c60..3f90faa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,30 @@ CMAKEOPTS = -DBUILD_DOCUMENTATION=ON \
             -DBUILD_OMEMO=ON
 
 %:
-	dh $@
+	dh $@ --with pkgkde_symbolshelper
+
+execute_after_dh_auto_clean:
+	rm -rf build-Qt6
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CMAKEOPTS)
+	dh_auto_configure -- $(CMAKEOPTS) -DUSE_QT_VERSION=5
+	dh_auto_configure --builddirectory=build-Qt6 -- $(CMAKEOPTS) -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
 
 override_dh_installdocs:
 	dh_installdocs
 	dh_doxygen -i
 
-.PHONY: override_dh_auto_test-indep
+execute_after_dh_install-indep:
+	rm debian/qcoro-doc/usr/share/doc/qcoro-doc/docs/changelog.md
+	rm -r debian/qcoro-doc/usr/share/doc/qcoro-doc/docs/about
+	rm -r debian/qcoro-doc/usr/share/doc/qcoro-doc/docs/overrides
+
+	.PHONY: override_dh_auto_test-indep