diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04 index 379e0744cf24131ce7f28f65266f51db33dc2dca..cbc9b81a177a21d61a823341bcc3c16f6c464837 100644 --- a/docker/Dockerfile_ubuntu_18.04 +++ b/docker/Dockerfile_ubuntu_18.04 @@ -12,6 +12,7 @@ RUN apt-get update && \ g++-8 \ clang \ clang-tools \ + libarchive-dev \ software-properties-common \ wget diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control index f8219c37711c305add456b6bf414cba738c4d7c9..5f49c3ac63b99d0196042de861c1ccf847cc2a96 100644 --- a/packaging/rules/debian/control +++ b/packaging/rules/debian/control @@ -109,7 +109,8 @@ Package: jami-gnome Architecture: any Depends: ${shlibs: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 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 diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules index 0d5893c1889445730daf6957aefd1311fda96920..7781a0c9e527bfbb3e1100b90e458c2e6a8e72d2 100755 --- a/packaging/rules/debian/rules +++ b/packaging/rules/debian/rules @@ -35,6 +35,10 @@ ifeq (debian_10,$(findstring debian_10, $(DISTRIBUTION))) # Daemon's bundled libarchive does not build on Debian 10 BUNDLED_PKGS="--disable-libarchive" endif +ifeq (ubuntu_18.04,$(findstring ubuntu_18.04, $(DISTRIBUTION))) +# Daemon's bundled libarchive does not build on Ubuntu 18.04 +BUNDLED_PKGS="--disable-libarchive" +endif ifeq (raspbian_10_armhf,$(findstring raspbian_10_armhf, $(DISTRIBUTION))) # Raspbian's yaml-cpp lib does not work properly BUNDLED_PKGS="--enable-ffmpeg --enable-yaml-cpp" @@ -247,7 +251,10 @@ override_dh_auto_install: make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install 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) workdir:= $(shell pwd)