From de3e3bb930271e2cf2e963fc8b099708349ed1e3 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 27 Jul 2022 17:59:53 +0200 Subject: [PATCH 1/8] Testing : upgrade to 2.5 / fix php dependencies (#139) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Apply last example_ynh (#117) * Apply last example_ynh * Cleanup backup * Create DISCLAIMER.md * Create DISCLAIMER_fr.md * Auto-update README * Add files via upload * Fix heading size * Auto-update README * Fix heading size * Auto-update README * Fix charset * Auto-update README * Update check_process * 2.4.3 (#125) * Upgrade to 2.4.2~ynh1 * Fix craue_config_setting * Upgrade to 2.4.3~ynh1 * Upgrade to 2.4.3~ynh1 * Auto-update README Co-authored-by: yalh76 Co-authored-by: Yunohost-Bot <> * Specify PHP version in every calls (#132) * Specify PHP version in every calls * Switch (back) to php7.4 * Add PHP-xml dependency for DOM extension Co-authored-by: lapineige * Auto-update README * Fix php version reference (#136) * Auto-update README * Use YNH_PHP_VERSION * Proper YNH_PHP_VERSION syntax * Proper YNH_PHP_VERSION syntax : typo * YNH_PHP_VERSION: fix missing change * Fix phpversion → YNH_PHP_VERSION * Upgrade to 2.5 (#134) * Upgrade to 2.5 * Auto-update README * Upgrade to 2.5 Co-authored-by: yunohost-bot * Merge master (2.4.3/php7.4) into testing (2.5) (#137) * Testing (#124) * Apply last example_ynh (#117) * Apply last example_ynh * Cleanup backup * Create DISCLAIMER.md * Create DISCLAIMER_fr.md * Auto-update README * Add files via upload * Fix heading size * Auto-update README * Fix heading size * Auto-update README * Fix charset * Auto-update README * Update check_process Co-authored-by: lapineige Co-authored-by: Yunohost-Bot <> * Testing: update to 2.4.3 (#128) * Apply last example_ynh (#117) * Apply last example_ynh * Cleanup backup * Create DISCLAIMER.md * Create DISCLAIMER_fr.md * Auto-update README * Add files via upload * Fix heading size * Auto-update README * Fix heading size * Auto-update README * Fix charset * Auto-update README * Update check_process * 2.4.3 (#125) * Upgrade to 2.4.2~ynh1 * Fix craue_config_setting * Upgrade to 2.4.3~ynh1 * Upgrade to 2.4.3~ynh1 * Auto-update README Co-authored-by: yalh76 Co-authored-by: Yunohost-Bot <> * Specify PHP version in every calls (#132) * Specify PHP version in every calls * Switch (back) to php7.4 * Add PHP-xml dependency for DOM extension Co-authored-by: lapineige * Auto-update README * Fix php version reference (#136) * Auto-update README * Use YNH_PHP_VERSION * Proper YNH_PHP_VERSION syntax * Proper YNH_PHP_VERSION syntax : typo * YNH_PHP_VERSION: fix missing change * Fix phpversion → YNH_PHP_VERSION Co-authored-by: yalh76 Co-authored-by: Yunohost-Bot <> Co-authored-by: tituspijean Co-authored-by: yunohost-bot Co-authored-by: yalh76 Co-authored-by: tituspijean Co-authored-by: yunohost-bot * 2.5 (#138) * Upgrade to 2.5 * Auto-update README * Upgrade to 2.5 Co-authored-by: yunohost-bot * Auto-update README * Fix PHP dependencies (#142) * Switch version to 2.5.0~ynh2 * Auto-update README Co-authored-by: yalh76 Co-authored-by: Yunohost-Bot <> Co-authored-by: tituspijean Co-authored-by: yunohost-bot Co-authored-by: JimboJoe --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1adbce4..38bcf63 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ It extracts content so that you can read it when you have time. It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo). -**Shipped version:** 2.4.3~ynh1 +**Shipped version:** 2.5.0~ynh2 **Demo:** https://demo.yunohost.org/wallabag/ diff --git a/README_fr.md b/README_fr.md index 4f0bc02..da4b3c2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sont disponibles une interface web, des add-ons pour navigateurs (Firefox / Chrome / Opera), des applications pour mobile (Android / iOS / Windows Phone) et même sur liseuse (PocketBook / Kobo). -**Version incluse :** 2.4.3~ynh1 +**Version incluse :** 2.5.0~ynh2 **Démo :** https://demo.yunohost.org/wallabag/ diff --git a/conf/app.src b/conf/app.src index 02efccc..fae65d6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.4.3.tar.gz -SOURCE_SUM=bba4df940cf1a1ac632e134cbf9b9af8d3c1bf89311b2720cf64179e1b431d3a +SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.5.0.tar.gz +SOURCE_SUM=7c4ff86d5c08990d37c2b7ddaf1e8096e94edb15353361c8692386a5301bd361 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 78df8cf..5e1b304 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A self hostable read-it-later app", "fr": "Une application de lecture-plus-tard auto-hébergeable" }, - "version": "2.4.3~ynh1", + "version": "2.5.0~ynh2", "url": "https://www.wallabag.org", "upstream": { "license": "MIT", diff --git a/scripts/_common.sh b/scripts/_common.sh index 5f41b6e..5b6181f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ YNH_PHP_VERSION="7.4" # dependencies used by the app -pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-xml" +pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-intl" #================================================= # PERSONAL HELPERS From 2bed9fed5924e66057c6266b2cbcacb8f0c59484 Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 28 Jul 2022 21:13:26 +0200 Subject: [PATCH 2/8] 2.5.1 (#146) * v2.5.1 * Auto-update README * v2.5.1 Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 38bcf63..b7d6298 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ It extracts content so that you can read it when you have time. It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo). -**Shipped version:** 2.5.0~ynh2 +**Shipped version:** 2.5.1~ynh2 **Demo:** https://demo.yunohost.org/wallabag/ diff --git a/README_fr.md b/README_fr.md index da4b3c2..14646fa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sont disponibles une interface web, des add-ons pour navigateurs (Firefox / Chrome / Opera), des applications pour mobile (Android / iOS / Windows Phone) et même sur liseuse (PocketBook / Kobo). -**Version incluse :** 2.5.0~ynh2 +**Version incluse :** 2.5.1~ynh2 **Démo :** https://demo.yunohost.org/wallabag/ diff --git a/conf/app.src b/conf/app.src index fae65d6..552b4d0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.5.0.tar.gz -SOURCE_SUM=7c4ff86d5c08990d37c2b7ddaf1e8096e94edb15353361c8692386a5301bd361 +SOURCE_URL=https://static.wallabag.org/releases/wallabag-release-2.5.1.tar.gz +SOURCE_SUM=beeae3588e5287f4853edc5de5c1da6b0ede75c03336e6ff76e84e505f96b219 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 5e1b304..fafbbb8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A self hostable read-it-later app", "fr": "Une application de lecture-plus-tard auto-hébergeable" }, - "version": "2.5.0~ynh2", + "version": "2.5.1~ynh2", "url": "https://www.wallabag.org", "upstream": { "license": "MIT", From ffa3fffa13996c4623b0c203b82ba3a64ce14fa4 Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 28 Jul 2022 21:14:01 +0200 Subject: [PATCH 3/8] fix version number --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index fafbbb8..61ca395 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A self hostable read-it-later app", "fr": "Une application de lecture-plus-tard auto-hébergeable" }, - "version": "2.5.1~ynh2", + "version": "2.5.1~ynh1", "url": "https://www.wallabag.org", "upstream": { "license": "MIT", From b160d6995d7852143f899569b4068f0618403151 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 28 Jul 2022 19:14:04 +0000 Subject: [PATCH 4/8] Auto-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 b7d6298..238421d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ It extracts content so that you can read it when you have time. It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo). -**Shipped version:** 2.5.1~ynh2 +**Shipped version:** 2.5.1~ynh1 **Demo:** https://demo.yunohost.org/wallabag/ diff --git a/README_fr.md b/README_fr.md index 14646fa..1fe9801 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sont disponibles une interface web, des add-ons pour navigateurs (Firefox / Chrome / Opera), des applications pour mobile (Android / iOS / Windows Phone) et même sur liseuse (PocketBook / Kobo). -**Version incluse :** 2.5.1~ynh2 +**Version incluse :** 2.5.1~ynh1 **Démo :** https://demo.yunohost.org/wallabag/ From 6e6f3d6dcc43c4ecb516510b0d30ccdf6f8d958b Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 30 Jul 2022 19:19:34 +0200 Subject: [PATCH 5/8] fix php7.4-redis conflicting with php-redis (#145) --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5b6181f..5bf93e1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ YNH_PHP_VERSION="7.4" # dependencies used by the app -pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-intl" +pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gettext php-redis php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-intl" #================================================= # PERSONAL HELPERS From f3fb7109a578747692b171e82542a89a6867aae9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 30 Jul 2022 17:24:34 +0000 Subject: [PATCH 6/8] Auto-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 b7d6298..1621b7b 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ It extracts content so that you can read it when you have time. It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo). -**Shipped version:** 2.5.1~ynh2 +**Shipped version:** 2.5.2~ynh2 **Demo:** https://demo.yunohost.org/wallabag/ diff --git a/README_fr.md b/README_fr.md index 14646fa..aa3a2e9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sont disponibles une interface web, des add-ons pour navigateurs (Firefox / Chrome / Opera), des applications pour mobile (Android / iOS / Windows Phone) et même sur liseuse (PocketBook / Kobo). -**Version incluse :** 2.5.1~ynh2 +**Version incluse :** 2.5.2~ynh2 **Démo :** https://demo.yunohost.org/wallabag/ From ebf29a737d5714ae4116e48368ee050333262cad Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 2 Aug 2022 23:05:05 +0200 Subject: [PATCH 7/8] Typo in version number (2.5.1, not 2.5.2) --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d1ade4b..fafbbb8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A self hostable read-it-later app", "fr": "Une application de lecture-plus-tard auto-hébergeable" }, - "version": "2.5.2~ynh2", + "version": "2.5.1~ynh2", "url": "https://www.wallabag.org", "upstream": { "license": "MIT", From 2ea6b8d9c2549fd9a9d01e710a13169d3d1bb954 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 2 Aug 2022 21:05:07 +0000 Subject: [PATCH 8/8] Auto-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 1621b7b..b7d6298 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ It extracts content so that you can read it when you have time. It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo). -**Shipped version:** 2.5.2~ynh2 +**Shipped version:** 2.5.1~ynh2 **Demo:** https://demo.yunohost.org/wallabag/ diff --git a/README_fr.md b/README_fr.md index aa3a2e9..14646fa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sont disponibles une interface web, des add-ons pour navigateurs (Firefox / Chrome / Opera), des applications pour mobile (Android / iOS / Windows Phone) et même sur liseuse (PocketBook / Kobo). -**Version incluse :** 2.5.2~ynh2 +**Version incluse :** 2.5.1~ynh2 **Démo :** https://demo.yunohost.org/wallabag/