From f1ee6c013f48e03c122ce47da24c61b5f8767af3 Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 25 Jun 2018 23:48:02 +0200 Subject: [PATCH 1/2] [fix] Mark dns-root-data as conflicting with ynh --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 17961b83..0141ab2e 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,7 @@ Conflicts: iptables-persistent , yunohost-config-dovecot, yunohost-config-slapd , yunohost-config-nginx, yunohost-config-amavis , yunohost-config-mysql, yunohost-predepends + , dns-root-data Replaces: moulinette-yunohost, yunohost-config , yunohost-config-others, yunohost-config-postfix , yunohost-config-dovecot, yunohost-config-slapd From 762f533061a61bd6498157236e24b3bf4bff1402 Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 25 Jun 2018 23:54:59 +0200 Subject: [PATCH 2/2] [fix] Missing changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c9f5408d..16c4c444 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yunohost (2.7.14.1) stable; urgency=low + + * [fix] Indicate YunoHost conflict with dns-root-data debian package + + -- ljf Mon, 25 Jun 2018 23:53:00 +0000 + yunohost (2.7.14) stable; urgency=low * Last minute fix : install php7.0-acpu to hopefully make stretch still work after the upgrade