From 3ed9cf0204a988dc76aa6105ddb559d3f0566aaa Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 11:09:11 +0100 Subject: [PATCH 1/4] Removing ffmpeg for Jessie --- scripts/install | 7 ------- scripts/upgrade | 7 ------- 2 files changed, 14 deletions(-) diff --git a/scripts/install b/scripts/install index 451ddca..de9724e 100644 --- a/scripts/install +++ b/scripts/install @@ -87,13 +87,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION # Install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -# Install ffmpeg from backports for Debian Jessie and from main for others -if [ "$(lsb_release --codename --short)" == "jessie" ]; then - ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg" -else - ynh_add_app_dependencies --package="ffmpeg" -fi - # Install Yarn ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/upgrade b/scripts/upgrade index c316c2a..39828ae 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -195,13 +195,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION # Install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -# Install ffmpeg from backports for Debian Jessie and from main for others -if [ "$(lsb_release --codename --short)" == "jessie" ]; then - ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg" -else - ynh_add_app_dependencies --package="ffmpeg" -fi - # Install Yarn ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" From c17695b36cce7d1000fde4fcf316d8d771298e0c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 11 Dec 2021 16:10:44 +0100 Subject: [PATCH 2/4] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 84d1978..de7696d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Video streaming platform using P2P directly in the web browser, connected to a federated network", "fr": "Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé" }, - "version": "3.4.1~ynh2", + "version": "3.4.1~ynh3", "url": "https://github.com/Chocobozzz/PeerTube", "upstream": { "license": "AGPL-3.0-only", From 1aaff0baa12b80ee293fd18f4001d02a0de65a8b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 11 Dec 2021 15:10:47 +0000 Subject: [PATCH 3/4] 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 caa02ac..b207d36 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Video streaming platform using P2P directly in the web browser, connected to a federated network -**Shipped version:** 3.4.1~ynh2 +**Shipped version:** 3.4.1~ynh3 **Demo:** http://peertube.cpy.re diff --git a/README_fr.md b/README_fr.md index 2a97b77..87185eb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé -**Version incluse :** 3.4.1~ynh2 +**Version incluse :** 3.4.1~ynh3 **Démo :** http://peertube.cpy.re From fd83745f77e887aca7c427de97a557d1af2359af Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 11 Dec 2021 16:12:22 +0100 Subject: [PATCH 4/4] Remove jessie code to install ffmpeg --- scripts/restore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/restore b/scripts/restore index a35e20e..e5e4756 100644 --- a/scripts/restore +++ b/scripts/restore @@ -98,13 +98,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION # Install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -# Install ffmpeg from backports for Debian Jessie and from main for others -if [ "$(lsb_release --codename --short)" == "jessie" ]; then - ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg" -else - ynh_add_app_dependencies --package="ffmpeg" -fi - # Install Yarn ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"