Skip to content
Snippets Groups Projects
Commit 924b928f authored by jenkins's avatar jenkins
Browse files

New release.

parents d0db1453 0988cc48
No related branches found
No related tags found
No related merge requests found
...@@ -137,12 +137,12 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client ...@@ -137,12 +137,12 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
steps { steps {
sh """git checkout ${params.CHANNEL} sh """git checkout ${params.CHANNEL}
git status git status
git reset --hard origin/nightly git reset --hard origin/${params.CHANNEL}
git status git status
# Submodules are generally not managed by merging # 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 status
git checkout FETCH_HEAD -- daemon lrc client-qt client-gnome lrc-gnome git checkout FETCH_HEAD -- daemon lrc client-qt
git status git status
""" """
} }
......
client-qt @ 7ed3ec51
Subproject commit 92829ad3e14dc85cf20d1125ad9fda80887c8290 Subproject commit 7ed3ec51e98261a13426daa94ba56eb9a2febb37
daemon @ a6e0119c
Subproject commit dca2eaaa4bb672e3e7c2f69ad02c88c0af15c9a2 Subproject commit a6e0119ce72cc793259998ac70a5de328467dc56
...@@ -18,12 +18,5 @@ RUN /opt/prebuild-package-debian.sh qt-deps ...@@ -18,12 +18,5 @@ RUN /opt/prebuild-package-debian.sh qt-deps
COPY packaging/rules/debian/control /tmp/builddeps/debian/control COPY packaging/rules/debian/control /tmp/builddeps/debian/control
RUN /opt/prebuild-package-debian.sh jami-deps 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 ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD ["/opt/build-package-debian.sh"] CMD ["/opt/build-package-debian.sh"]
lrc @ 80fc0422
Subproject commit 492ff0fec3f9f880a923faaae9ca112e560109c9 Subproject commit 80fc042208fdb1015e1528fc05d7331519baf417
...@@ -10,19 +10,10 @@ Build-Depends: debhelper (>= 9), ...@@ -10,19 +10,10 @@ Build-Depends: debhelper (>= 9),
# qt client # qt client
libqt-jami, libqt-jami,
python3, python3,
# both qt client and gnome client
libnm-dev, libnm-dev,
libnotify-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, libqrencode-dev,
libayatana-appindicator3-dev | libappindicator3-dev, libayatana-appindicator3-dev | libappindicator3-dev,
libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
# daemon # daemon
libdbus-1-dev, libdbus-1-dev,
libdbus-c++-dev, libdbus-c++-dev,
...@@ -104,19 +95,6 @@ Description: Secure and distributed voice, video and chat platform - desktop cli ...@@ -104,19 +95,6 @@ Description: Secure and distributed voice, video and chat platform - desktop cli
. .
This package contains the jami-qt desktop client. 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 Package: jami-libclient
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
...@@ -131,20 +109,6 @@ Description: Secure and distributed voice, video and chat platform - daemon ...@@ -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. 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 Package: jami-daemon
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
......
...@@ -98,17 +98,6 @@ License: LGPL-2.1+ ...@@ -98,17 +98,6 @@ License: LGPL-2.1+
## End of lrc ## ## 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+ License: GPL-3+
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
......
client-gnome/doc/jami-gnome.1
daemon/jamid.1 daemon/jamid.1
client-gnome/doc/jami-gnome.1
...@@ -129,6 +129,13 @@ override_dh_auto_clean: ...@@ -129,6 +129,13 @@ override_dh_auto_clean:
rm -rfv daemon/contrib/native rm -rfv daemon/contrib/native
rm -rfv daemon/jamid.1 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 ## ## qt client clean ##
##################### #####################
...@@ -196,8 +203,7 @@ override_dh_auto_install: ...@@ -196,8 +203,7 @@ override_dh_auto_install:
override_dh_shlibdeps: override_dh_shlibdeps:
dh_shlibdeps -- \ dh_shlibdeps -- \
-x$(JAMI_ALL_IN_ONE_PKG_NAME) \ -x$(JAMI_ALL_IN_ONE_PKG_NAME) \
-x$(JAMI_LIB_CLIENT_PKG_NAME) \ -x$(JAMI_LIB_CLIENT_PKG_NAME)
-x$(JAMI_LIB_CLIENT_GNOME_PKG_NAME)
tmpdir:= $(shell mktemp -d) tmpdir:= $(shell mktemp -d)
workdir:= $(shell pwd) workdir:= $(shell pwd)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment