diff --git a/packaging/rules/debian-one-click-install/jami-all.postinst b/packaging/rules/debian-one-click-install/jami-all.postinst
index a1d56ba1034a8712c62a8f5608f7d34890490eaf..683710ba7e3da73b6bfe440952ffba7187884499 100755
--- a/packaging/rules/debian-one-click-install/jami-all.postinst
+++ b/packaging/rules/debian-one-click-install/jami-all.postinst
@@ -20,18 +20,18 @@ set -e
# depending on the system the postinst script is run on. Examples:
#
# Ubuntu 18.04:
-# $RING_REPO = $RING_REPO_BASE/ubuntu_18.04/
+# $JAMI_REPO = $JAMI_REPO_BASE/ubuntu_18.04/
#
# Debian 9:
-# $RING_REPO = $RING_REPO_BASE/debian_9
+# $JAMI_REPO = $JAMI_REPO_BASE/debian_9
#
# To update the appended end tags, modify the switch in [2].
# FIXME As soon as the repo get renamed to /nightly fix this url
-RING_REPO_BASE="https://dl.jami.net/ring-nightly"
+JAMI_REPO_BASE="https://dl.jami.net/ring-nightly"
# Jami release key.
-RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
-RING_KEY="\
+JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
+JAMI_KEY="\
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2
@@ -76,10 +76,10 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
# postrm paths should be modified as well
APT_FILE="/etc/apt/sources.list.d/jami-main.list"
UPDATE_MANAGER_PATH="/etc/update-manager/release-upgrades.d/"
-RING_UPDATE_MANAGER_ID="jami-main"
+JAMI_UPDATE_MANAGER_ID="jami-main"
-RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
-UPDATE_MANAGER_CFG_PATH="${UPDATE_MANAGER_PATH}/${RING_UPDATE_MANAGER_CFG}"
+JAMI_UPDATE_MANAGER_CFG="${JAMI_UPDATE_MANAGER_ID}.cfg"
+UPDATE_MANAGER_CFG_PATH="${UPDATE_MANAGER_PATH}/${JAMI_UPDATE_MANAGER_CFG}"
###############################################################################
@@ -136,18 +136,18 @@ case "$1" in
fi
if [ "${CAN_ADD_DEB_SOURCE}" = "true" ]; then
- RING_REPO="${RING_REPO_BASE}/${ENDTAG}"
+ JAMI_REPO="${JAMI_REPO_BASE}/${ENDTAG}"
# We first add the key to the trusted keyring.
apt-key add - > /dev/null 2>&1 << EOF
-$RING_KEY
+$JAMI_KEY
EOF
# Add an entry for the package repository to the trusted package
# sources (DEB822 format)
# FIXME As soon as we rename the repo use ring instead of jami
cat > $APT_FILE <<EOF
-deb ${RING_REPO} ring main
+deb ${JAMI_REPO} ring main
EOF
# Additionally, if update manager is installed we inform it about
@@ -160,7 +160,7 @@ EOF
# Added by Jami to prevent disabling of Jami repository sources on
# distribution release upgrade.
[ThirdPartyMirrors]
-ring/${RING_UPDATE_MANAGER_ID}=${RING_REPO}
+ring/${JAMI_UPDATE_MANAGER_ID}=${JAMI_REPO}
EOF
fi
fi
diff --git a/packaging/rules/debian-one-click-install/rules b/packaging/rules/debian-one-click-install/rules
index 32134cb276a748b4a9fb67a9cafbdd6f30dbb303..e9ffc2709a37ecc77651ca644d6e6a807f89a362 100755
--- a/packaging/rules/debian-one-click-install/rules
+++ b/packaging/rules/debian-one-click-install/rules
@@ -13,7 +13,7 @@ NO_CPUS=1
endif
# Binary package names
-RING_ALL_IN_ONE_PKG_NAME="jami-all"
+JAMI_ALL_IN_ONE_PKG_NAME="jami-all"
# Bundled packages from contrib
BUNDLED_PKGS = .ffmpeg
@@ -157,23 +157,23 @@ override_dh_auto_install:
######################
## daemon
- cd daemon && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
+ cd daemon && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/include
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
## LibRingClient
- cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
+ cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/include
# This is a symlink, should be in -dev package
- rm -v $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
+ rm -v $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
# cmake files
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
## GNOME client
- cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
+ cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/jami-all/usr/bin/ring.cx
tmpdir:= $(shell mktemp -d)
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index eeb1965ec390498293f3d12b10f17657b2e11733..2c098c6a339de240b6aeaad334519799d3efa7dd 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -13,9 +13,9 @@ NO_CPUS=1
endif
# Binary package names
-RING_ALL_IN_ONE_PKG_NAME="jami-all"
-RING_CLIENT_PKG_NAME="jami"
-RING_DAEMON_PKG_NAME="jami-daemon"
+JAMI_ALL_IN_ONE_PKG_NAME="jami-all"
+JAMI_CLIENT_PKG_NAME="jami"
+JAMI_DAEMON_PKG_NAME="jami-daemon"
# Bundled packages from contrib
BUNDLED_PKGS = .ffmpeg
@@ -158,27 +158,27 @@ override_dh_auto_install:
## Ring daemon install ##
#########################
- cd daemon && make DESTDIR=$(CURDIR)/debian/$(RING_DAEMON_PKG_NAME) install
- rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/include
- rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/lib/*.a
- rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/lib/*.la
+ cd daemon && make DESTDIR=$(CURDIR)/debian/$(JAMI_DAEMON_PKG_NAME) install
+ rm -rfv $(CURDIR)/debian/$(JAMI_DAEMON_PKG_NAME)/usr/include
+ rm -rfv $(CURDIR)/debian/$(JAMI_DAEMON_PKG_NAME)/usr/lib/*.a
+ rm -rfv $(CURDIR)/debian/$(JAMI_DAEMON_PKG_NAME)/usr/lib/*.la
#########################
## Jami client install ##
#########################
## LibRingClient
- cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(RING_CLIENT_PKG_NAME) install
- rm -rfv $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/include
+ cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME) install
+ rm -rfv $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/include
# This is a symlink, should be in -dev package
- rm -v $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/lib/libringclient.so
+ rm -v $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/lib/libringclient.so
# cmake files
- rm -rfv $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/lib/cmake
+ rm -rfv $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/lib/cmake
## GNOME client
- cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_CLIENT_PKG_NAME) install
+ cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/jami/usr/bin/ring.cx
######################
@@ -186,23 +186,23 @@ override_dh_auto_install:
######################
## daemon
- cd daemon && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
+ cd daemon && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/include
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
## LibRingClient
- cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
+ cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/include
# This is a symlink, should be in -dev package
- rm -v $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
+ rm -v $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
# cmake files
- rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
+ rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
## GNOME client
- cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
+ cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/jami-all/usr/bin/ring.cx
tmpdir:= $(shell mktemp -d)
diff --git a/packaging/rules/fedora/jami-all.postinst b/packaging/rules/fedora/jami-all.postinst
index 2e5c85d2b2519c5ac83d517f5977e638d5d85ef5..b6b9a0f89a5cdb659c9abd028c58a529ed925c85 100755
--- a/packaging/rules/fedora/jami-all.postinst
+++ b/packaging/rules/fedora/jami-all.postinst
@@ -69,8 +69,8 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
# postrm paths should be modified as well
YUM_FILE="/etc/yum.repos.d/jami-main.repo"
GPG_FILE="/etc/pki/rpm-gpg/RPM-GPG-KEY-JAMI"
-RING_UPDATE_MANAGER_ID="jami"
-RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
+JAMI_UPDATE_MANAGER_ID="jami"
+JAMI_UPDATE_MANAGER_CFG="${JAMI_UPDATE_MANAGER_ID}.cfg"
###############################################################################
# [2] Set package repo url depending on distribution and version #
diff --git a/packaging/rules/opensuse-leap/jami-all.postinst b/packaging/rules/opensuse-leap/jami-all.postinst
index 289822b26792c052b05c51baa1c38831b838378d..98a57cdc22e0fde2ae735ff1a2a6ae69a184958c 100755
--- a/packaging/rules/opensuse-leap/jami-all.postinst
+++ b/packaging/rules/opensuse-leap/jami-all.postinst
@@ -69,8 +69,8 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
# postrm paths should be modified as well
REPO_FILE="/etc/yum.repos.d/jami-main.repo"
GPG_FILE="/etc/pki/rpm-gpg/RPM-GPG-KEY-JAMI"
-RING_UPDATE_MANAGER_ID="jami"
-RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
+JAMI_UPDATE_MANAGER_ID="jami"
+JAMI_UPDATE_MANAGER_CFG="${JAMI_UPDATE_MANAGER_ID}.cfg"
###############################################################################
# [2] Set package repo url depending on distribution and version #
diff --git a/packaging/rules/rhel/jami-all.postinst b/packaging/rules/rhel/jami-all.postinst
index 39b54db5eab0f2c806450b565c237b244883747f..ef68d27ed96aef57b204530a987eafa295a54c3b 100755
--- a/packaging/rules/rhel/jami-all.postinst
+++ b/packaging/rules/rhel/jami-all.postinst
@@ -20,11 +20,11 @@
#
# To update the appended end tags, modify the switch in [2].
# FIXME As soon as the repo get renamed to /nightly fix this url
-RING_REPO_BASE="https://dl.jami.net/ring-nightly"
+JAMI_REPO_BASE="https://dl.jami.net/ring-nightly"
# Jami release key.
-RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
-RING_KEY="\
+JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
+JAMI_KEY="\
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2
@@ -69,8 +69,8 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
# postrm paths should be modified as well
YUM_FILE="/etc/yum.repos.d/jami-main.repo"
GPG_FILE="/etc/pki/rpm-gpg/RPM-GPG-KEY-JAMI"
-RING_UPDATE_MANAGER_ID="jami-main"
-RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
+JAMI_UPDATE_MANAGER_ID="jami-main"
+JAMI_UPDATE_MANAGER_CFG="${JAMI_UPDATE_MANAGER_ID}.cfg"
###############################################################################
# [2] Set package repo url depending on distribution and version #
@@ -84,10 +84,10 @@ CAN_ADD_YUM_SOURCE=true
if [ -f /etc/os-release ]; then
. /etc/os-release
-RING_REPO='
+JAMI_REPO='
[jami]
name=Jami $releasever - $basearch - jami
-baseurl='"${RING_REPO_BASE}"/"${ID}"'_$releasever
+baseurl='"${JAMI_REPO_BASE}"/"${ID}"'_$releasever
gpgcheck=1
gpgkey=https://dl.jami.net/ring.pub.key
enabled=1'
@@ -123,7 +123,7 @@ fi
# # We first add the key to the trusted keyring.
cat > $GPG_FILE <<EOF
-$RING_KEY
+$JAMI_KEY
EOF
/usr/bin/rm -f /var/lib/rpm/.rpm.lock > /dev/null 2>&1
/usr/bin/rpm --import $GPG_FILE > /dev/null 2>&1
@@ -131,7 +131,7 @@ EOF
# Add an entry for the package repository to the trusted package
# FIXME As soon as we rename the repo use ring instead of jami
cat > $YUM_FILE <<EOF
-$RING_REPO
+$JAMI_REPO
EOF
fi
exit 0