Merge branch 'testing' into package_upgrade

README.md

@@ -7,11 +7,10 @@
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 
 ## Overview
-
 [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
 an application-like user interface.
 
-**Shipped version:** 1.3.6
+**Shipped version:** 1.3.8
 
 ## Screenshots
 
@@ -28,23 +27,16 @@ You can extend - or even override - the Roundcube configuration which is coming
 ## Documentation
 
  * Official documentation: https://github.com/roundcube/roundcubemail/wiki
- * YunoHost documentation: https://github.com/YunoHost/doc/blob/master/app_roundcube.md
+ * YunoHost documentation: https://github.com/YunoHost/doc/blob/master/app_roundcube.md:
+
+## Licence
+
+LICENCE: GPL-3.0-only
 
 ## YunoHost specific features
 
 In addition to Roundcube core features, the following are made available with
-this package:
+this package
-
- * Integrate with YunoHost users and SSO - i.e. logout button, YunoHost users
-   search
- * Synchronize your email aliases as identities in Roundcube
- * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu)
-   and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook)
-   plugins by default
- * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav)
-   (address book) synchronization plugin at the installation - note that if
-   you have installed ownCloud or Baïkal, it will automatically add the
-   corresponding and existing address book.
 
 #### Multi-users support
 
@@ -102,6 +94,34 @@ steps as needed.
 You can also download the plugin and put it under the `plugins/` directory. In this
 case, do not forget to change ownerships of this folder to `roundcube`.
 
+## YunoHost specific features
+
+In addition to Roundcube core features, the following are made available with
+this package:
+
+ * Synchronize your email aliases as identities in Roundcube
+ * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu)
+   and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook)
+   plugins by default
+ * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav)
+   (address book) synchronization plugin at the installation - note that if
+   you have installed ownCloud or Baïkal, it will automatically add the
+   corresponding and existing address book.
+
+#### Multi-users support
+* Integrate with YunoHost users and SSO - i.e. logout button, YunoHost users
+  search
+#### Supported architectures
+
+* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Official%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube%20%28Official%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/)
+* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/roundcube%20%28Official%29.svg)](https://ci-stretch.nohost.me/ci/apps/roundcube/)
+
+## Limitations
+
+* No known limitations.
+
+
 ## Links
 
  * Report a bug: https://github.com/YunoHost-Apps/roundcube_ynh/issues

check_process

@@ -12,7 +12,7 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
-		upgrade=1	from_commit=8d0acb6953a4c4c2206985c7d9881c5b7b637ebd
+		upgrade=1 from_commit=8d0acb6953a4c4c2206985c7d9881c5b7b637ebd
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.6/roundcubemail-1.3.6.tar.gz
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.8/roundcubemail-1.3.8.tar.gz
-SOURCE_SUM=5796670080c9c3c4071eecc70ddcb6b5df98d8a241a73e8a687fd536a9410c7a
+SOURCE_SUM=93314f125033d8ce2755198367c45bdd2f4cfee5d7688f913877beeb6c532858
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -6,9 +6,9 @@
         "en": "Open Source Webmail software",
         "fr": "Webmail Open Source"
     },
-    "version": "1.3.6~ynh2",
+    "version": "1.3.8~ynh2",
     "url": "https://roundcube.net/",
-    "license": "GPL-3",
+    "license": "GPL-3.0-only",
     "maintainer": {
         "name": "YunoHost Contributors",
         "email": "apps@yunohost.org"

scripts/_common.sh

@@ -10,7 +10,7 @@ pkg_dependencies="php-cli php-common php-intl php-json php-mcrypt php-pear php-a
 # Plugins version
 contextmenu_version=2.3
 automatic_addressbook_version=v0.4.3
-carddav_version=2.0.4
+carddav_version=3.0.3
 
 #=================================================
 # EXPERIMENTAL HELPERS