Merge pull request #499 from YunoHost/fix-dns-root-data

[fix] Mark dns-root-data as conflicting with ynh
This commit is contained in:
Alexandre Aubin 2018-06-25 23:57:00 +02:00 committed by GitHub
commit 2a5db2ed10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
yunohost (2.7.14.1) stable; urgency=low
* [fix] Indicate YunoHost conflict with dns-root-data debian package
-- ljf <ljf+yunohost@grimaud.me> 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

1
debian/control vendored
View file

@ -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