Merge branch 'master' into 'master'

Change cx.ring update mode

See merge request fdroid/fdroiddata!3721

metadata/cx.ring.txt

@@ -1,23 +1,23 @@
 Categories:Phone & SMS,Internet
 License:GPL-3.0-or-later
-Web Site:https://ring.cx/
+Web Site:https://jami.net/
-Source Code:https://git.ring.cx/savoirfairelinux/ring-client-android
+Source Code:https://git.jami.net/savoirfairelinux/ring-client-android
-Issue Tracker:https://git.ring.cx/savoirfairelinux/ring-client-android/issues
+Issue Tracker:https://git.jami.net/savoirfairelinux/ring-client-android/issues
-Changelog:https://git.ring.cx/savoirfairelinux/ring-client-android/tree/master/ring-android/fastlane/metadata/android/en-US/changelogs
+Changelog:https://git.jami.net/savoirfairelinux/ring-client-android/tree/master/ring-android/fastlane/metadata/android/en-US/changelogs
 
-Auto Name:Ring
+Auto Name:Jami
 Summary:Secure and distributed communication platform
 Description:
-Ring (formerly SFLphone) is a free distributed multimedia communication
+Jami (formerly Ring and SFLphone) is a free distributed multimedia communication
 software. It is developed by Savoir-faire Linux with the help of a global
 community of users and contributors. Savoir-faire Linux is a Canadian company
 specialized in Linux and free software.
 
-Ring allows to make audio or video calls, and to send messages, safely and
+Jami allows to make audio or video calls, and to send messages, safely and
-freely, in confidence. Ring is a Free and open source software that requires no
+freely, in confidence. Jami is a Free and open source software that requires no
 central server.
 
-What can you do with Ring:
+What can you do with Jami:
 
 * send text messages
 * make audio calls
@@ -25,9 +25,12 @@ What can you do with Ring:
 * send files
 * use your existing SIP account
 
-There are plenty of ways to help us, check out: [https://ring.cx/en/contribute]
+There are plenty of ways to help us, check out: <a
+href="https://jami.net/contribute"></a>.
 
-You can also install Ring on Windows, macOS, iOS and GNU/Linux.
+Jami is inspired by a Swahili word that means "community".
+
+You can also install Jami on Windows, macOS, iOS and GNU/Linux.
 .
 
 Repo Type:git
@@ -624,6 +627,21 @@ Build:20180805,129
         ./compile.sh --release --no-gradle
     ndk=r17b
 
+Build:20190103,144
+    commit=621cd09ae6422be770584b11a7d202bc98150a74
+    timeout=10800
+    subdir=client-android/ring-android/app
+    submodules=yes
+    sudo=apt-get update && \
+        apt-get install --yes swig
+    gradle=noPush
+    rm=client-electron,client-gnome,client-ios,client-macosx,client-uwp,client-windows
+    build=cd ../.. && \
+        export ANDROID_NDK_ROOT="$ANDROID_NDK" && \
+        export ANDROID_ABI="armeabi-v7a arm64-v8a x86" && \
+        ./compile.sh --release --no-gradle
+    ndk=r17b
+
 Maintainer Notes:
 Ring has a lot of native dependencies, the source tarballs of these are all downloaded and build for all enabled architectures.
 Build failed with swig 2.0.12 from jessie but works with 3.0.10 from jessie-backports.
@@ -634,5 +652,5 @@ v103 introduces push notifications using gplay. Optional since 106 with noPush f
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest/production
-Current Version:20180805
+Current Version:20190103
-Current Version Code:129
+Current Version Code:144