[neon/backports-jammy/qxmpp-jammy/Neon/unstable] debian: Revert "qt6ify"
Carlos De Maine
null at kde.org
Sun Oct 8 05:30:37 BST 2023
Git commit fe326274dbf2cd9838f1468797390614b23c5abf by Carlos De Maine.
Committed on 08/10/2023 at 06:30.
Pushed by carlosdem into branch 'Neon/unstable'.
Revert "qt6ify"
This reverts commit c7f320afc5bb362565f539e6c7327b31389fcda9
M +5 -5 debian/control
M +2 -2 debian/libqxmpp-dev.install
M +4 -4 debian/libqxmpp4.install
M +1 -1 debian/libqxmpp4.lintian-overrides
M +1 -2 debian/rules
https://invent.kde.org/neon/backports-jammy/qxmpp-jammy/-/commit/fe326274dbf2cd9838f1468797390614b23c5abf
diff --git a/debian/control b/debian/control
index 381d2ed..b0127fc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ 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 (= 13),
+ debhelper-compat (= 11),
doxygen,
graphviz,
libgstreamer1.0-dev,
libomemo-c-dev,
- libqca-qt6-2-dev,
- qt6-base-dev
-Standards-Version: 4.6.2
+ libqca-qt5-2-dev,
+ qtbase5-dev
+Standards-Version: 4.6.1
Rules-Requires-Root: no
Homepage: https://github.com/qxmpp-project/qxmpp
Vcs-Git: https://salsa.debian.org/xmpp-team/qxmpp.git
@@ -38,7 +38,7 @@ Section: libdevel
Architecture: any
Depends: libgstreamer1.0-dev,
libqxmpp4 (= ${binary:Version}),
- qt6-base-dev,
+ qtbase5-dev,
${misc:Depends}
Suggests: libqxmpp-doc
Multi-Arch: same
diff --git a/debian/libqxmpp-dev.install b/debian/libqxmpp-dev.install
index 818cd0f..b0e5df9 100644
--- a/debian/libqxmpp-dev.install
+++ b/debian/libqxmpp-dev.install
@@ -1,5 +1,5 @@
usr/include/
usr/lib/*/cmake/
-usr/lib/*/libQXmppQt6.so
-usr/lib/*/libQXmppOmemoQt6.so
+usr/lib/*/libQXmppQt5.so
+usr/lib/*/libQXmppOmemoQt5.so
usr/lib/*/pkgconfig/
diff --git a/debian/libqxmpp4.install b/debian/libqxmpp4.install
index bb991be..e73c5f4 100644
--- a/debian/libqxmpp4.install
+++ b/debian/libqxmpp4.install
@@ -1,4 +1,4 @@
-usr/lib/*/libQXmppQt6.so.4
-usr/lib/*/libQXmppQt6.so.*.*.*
-usr/lib/*/libQXmppOmemoQt6.so.4
-usr/lib/*/libQXmppOmemoQt6.so.*.*.*
+usr/lib/*/libQXmppQt5.so.4
+usr/lib/*/libQXmppQt5.so.*.*.*
+usr/lib/*/libQXmppOmemoQt5.so.4
+usr/lib/*/libQXmppOmemoQt5.so.*.*.*
diff --git a/debian/libqxmpp4.lintian-overrides b/debian/libqxmpp4.lintian-overrides
index d7b3083..3594470 100644
--- a/debian/libqxmpp4.lintian-overrides
+++ b/debian/libqxmpp4.lintian-overrides
@@ -1 +1 @@
-libqxmpp4: package-name-doesnt-match-sonames libQXmppOmemoQt6-4 libQXmppQt6-4
\ No newline at end of file
+libqxmpp4: package-name-doesnt-match-sonames libQXmppOmemoQt5-4 libQXmppQt5-4
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index b830192..5549c60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,7 @@ CMAKEOPTS = -DBUILD_DOCUMENTATION=ON \
-DBUILD_EXAMPLES=ON \
-DBUILD_TESTS=OFF \
-DWITH_GSTREAMER=ON \
- -DBUILD_OMEMO=ON \
- -QT_VERSION_MAJOR=6
+ -DBUILD_OMEMO=ON
%:
dh $@
More information about the Neon-commits
mailing list