packaging: Add jami-libqt to the jami-all package.
This makes the current 'jami-all' package the one used for the
one-click install package.
* packaging/rules/debian/rules (OCI_INSTALL_DIR): New variable.
(override_dh_auto_install): Extend rule to install the files of the
jami-libqt package. Do not include the jami-gnome in jami-all.
* packaging/rules/debian/control (jami-all): Update description.
* packaging/rules/debian-one-click-install: Delete directory.
* packaging/rules/debian-one-click-install/jami-all.postinst: Move to ...
* packaging/rules/debian/jami-all.postinst: ... here.
* scripts/make-packaging-target.py: Remove all OCI-specific targets.
* scripts/deploy-packages.sh (package_deb) [jami-all]: Do not add
package to the apt repository.
[manual-download]: Look for the jami-all package from the main
distribution directory, not in a '_oci' suffixed version.
GitLab: https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/263
Change-Id: I4cacf26355c767d1c77b1ce478b184023481b674
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index 27a990d..c806cd6 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -43,6 +43,8 @@
export PKG_CONFIG_PATH := $(QT_JAMI_PREFIX)/lib/pkgconfig:${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH := $(QT_JAMI_PREFIX)/lib/cmake:${CMAKE_PREFIX_PATH}
+# Installation directories.
+OCI_INSTALL_DIR = $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)
%:
dh $@
@@ -225,6 +227,14 @@
ln -sf /usr/bin/jami $(CURDIR)/debian/jami/usr/bin/ring.cx
+ ## Custom Qt package for Jami (libqt-jami)
+ ## Copy our own Qt library package content into the OCI package.
+ for file_name in $$(dpkg-query -L libqt-jami); do \
+ mkdir -p "$(OCI_INSTALL_DIR)$$(dirname $$file_name)"; \
+ test -d "$$file_name" && continue; \
+ cp "$$file_name" "$(OCI_INSTALL_DIR)$$file_name"; \
+ done
+
######################
## Jami AiO install ##
######################
@@ -245,10 +255,6 @@
# cmake files
rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
- ## GNOME client
- cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
- rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/bin/jami
-
## Qt client
cd client-qt/build && \
make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install