diff --git a/packaging/rules/debian-one-click-install/README.Debian b/packaging/rules/debian-one-click-install/README.Debian index 71f85811e89dfdf1ae22dd826169b0e40d215850..5de584b1f655323bd2e3791c945dd89ef13d1972 100644 --- a/packaging/rules/debian-one-click-install/README.Debian +++ b/packaging/rules/debian-one-click-install/README.Debian @@ -1,10 +1,10 @@ -# ring-all package for ring.cx website +# ring-all package for jami.net website This source package provides a single ring-all binary package. This binary package is the same as the mainline ring-all, apart from -the fact that it installs release keys and ring.cx package repository -as trusted peers so Ring can be updated from ring.cx along with +the fact that it installs release keys and jami.net package repository +as trusted peers so Jami can be updated from jami.net along with system updates. # Notes @@ -13,7 +13,7 @@ system updates. 1- Prepare the new changelog entry mentioning the new version. (the version on the changelog will be used to determine what to download). - Releases are available here: https://dl.ring.cx/ring-release/tarballs/ + Releases are available here: https://dl.jami.net/ring-release/tarballs/ 2- Run debian/rules get-orig-source diff --git a/packaging/rules/debian-one-click-install/control b/packaging/rules/debian-one-click-install/control index 9dac839315a1234ca46fa2d07d4715e4dbe1a1a0..b1aed9a7d29c787e7defdde83fd96cfa91f3ad5c 100644 --- a/packaging/rules/debian-one-click-install/control +++ b/packaging/rules/debian-one-click-install/control @@ -55,9 +55,9 @@ Build-Depends: debhelper (>= 9), # other yasm, Standards-Version: 4.1.5 -Homepage: https://ring.cx -Vcs-Git: https://git.ring.cx/savoirfairelinux/ring-project.git -Vcs-Browser: https://git.ring.cx/savoirfairelinux/ring-project +Homepage: https://jami.net +Vcs-Git: https://git.jami.net/savoirfairelinux/ring-project.git +Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project Package: ring-all Architecture: any @@ -72,8 +72,8 @@ Conflicts: ring, ring-gnome, ring-daemon Description: Secure and distributed voice, video and chat platform - all in one package - Ring (ring.cx) 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 in the hands of the user. . - This package contains the GNOME desktop client and dring, the Ring daemon. + This package contains the GNOME desktop client and dring, the Jami daemon. diff --git a/packaging/rules/debian-one-click-install/copyright b/packaging/rules/debian-one-click-install/copyright index f5469a117b6961a6d5b4eb7b6bf56cc091f99d19..8b2e0877c1c90b16b536ff68dae69674a1b623e4 100644 --- a/packaging/rules/debian-one-click-install/copyright +++ b/packaging/rules/debian-one-click-install/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ring Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net> -Source: https://dl.ring.cx/ring-release/tarballs/ +Source: https://dl.jami.net/ring-release/tarballs/ Files-Excluded: client-electron/* client-uwp/* client-windows/* @@ -24,15 +24,15 @@ License: GPL-3+ Comment: Upstream embeds everything that is needed to build ring inside the release tarball. Everything that is already in Debian has been removed. . - OpenDHT was kept and not packaged independently. OpenDHT was written for Ring and is a moving + OpenDHT was kept and not packaged independently. OpenDHT was written for Jami and is a moving target. It is best to wait until it is more mature before packaging it separately. . - Msgpack was kept because the version available in Debian is currently too old for Ring to build. + Msgpack was kept because the version available in Debian is currently too old for Jami to build. The Debian version of Msgpack cannot be updated at the moment because of reverse dependencies which are not ready. . - Pjproject was kept because it is heavily patched by Ring developers. None of the patches were merged - upstream and Ring developers are still waiting for a reaction from Pjproject developers. + Pjproject was kept because it is heavily patched by Jami developers. None of the patches were merged + upstream and Jami developers are still waiting for a reaction from Pjproject developers. See the relevant threads: - http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2014-October/017905.html - http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2015-January/018072.html diff --git a/packaging/rules/debian-one-click-install/ring-all.postinst b/packaging/rules/debian-one-click-install/ring-all.postinst index 4cb49e7933a4b34a4ce9bc190704b5340a576194..b035b8d1027cceb734aed853020bbe2e6fd36680 100755 --- a/packaging/rules/debian-one-click-install/ring-all.postinst +++ b/packaging/rules/debian-one-click-install/ring-all.postinst @@ -26,7 +26,7 @@ set -e # $RING_REPO = $RING_REPO_BASE/debian_9 # # To update the appended end tags, modify the switch in [2]. -RING_REPO_BASE="https://dl.ring.cx/ring-nightly" +RING_REPO_BASE="https://dl.jami.net/ring-nightly" # Ring release key. RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84" diff --git a/packaging/rules/debian-one-click-install/watch b/packaging/rules/debian-one-click-install/watch index 5818d3190fe3b9a54003c681f3eecb22b7a92bb6..1d393aba998b9638dd2bbe70bdd869f31fcb22e4 100644 --- a/packaging/rules/debian-one-click-install/watch +++ b/packaging/rules/debian-one-click-install/watch @@ -1,3 +1,3 @@ version=3 opts=dversionmangle=s/\~dfsg\d*$// \ -https://dl.ring.cx/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz +https://dl.jami.net/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz diff --git a/packaging/rules/debian/README.Debian b/packaging/rules/debian/README.Debian index f27e93940cbbb0e196321a12298b145d7babfa71..76a983463330689efe39aa00d5c8c8e1d868f2ea 100644 --- a/packaging/rules/debian/README.Debian +++ b/packaging/rules/debian/README.Debian @@ -1,11 +1,11 @@ # Differences and compatibility with official debian.org package This source package also provides binary package ring-all. ring-all is an -all-in-one package that is it ships both the Ring Daemon and the GNOME +all-in-one package that is it ships both the Jami Daemon and the GNOME client. This package is not available in the debian.org repositories (not needed in the Debian case). -ring-all allows easy installation of Ring as a single package from ring.cx. +ring-all allows easy installation of Jami as a single package from jami.net. The reason is that one cannot register a repository in source.list.d and directly use it to fetch the dependencies. As a consequence it is not possible to have a one-click installation with two binary packages. That's @@ -20,7 +20,7 @@ same files. 1- Prepare the new changelog entry mentioning the new version. (the version on the changelog will be used to determine what to download). - Releases are available here: https://dl.ring.cx/ring-release/tarballs/ + Releases are available here: https://dl.jami.net/ring-release/tarballs/ 2- Run debian/rules get-orig-source diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control index df800480ec0bfd43f61e3c30aa044f018c8d8390..b4067d89b97417b58d645beebba178c2a81fcb3f 100644 --- a/packaging/rules/debian/control +++ b/packaging/rules/debian/control @@ -55,9 +55,9 @@ Build-Depends: debhelper (>= 9), # other yasm, Standards-Version: 4.1.5 -Homepage: https://ring.cx -Vcs-Git: https://git.ring.cx/savoirfairelinux/ring-project.git -Vcs-Browser: https://git.ring.cx/savoirfairelinux/ring-project +Homepage: https://jami.net +Vcs-Git: https://git.jami.net/savoirfairelinux/ring-project.git +Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project Package: ring-all Architecture: any @@ -72,11 +72,11 @@ Conflicts: ring, ring-gnome, ring-daemon Description: Secure and distributed voice, video and chat platform - all in one package - Ring (ring.cx) 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 in the hands of the user. . - This package contains the GNOME desktop client and dring, the Ring daemon. + This package contains the GNOME desktop client and dring, the Jami daemon. Package: ring Architecture: any @@ -87,7 +87,7 @@ Depends: ${shlibs:Depends}, Replaces: ring-gnome Conflicts: ring-gnome Description: Secure and distributed voice, video and chat platform - desktop client - Ring (ring.cx) 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 in the hands of the user. . @@ -98,8 +98,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Secure and distributed voice, video and chat platform - daemon - Ring (ring.cx) 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 in the hands of the user. . - This package contains the Ring daemon: dring. + This package contains the Jami daemon: dring. diff --git a/packaging/rules/debian/copyright b/packaging/rules/debian/copyright index f5469a117b6961a6d5b4eb7b6bf56cc091f99d19..211bc1c0c8178c82a7d49dc51dc0ce67fc8d254d 100644 --- a/packaging/rules/debian/copyright +++ b/packaging/rules/debian/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ring Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net> -Source: https://dl.ring.cx/ring-release/tarballs/ +Source: https://dl.jami.net/ring-release/tarballs/ Files-Excluded: client-electron/* client-uwp/* client-windows/* diff --git a/packaging/rules/debian/watch b/packaging/rules/debian/watch index 5818d3190fe3b9a54003c681f3eecb22b7a92bb6..1d393aba998b9638dd2bbe70bdd869f31fcb22e4 100644 --- a/packaging/rules/debian/watch +++ b/packaging/rules/debian/watch @@ -1,3 +1,3 @@ version=3 opts=dversionmangle=s/\~dfsg\d*$// \ -https://dl.ring.cx/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz +https://dl.jami.net/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz