From 66f8d28e1909e3578dbde5b2d0956fd5abd45a66 Mon Sep 17 00:00:00 2001
From: Rafi59 <rafi59_dev@srvmaison.fr.nf>
Date: Sun, 8 Oct 2017 15:10:28 +0200
Subject: [PATCH 1/4] [fix] Version in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bf61770..382277c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Roundcube for YunoHost
 [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
 an application-like user interface.
 
-**Shipped version:** 1.2.5
+**Shipped version:** 1.3.0
 
 ![](https://roundcube.net/images/screens/mailview.jpg)
 

From 9c6dcab7e73431121fa6dfc2eafe1fd40df24b18 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Wed, 8 Nov 2017 22:55:47 +0100
Subject: [PATCH 2/4] Upgrade to upstream version 1.3.3

---
 README.md     | 2 +-
 conf/app.src  | 4 ++--
 manifest.json | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 382277c..4f8d540 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Roundcube for YunoHost
 [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
 an application-like user interface.
 
-**Shipped version:** 1.3.0
+**Shipped version:** 1.3.3
 
 ![](https://roundcube.net/images/screens/mailview.jpg)
 
diff --git a/conf/app.src b/conf/app.src
index 417b0a2..8d3c570 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.0/roundcubemail-1.3.0.tar.gz
-SOURCE_SUM=a37e55a3b5f83420930ae20ef3ac6dbedb499c920bbcf3fc93a8f784f7773d21
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.3/roundcubemail-1.3.3.tar.gz
+SOURCE_SUM=d3f13a73b3d68abd7b199120c84e863c5488668b33fc5703c0d7d5c3e0f9057d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 8d558a7..219e7ff 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,8 +7,8 @@
         "fr": "Webmail Open Source"
     },
     "url": "https://roundcube.net/",
-    "license": "GPL-3",
-    "version": "1.3.0",
+    "license": "GPL-3.0",
+    "version": "1.3.3-1",
     "maintainer": {
         "name": "YunoHost Contributors",
         "email": "apps@yunohost.org"

From c1e920027f9377dac8aef8214689512240983bf4 Mon Sep 17 00:00:00 2001
From: root <you@example.com>
Date: Wed, 25 Apr 2018 13:20:44 +0200
Subject: [PATCH 3/4] [fix] Stretch

---
 scripts/_common.sh | 3 +++
 scripts/install    | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index a9f36f9..598ec3e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,6 +6,9 @@
 
 # Package dependencies
 pkg_dependencies="php5-cli php5-common php5-intl php5-json php5-mcrypt php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 php-net-smtp php-net-socket php-crypt-gpg php-net-ldap2 php-net-ldap3"
+if [ "$(lsb_release --codename --short)" != "jessie" ]; then
+	pkg_dependencies="$pkg_dependencies php-zip"
+fi
 
 # Plugins version
 contextmenu_version=2.3
diff --git a/scripts/install b/scripts/install
index ad24650..2bc9fee 100644
--- a/scripts/install
+++ b/scripts/install
@@ -57,12 +57,6 @@ ynh_app_setting_set $app with_enigma $with_enigma
 # INSTALL DEPENDENCIES
 #=================================================
 
-# jessie-backports is needed for php-net-ldap3
-grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
-  echo "deb http://httpredir.debian.org/debian jessie-backports main" \
-    | tee -a /etc/apt/sources.list.d/backports.list >/dev/null
-}
-
 ynh_install_app_dependencies "$pkg_dependencies"
 
 #=================================================

From 5f93c305af100c274bd3db663d9a3a8d1a725f3f Mon Sep 17 00:00:00 2001
From: root <you@example.com>
Date: Wed, 25 Apr 2018 13:53:38 +0200
Subject: [PATCH 4/4] [fix] stretch

---
 scripts/upgrade | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index ff92958..10be39c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -61,12 +61,6 @@ path_url=$(ynh_normalize_url_path $path_url)
 # INSTALL DEPENDENCIES
 #=================================================
 
-# jessie-backports is needed for php-net-ldap3
-grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
-  echo "deb http://httpredir.debian.org/debian jessie-backports main" \
-    | tee -a /etc/apt/sources.list.d/backports.list >/dev/null
-}
-
 ynh_install_app_dependencies "$pkg_dependencies"
 
 #=================================================