From 854e52c21e0d5a6e10d122f8954b34c182c4de44 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 29 Oct 2019 15:46:22 +0100 Subject: [PATCH 1/2] More inclusive rule for this php/sury hack because php version got updated to deb9u6 --- data/helpers.d/apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/helpers.d/apt b/data/helpers.d/apt index d772c6855..cbf4e3e59 100644 --- a/data/helpers.d/apt +++ b/data/helpers.d/apt @@ -227,7 +227,7 @@ ynh_install_app_dependencies () { if echo $dependencies | grep -q 'php'; then # And we have packages from sury installed (7.0.33-10+weirdshiftafter instead of 7.0.33-0 on debian) - if dpkg --list | grep "php7.0" | grep -q -v "7.0.33-0+deb9u5" + if dpkg --list | grep "php7.0" | grep -q -v "7.0.33-0+deb9" then # And sury ain't already installed if ! grep -nrq "sury" /etc/apt/sources.list* From 5a599f2ebf08245b9673487ce949d15543bd5f0f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 29 Oct 2019 15:49:31 +0100 Subject: [PATCH 2/2] Update changelog for 3.6.5.3 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1d13b6290..45dbadef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yunohost (3.6.5.3) stable; urgency=low + + - [fix] More general grep for the php/sury dependency nightmare fix (followup of #809) + + -- Alexandre Aubin Tue, 29 Oct 2019 03:48:00 +0000 + yunohost (3.6.5.2) stable; urgency=low - [fix] Alex was drunk and released an epic stupid bug in stable (2623d385)