diff --git a/Jenkinsfile b/Jenkinsfile
index 7f58dfdc66c66beb5e28249785e03e83a86a33cc..2d34ececd1bec32c0c94ecee5c48daeb0304c21b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -137,12 +137,12 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
steps {
sh """git checkout ${params.CHANNEL}
git status
- git reset --hard origin/nightly
+ git reset --hard origin/${params.CHANNEL}
git status
# Submodules are generally not managed by merging
- git merge -X theirs --no-commit FETCH_HEAD || true
+ git merge -X theirs --no-commit FETCH_HEAD
git status
- git checkout FETCH_HEAD -- daemon lrc client-qt client-gnome lrc-gnome
+ git checkout FETCH_HEAD -- daemon lrc client-qt
git status
"""
}
diff --git a/client-qt b/client-qt
index 92829ad3e14dc85cf20d1125ad9fda80887c8290..7ed3ec51e98261a13426daa94ba56eb9a2febb37 160000
--- a/client-qt
+++ b/client-qt
@@ -1 +1 @@
-Subproject commit 92829ad3e14dc85cf20d1125ad9fda80887c8290
+Subproject commit 7ed3ec51e98261a13426daa94ba56eb9a2febb37
diff --git a/daemon b/daemon
index dca2eaaa4bb672e3e7c2f69ad02c88c0af15c9a2..a6e0119ce72cc793259998ac70a5de328467dc56 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit dca2eaaa4bb672e3e7c2f69ad02c88c0af15c9a2
+Subproject commit a6e0119ce72cc793259998ac70a5de328467dc56
diff --git a/docker/Dockerfile_ubuntu_22.04 b/docker/Dockerfile_ubuntu_22.04
index 957dd686756e476cc1ae999679b90ae2159c95cc..8bf91e2d71b0d9a394426735fca073ea71c9c739 100644
--- a/docker/Dockerfile_ubuntu_22.04
+++ b/docker/Dockerfile_ubuntu_22.04
@@ -18,12 +18,5 @@ RUN /opt/prebuild-package-debian.sh qt-deps
COPY packaging/rules/debian/control /tmp/builddeps/debian/control
RUN /opt/prebuild-package-debian.sh jami-deps
-# Install CMake 3.19 for Qt 6
-ADD scripts/install-cmake.sh /opt/install-cmake.sh
-RUN /opt/install-cmake.sh
-# nodejs
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt install nodejs -y
-
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD ["/opt/build-package-debian.sh"]
diff --git a/lrc b/lrc
index 492ff0fec3f9f880a923faaae9ca112e560109c9..80fc042208fdb1015e1528fc05d7331519baf417 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit 492ff0fec3f9f880a923faaae9ca112e560109c9
+Subproject commit 80fc042208fdb1015e1528fc05d7331519baf417
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index 420a851ce09f1fbff9e46ed3e8591876f39b9858..72d443a375f86db82f6589a1d7b5954489692b58 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -10,19 +10,10 @@ Build-Depends: debhelper (>= 9),
# qt client
libqt-jami,
python3,
-# both qt client and gnome client
libnm-dev,
libnotify-dev,
-# gnome client
- libcanberra-gtk3-dev,
- libclutter-gtk-1.0-dev,
- libclutter-1.0-dev,
- libglib2.0-dev,
- libgtk-3-dev,
- gettext,
libqrencode-dev,
libayatana-appindicator3-dev | libappindicator3-dev,
- libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
# daemon
libdbus-1-dev,
libdbus-c++-dev,
@@ -104,19 +95,6 @@ Description: Secure and distributed voice, video and chat platform - desktop cli
.
This package contains the jami-qt desktop client.
-Package: jami-gnome
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- jami-libclient-gnome (=${binary:Version}),
- libqt-jami (>= 6.2.3)
-Description: Secure and distributed voice, video and chat platform - desktop client
- Jami (jami.net) is a secure and distributed voice, video and chat communication
- platform that requires no centralized server and leaves the power of privacy
- in the hands of the user.
- .
- This package contains the older jami-gnome desktop client.
-
Package: jami-libclient
Architecture: any
Depends: ${shlibs:Depends},
@@ -131,20 +109,6 @@ Description: Secure and distributed voice, video and chat platform - daemon
.
This package contains the Jami client library, lrc, for the Qt client.
-Package: jami-libclient-gnome
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- jami-daemon (=${binary:Version}),
- libqt-jami (>= 6.2.3)
-Conflicts: jami-libclient
-Description: Secure and distributed voice, video and chat platform - daemon
- Jami (jami.net) is a secure and distributed voice, video and chat communication
- platform that requires no centralized server and leaves the power of privacy
- in the hands of the user.
- .
- This package contains the Jami client library, lrc, for the GNOME client.
-
Package: jami-daemon
Architecture: any
Depends: ${shlibs:Depends},
diff --git a/packaging/rules/debian/copyright b/packaging/rules/debian/copyright
index 43aecf3bf04aeadd7029b9333a86a23ddfc58815..1b2220debd76a7ab884735c94d1bf8911fd186ff 100644
--- a/packaging/rules/debian/copyright
+++ b/packaging/rules/debian/copyright
@@ -98,17 +98,6 @@ License: LGPL-2.1+
## End of lrc ##
################
-###########################
-## Start of gnome client ##
-###########################
-
-Files: client-gnome/web/linkify*
-Copyright: 2016 SoapBox Innovations Inc.
-License: Expat
-
-#########################
-## End of gnome client ##
-#########################
License: GPL-3+
This program is free software: you can redistribute it and/or modify
diff --git a/packaging/rules/debian/jami-all.manpages b/packaging/rules/debian/jami-all.manpages
index a2e889dda716131b3ec84970ca47088c617614f1..857be47ff4fcc76d264fb29fb67ea607b54b8013 100644
--- a/packaging/rules/debian/jami-all.manpages
+++ b/packaging/rules/debian/jami-all.manpages
@@ -1,2 +1 @@
-client-gnome/doc/jami-gnome.1
daemon/jamid.1
diff --git a/packaging/rules/debian/jami.manpages b/packaging/rules/debian/jami.manpages
index a1d1af97356a735b5fdf7a175cc988ff5bbdf602..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/packaging/rules/debian/jami.manpages
+++ b/packaging/rules/debian/jami.manpages
@@ -1 +0,0 @@
-client-gnome/doc/jami-gnome.1
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index 7759146bc45de767527e61474cf9f3df7c99f03b..d5464d7035f0256b0d00d9e8fa249f1064e824e4 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -129,6 +129,13 @@ override_dh_auto_clean:
rm -rfv daemon/contrib/native
rm -rfv daemon/jamid.1
+ #########################
+ ## libringclient clean ##
+ #########################
+ # CMake build system has no distclean target, so use clean.
+ [ -f lrc/build/Makefile ] && make -C lrc/build clean || true
+ rm -rfv lrc/build
+
#####################
## qt client clean ##
#####################
@@ -196,8 +203,7 @@ override_dh_auto_install:
override_dh_shlibdeps:
dh_shlibdeps -- \
-x$(JAMI_ALL_IN_ONE_PKG_NAME) \
- -x$(JAMI_LIB_CLIENT_PKG_NAME) \
- -x$(JAMI_LIB_CLIENT_GNOME_PKG_NAME)
+ -x$(JAMI_LIB_CLIENT_PKG_NAME)
tmpdir:= $(shell mktemp -d)
workdir:= $(shell pwd)