Skip to content
Snippets Groups Projects
Commit 87fc96df authored by jenkins's avatar jenkins
Browse files

New release.

parents fdd4c458 63882e52
No related branches found
No related merge requests found
...@@ -12,6 +12,7 @@ RUN apt-get update && \ ...@@ -12,6 +12,7 @@ RUN apt-get update && \
g++-8 \ g++-8 \
clang \ clang \
clang-tools \ clang-tools \
libarchive-dev \
software-properties-common \ software-properties-common \
libarchive-dev \ libarchive-dev \
wget wget
......
...@@ -109,7 +109,8 @@ Package: jami-gnome ...@@ -109,7 +109,8 @@ Package: jami-gnome
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
jami-libclient-gnome (=${binary:Version}) jami-libclient-gnome (=${binary:Version}),
libqt-jami (>= 6.2.3)
Description: Secure and distributed voice, video and chat platform - desktop client Description: Secure and distributed voice, video and chat platform - desktop client
Jami (jami.net) is a secure and distributed voice, video and chat communication 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 platform that requires no centralized server and leaves the power of privacy
......
...@@ -36,7 +36,7 @@ ifeq (debian_10,$(findstring debian_10, $(DISTRIBUTION))) ...@@ -36,7 +36,7 @@ ifeq (debian_10,$(findstring debian_10, $(DISTRIBUTION)))
BUNDLED_PKGS="--disable-libarchive" BUNDLED_PKGS="--disable-libarchive"
endif endif
ifeq (ubuntu_18.04,$(findstring ubuntu_18.04, $(DISTRIBUTION))) ifeq (ubuntu_18.04,$(findstring ubuntu_18.04, $(DISTRIBUTION)))
# Daemon's bundled libarchive does not build on Debian 10 # Daemon's bundled libarchive does not build on Ubuntu 18.04
BUNDLED_PKGS="--disable-libarchive" BUNDLED_PKGS="--disable-libarchive"
endif endif
ifeq (raspbian_10_armhf,$(findstring raspbian_10_armhf, $(DISTRIBUTION))) ifeq (raspbian_10_armhf,$(findstring raspbian_10_armhf, $(DISTRIBUTION)))
...@@ -251,7 +251,10 @@ override_dh_auto_install: ...@@ -251,7 +251,10 @@ override_dh_auto_install:
make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
override_dh_shlibdeps: override_dh_shlibdeps:
dh_shlibdeps -- -x$(JAMI_ALL_IN_ONE_PKG_NAME) dh_shlibdeps -- \
-x$(JAMI_ALL_IN_ONE_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.
Please register or to comment