From 739f8b9d10656dce077042e5a9d2c2b212ef7216 Mon Sep 17 00:00:00 2001
From: Rodriguez Nyiringabo <rodrigueznyiringabo@gmail.com>
Date: Sat, 14 Oct 2023 11:31:34 +0200
Subject: [PATCH 1/4] Update main and lts resources sources respectively to
 tiki-26.1 and tiki-24.5

---
 manifest.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index d0d504c..123c3dd 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Tiki"
 description.en = "Wiki-based, content management system"
 description.fr = "Système de gestion de contenu basé sur Wiki"
 
-version = "26.0~ynh1"
+version = "26.1~ynh1"
 
 maintainers = ["eric_G"]
 
@@ -52,13 +52,13 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://sourceforge.net/projects/tikiwiki/files/Tiki_26.x_Alnilam/26.0/tiki-26.0.tar.gz/download"
-        sha256 = "493f204407eefd102c2ed59e4e4e716ea1671e0d43d99dd8e4265a8e09f28335"
+        url = "https://sourceforge.net/projects/tikiwiki/files/Tiki_26.x_Alnilam/26.1/tiki-26.1.tar.gz/download"
+        sha256 = "f6d0042567feb62bfaf012cb999625ef840501141249a247b3075094030649c7"
         format = "tar.gz"
 
         [resources.sources.lts]
-        url = "https://sourceforge.net/projects/tikiwiki/files/Tiki_24.x_Wolf_359/24.4/tiki-24.4.tar.gz/download"
-        sha256 = "1cb546e282ec74ce7bf6bbda96048b6b2b7087bb8416fd154eeb4b99d8e4f8c5"
+        url = "https://sourceforge.net/projects/tikiwiki/files/Tiki_24.x_Wolf_359/24.5/tiki-24.5.tar.gz/download"
+        sha256 = "d91cb7846a0c863ab5b1d29a305acd865365364e05f5d83c00e11cae4d67a71b"
         format = "tar.gz"
 
     [resources.system_user]

From 1df919cdc2f629bb73268b8981fc694e3339c233 Mon Sep 17 00:00:00 2001
From: Rodriguez Nyiringabo <rodrigueznyiringabo@gmail.com>
Date: Sat, 14 Oct 2023 11:32:44 +0200
Subject: [PATCH 2/4] Update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 44e2d4a..6d2dab8 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Tiki Wiki CMS Groupware is the Free / Libre / Open Source Web Application with t
 - Tiki Trackers is the built-in database web apps builder and low-code / no-code application framework.
 
 
-**Shipped version:** 26.0~ynh1
+**Shipped version:** 26.1~ynh1
 
 **Demo:** https://tiki.org/Try-Tiki
 
diff --git a/README_fr.md b/README_fr.md
index ce8502b..21738c9 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -33,7 +33,7 @@ Tiki Wiki CMS Groupware est l'application Web libre dotée du plus grand nombre
 Les Tiki Trackers sont la composante intégrée pour le développement low-code / no-code et le générateur de formulaires et bases de données.
 
 
-**Version incluse :** 26.0~ynh1
+**Version incluse :** 26.1~ynh1
 
 **Démo :** https://tiki.org/Try-Tiki
 

From d5ec2398ad5ede028c6551104e8954469781c014 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 14 Oct 2023 13:30:57 +0000
Subject: [PATCH 3/4] Auto-update README

---
 README.md    | 1 -
 README_fr.md | 1 -
 2 files changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 6d2dab8..a02c850 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,6 @@ Tiki Wiki CMS Groupware is the Free / Libre / Open Source Web Application with t
 * Official app website: <https://tiki.org/>
 * Official admin documentation: <https://doc.tiki.org>
 * Upstream app code repository: <https://gitlab.com/tikiwiki/tiki/>
-* YunoHost documentation for this app: <https://yunohost.org/app_tiki>
 * Report a bug: <https://github.com/YunoHost-Apps/tiki_ynh/issues>
 
 ## Developer info
diff --git a/README_fr.md b/README_fr.md
index 21738c9..f4bc71d 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -46,7 +46,6 @@ Les Tiki Trackers sont la composante intégrée pour le développement low-code
 * Site officiel de l’app : <https://tiki.org/>
 * Documentation officielle de l’admin : <https://doc.tiki.org>
 * Dépôt de code officiel de l’app : <https://gitlab.com/tikiwiki/tiki/>
-* Documentation YunoHost pour cette app : <https://yunohost.org/app_tiki>
 * Signaler un bug : <https://github.com/YunoHost-Apps/tiki_ynh/issues>
 
 ## Informations pour les développeurs

From 74631dfbb7b134ad058ff6128ca8e972b97874ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 14 Oct 2023 15:31:07 +0200
Subject: [PATCH 4/4] Update manifest.toml

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index d0d504c..21faa06 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -71,13 +71,13 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "tesseract-ocr imagemagick mariadb-server"
+    packages = "tesseract-ocr, imagemagick, mariadb-server"
 
     packages_from_raw_bash = """
             if [[ "$release_cycle" == "regular" ]]; then 
-                echo "php8.1-bz2 php8.1-curl php8.1-gd php8.1-zip php8.1-mysql php8.1-xml php8.1-mbstring php8.1-intl"
+                echo "php8.1-bz2, php8.1-curl, php8.1-gd, php8.1-zip, php8.1-mysql, php8.1-xml, php8.1-mbstring, php8.1-intl"
             else
-                echo "php7.4-bz2 php7.4-curl php7.4-gd php7.4-zip php7.4-mysql php7.4-xml php7.4-mbstring php7.4-intl"
+                echo "php7.4-bz2, php7.4-curl, php7.4-gd, php7.4-zip, php7.4-mysql, php7.4-xml, php7.4-mbstring, php7.4-intl"
             fi
         """