From b3cc983f44d111902c0aa3df7d0fade35f126971 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 29 May 2022 12:18:06 +0200 Subject: [PATCH 1/5] 10.21.1 --- manifest.json | 4 ++-- scripts/_common.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index b283f0b..ae6ac40 100644 --- a/manifest.json +++ b/manifest.json @@ -6,10 +6,10 @@ "en": "A DLNA, UPnP and HTTP(S) Media Server", "fr": "Un Serveur Multimedia DLNA, UPnP et HTTP(S)" }, - "version": "10.20.0~ynh1", + "version": "10.20.1~ynh1", "url": "www.universalmediaserver.com", "upstream": { - "version": "10.20.0", + "version": "10.20.1", "license": "GPL-2.0-or-later", "website": "www.universalmediaserver.com", "admindoc": "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki", diff --git a/scripts/_common.sh b/scripts/_common.sh index f1d0338..5b18760 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,11 +9,11 @@ pkg_dependencies="mediainfo dcraw p7zip" mach=`uname -m` -sha256_arm64=89b662b321ea30d69bc67d603f807f1cac3ad96b34efdf76928e42822d4c1d6a -sha256_armel=5cf3522442459aaef80deed1a40e673179ec59936ad3c16901d9a29d430342d4 -sha256_armhf=632de1a4a54ef1a88a2a45d38212f7463e95cd6185a709e047103ceea70d0bf7 -sha256_x86_64=55be296603b94a26c35906cba005509448b367a4bbe182d90958b5f14f088906 -sha256_x86=29231aa88d3789f58c5274e578d1ea0e16ea930ca61ca3f056c18615d4d7c6c3 +sha256_arm64=23b1bb23118cf0128c752c4e19afb2ad7f3a3830d24b4755f5fb8ebcf42e5c0d +sha256_armel=0785e8a3e3078a3956cf05b1f41b3f63e57df2e840f4e9a0af929e688cef0244 +sha256_armhf=031ca6ac177212abd91b2cf8de39a6c09804935e0c775392ea78271023d770ab +sha256_x86_64=b6238039647660c23f3376c6524167fc845c4ca5ad5a5c13b21259ac7c96af20 +sha256_x86=27e9d29297b3fb54e0c5db26f42e8dba218f38c8ee8eaa661db5d490a0fc2081 case "$mach" in "armv6l" ) mach="armel" From a5ba929246382933d1f2c249ece44aa9ad66818c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 29 May 2022 10:18:15 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 24 +++++++++++------------- README_fr.md | 30 ++++++++++++++++-------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index cf32d3f..6f10b07 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Universal Media Server for YunoHost -[![Integration level](https://dash.yunohost.org/integration/ums.svg)](https://dash.yunohost.org/appci/app/ums) ![](https://ci-apps.yunohost.org/ci/badges/ums.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ums.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/ums.svg)](https://dash.yunohost.org/appci/app/ums) ![Working status](https://ci-apps.yunohost.org/ci/badges/ums.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/ums.maintain.svg) [![Install Universal Media Server with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ums) *[Lire ce readme en français.](./README_fr.md)* @@ -17,13 +17,10 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A DLNA, UPnP and HTTP(S) Media Server -**Shipped version:** 10.20.0 - - - +**Shipped version:** 10.20.1 ## Screenshots -![](./doc/screenshots/screenshot.gif) +![Screenshot of Universal Media Server](./doc/screenshots/screenshot.gif) ## Disclaimers / important information @@ -54,21 +51,22 @@ On small device (Raspberry for example), transco may be requiring too much power ## Documentation and resources -* Official app website: www.universalmediaserver.com -* Official admin documentation: https://github.com/UniversalMediaServer/UniversalMediaServer/wiki -* Upstream app code repository: https://github.com/UniversalMediaServer -* YunoHost documentation for this app: https://yunohost.org/app_ums -* Report a bug: https://github.com/YunoHost-Apps/ums_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/ums_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/ums_ynh/tree/testing --debug or sudo yunohost app upgrade ums -u https://github.com/YunoHost-Apps/ums_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 3e763fd..beab858 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Universal Media Server pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/ums.svg)](https://dash.yunohost.org/appci/app/ums) ![](https://ci-apps.yunohost.org/ci/badges/ums.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ums.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/ums.svg)](https://dash.yunohost.org/appci/app/ums) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/ums.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/ums.maintain.svg) [![Installer Universal Media Server avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ums) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Universal Media Server rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -13,13 +17,10 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un Serveur Multimedia DLNA, UPnP et HTTP(S) -**Version incluse :** 10.20.0 - - - +**Version incluse :** 10.20.1 ## Captures d'écran -![](./doc/screenshots/screenshot.gif) +![Capture d'écran de Universal Media Server](./doc/screenshots/screenshot.gif) ## Avertissements / informations importantes @@ -48,21 +49,22 @@ Sur de petits appareils (par exemple un raspberry), la transco peut demander tro ## Documentations et ressources -* Site officiel de l'app : www.universalmediaserver.com -* Documentation officielle de l'admin : https://github.com/UniversalMediaServer/UniversalMediaServer/wiki -* Dépôt de code officiel de l'app : https://github.com/UniversalMediaServer -* Documentation YunoHost pour cette app : https://yunohost.org/app_ums -* Signaler un bug : https://github.com/YunoHost-Apps/ums_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/ums_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/ums_ynh/tree/testing --debug ou sudo yunohost app upgrade ums -u https://github.com/YunoHost-Apps/ums_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From f35d1561581e5559701bf37ce0429071ad22bd59 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 29 May 2022 12:50:58 +0200 Subject: [PATCH 3/5] openjdk-11-jre --- scripts/_common.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5b18760..d7381cd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -19,19 +19,18 @@ case "$mach" in "armv6l" ) mach="armel" sha256=$sha256_armel #for some reason, jre is not in the tarball - pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; + pkg_dependencies="$pkg_dependencies openjdk-11-jre" ;; "armv7l" ) if [ $(dpkg --print-architecture) = "armhf" ]; then mach="armhf" sha256=$sha256_armhf - pkg_dependencies="$pkg_dependencies openjdk-8-jre" else mach="armel" sha256=$sha256_armel - pkg_dependencies="$pkg_dependencies openjdk-8-jre" - fi ;; + fi + pkg_dependencies="$pkg_dependencies openjdk-11-jre";; "armv8l" ) mach="arm64" sha256=$sha256_arm64 - pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; + pkg_dependencies="$pkg_dependencies openjdk-11-jre" ;; "aarch64" ) mach="arm64" sha256=$sha256_arm64 pkg_dependencies="$pkg_dependencies openjdk-11-jre" ;; From 43f6bc7c0c567f15f7b3d4f5992ad597db3f4b47 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 29 May 2022 12:55:47 +0200 Subject: [PATCH 4/5] 10.21.1 --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index ae6ac40..af3a653 100644 --- a/manifest.json +++ b/manifest.json @@ -6,10 +6,10 @@ "en": "A DLNA, UPnP and HTTP(S) Media Server", "fr": "Un Serveur Multimedia DLNA, UPnP et HTTP(S)" }, - "version": "10.20.1~ynh1", + "version": "10.21.1~ynh1", "url": "www.universalmediaserver.com", "upstream": { - "version": "10.20.1", + "version": "10.21.1", "license": "GPL-2.0-or-later", "website": "www.universalmediaserver.com", "admindoc": "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki", From f9a1af7d86933e50d94f82a5f01ab8c534e5d1e5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 29 May 2022 10:55:50 +0000 Subject: [PATCH 5/5] 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 6f10b07..62b3995 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 A DLNA, UPnP and HTTP(S) Media Server -**Shipped version:** 10.20.1 +**Shipped version:** 10.21.1 ## Screenshots ![Screenshot of Universal Media Server](./doc/screenshots/screenshot.gif) diff --git a/README_fr.md b/README_fr.md index beab858..2313d5c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un Serveur Multimedia DLNA, UPnP et HTTP(S) -**Version incluse :** 10.20.1 +**Version incluse :** 10.21.1 ## Captures d'écran ![Capture d'écran de Universal Media Server](./doc/screenshots/screenshot.gif)