[neon/backports-jammy/qxmpp-jammy/Neon/release_jammy] debian: merge from backports_noble with qt6ing, solib bumps and all sorts of goodies
Carlos De Maine
null at kde.org
Thu Aug 29 07:42:43 BST 2024
Git commit 1f79d146ebf8194beb384f8d5c37e404fc5fb4e2 by Carlos De Maine.
Committed on 29/08/2024 at 06:42.
Pushed by carlosdem into branch 'Neon/release_jammy'.
merge from backports_noble with qt6ing, solib bumps and all sorts of goodies
M +43 -8 debian/control
M +4 -3 debian/libqxmpp-dev.install
A +6 -0 debian/libqxmpp-qt6-dev.install
D +0 -1 debian/libqxmpp4.lintian-overrides
A +4 -0 debian/libqxmpp5-qt6.install
A +1 -0 debian/libqxmpp5-qt6.lintian-overrides
R +2 -2 debian/libqxmpp5.install [from: debian/libqxmpp4.install - 053% similarity]
A +1 -0 debian/libqxmpp5.lintian-overrides
M +14 -2 debian/rules
https://invent.kde.org/neon/backports-jammy/qxmpp-jammy/-/commit/1f79d146ebf8194beb384f8d5c37e404fc5fb4e2
diff --git a/debian/control b/debian/control
index b0127fc..4f70a20 100644
--- a/debian/control
+++ b/debian/control
@@ -4,23 +4,26 @@ 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-5compat-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
Vcs-Browser: https://salsa.debian.org/xmpp-team/qxmpp
-Package: libqxmpp4
+Package: libqxmpp5
Architecture: any
-Replaces: libqxmpp1, libqxmpp2, libqxmpp3
-Breaks: libqxmpp1, libqxmpp2, libqxmpp3
+Replaces: libqxmpp1, libqxmpp2, libqxmpp3, libqxmpp4
+Breaks: libqxmpp1, libqxmpp2, libqxmpp3, libqxmpp4
Depends: gstreamer1.0-plugins-base,
gstreamer1.0-plugins-good,
gstreamer1.0-plugins-ugly,
@@ -28,7 +31,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.
@@ -37,7 +40,7 @@ Package: libqxmpp-dev
Section: libdevel
Architecture: any
Depends: libgstreamer1.0-dev,
- libqxmpp4 (= ${binary:Version}),
+ libqxmpp5 (= ${binary:Version}),
qtbase5-dev,
${misc:Depends}
Suggests: libqxmpp-doc
@@ -48,6 +51,38 @@ Description: Development files for the QXmpp library
.
This package contains the development headers and libraries.
+Package: libqxmpp5-qt6
+Architecture: any
+Replaces: libqxmpp4-qt6
+Breaks: libqxmpp4-qt6
+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,
+ libqxmpp5-qt6 (= ${binary:Version}),
+ qt6-5compat-dev,
+ 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
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.lintian-overrides b/debian/libqxmpp4.lintian-overrides
deleted file mode 100644
index 3594470..0000000
--- a/debian/libqxmpp4.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libqxmpp4: package-name-doesnt-match-sonames libQXmppOmemoQt5-4 libQXmppQt5-4
\ No newline at end of file
diff --git a/debian/libqxmpp5-qt6.install b/debian/libqxmpp5-qt6.install
new file mode 100644
index 0000000..7ec14a0
--- /dev/null
+++ b/debian/libqxmpp5-qt6.install
@@ -0,0 +1,4 @@
+usr/lib/*/libQXmppQt6.so.5
+usr/lib/*/libQXmppQt6.so.*.*.*
+usr/lib/*/libQXmppOmemoQt6.so.5
+usr/lib/*/libQXmppOmemoQt6.so.*.*.*
diff --git a/debian/libqxmpp5-qt6.lintian-overrides b/debian/libqxmpp5-qt6.lintian-overrides
new file mode 100644
index 0000000..2293bbd
--- /dev/null
+++ b/debian/libqxmpp5-qt6.lintian-overrides
@@ -0,0 +1 @@
+libqxmpp5-qt6: package-name-doesnt-match-sonames libQXmppOmemoQt6-5 libQXmppQt6-5
diff --git a/debian/libqxmpp4.install b/debian/libqxmpp5.install
similarity index 53%
rename from debian/libqxmpp4.install
rename to debian/libqxmpp5.install
index e73c5f4..0bfc147 100644
--- a/debian/libqxmpp4.install
+++ b/debian/libqxmpp5.install
@@ -1,4 +1,4 @@
-usr/lib/*/libQXmppQt5.so.4
+usr/lib/*/libQXmppQt5.so.5
usr/lib/*/libQXmppQt5.so.*.*.*
-usr/lib/*/libQXmppOmemoQt5.so.4
+usr/lib/*/libQXmppOmemoQt5.so.5
usr/lib/*/libQXmppOmemoQt5.so.*.*.*
diff --git a/debian/libqxmpp5.lintian-overrides b/debian/libqxmpp5.lintian-overrides
new file mode 100644
index 0000000..29fc3ff
--- /dev/null
+++ b/debian/libqxmpp5.lintian-overrides
@@ -0,0 +1 @@
+libqxmpp5: package-name-doesnt-match-sonames libQXmppOmemoQt5-5 libQXmppQt5-5
diff --git a/debian/rules b/debian/rules
index 5549c60..d8d1a18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,22 @@ 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) -DQT_VERSION_MAJOR=5
+ dh_auto_configure --builddirectory=build-Qt6 -- $(CMAKEOPTS) -DQT_VERSION_MAJOR=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
More information about the Neon-commits
mailing list