Merge pull request #500 from YunoHost/fix-dns-data-bis

[fix] Conflict with a specific version of dns-root-data
This commit is contained in:
Alexandre Aubin 2018-06-26 00:54:19 +02:00 committed by GitHub
commit aa4f096436
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
yunohost (2.7.14.2) stable; urgency=low
* [fix] Indicate YunoHost conflict with a specific version of dns-root-data
-- ljf <ljf+yunohost@grimaud.me> Tue, 26 Jun 2018 00:49:00 +0000
yunohost (2.7.14.1) stable; urgency=low
* [fix] Indicate YunoHost conflict with dns-root-data debian package

2
debian/control vendored
View file

@ -40,7 +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
, dns-root-data (>= 2017072601~deb8u2)
Replaces: moulinette-yunohost, yunohost-config
, yunohost-config-others, yunohost-config-postfix
, yunohost-config-dovecot, yunohost-config-slapd