Merge remote-tracking branch 'origin/testing' into calendar

README.md

@@ -27,7 +27,7 @@ In addition to Roundcube core features, the following are made available with th
 * Support for PGP encryption with Enigma plugin by default.
 
 
-**Shipped version:** 1.6.0~ynh1
+**Shipped version:** 1.6.0~ynh2
 
 
 **Demo:** https://demo.yunohost.org/webmail/

README_fr.md

@@ -28,7 +28,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s
 * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default.
 
 
-**Version incluse :** 1.6.0~ynh1
+**Version incluse :** 1.6.0~ynh2
 
 
 **Démo :** https://demo.yunohost.org/webmail/

manifest.json

@@ -6,7 +6,7 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.6.0~ynh1",
+    "version": "1.6.0~ynh2",
     "url": "https://roundcube.net/",
     "upstream": {
         "license": "GPL-3.0-only",

scripts/install

@@ -205,7 +205,7 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&
 
 # Update javascript dependencies
 (cd "$final_path"
-/usr/bin/php$phpversion -q ./bin/update.sh -v ?)
+/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh -v ?)
 
 # Store the config file checksum into the app settings
 ynh_store_file_checksum --file="$final_path/config/config.inc.php"