Skip to content

Commit

Permalink
[deb] Clean control file, remove some legacy Conflicts and Replaces -…
Browse files Browse the repository at this point in the history
…- it is safe to do so because 3.x instances already have these Conflicts / Replaces, so it's okay to remove them for 4.x
  • Loading branch information
alexAubin committed Jun 5, 2020
1 parent 60bc1aa commit ca0d493
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Depends: ${python:Depends}, ${misc:Depends}
, moulinette (>= 3.7), ssowat (>= 3.7)
, python-psutil, python-requests, python-dnspython, python-openssl
, python-miniupnpc, python-dbus, python-jinja2
, python-toml, python-packaging
, python-toml, python-packaging, python-publicsuffix
, apt, apt-transport-https
, nginx, nginx-extras (>=1.6.2)
, nginx, nginx-extras
, php-fpm, php-ldap, php-intl
, mariadb-server, php-mysql | php-mysqlnd
, openssh-server, iptables, fail2ban, dnsutils, bind9utils
Expand All @@ -25,10 +25,10 @@ Depends: ${python:Depends}, ${misc:Depends}
, dnsmasq, avahi-daemon, libnss-mdns, resolvconf, libnss-myhostname
, postfix, postfix-ldap, postfix-policyd-spf-perl, postfix-pcre
, dovecot-core, dovecot-ldap, dovecot-lmtpd, dovecot-managesieved, dovecot-antispam
, rspamd (>= 1.6.0), opendkim-tools, postsrsd, procmail, mailutils
, rspamd, opendkim-tools, postsrsd, procmail, mailutils
, redis-server
, metronome (>=3.14.0)
, git, curl, wget, cron, unzip, jq
, git, curl, wget, cron, unzip, jq, bc
, lsb-release, haveged, fake-hwclock, equivs, lsof, whois, python-publicsuffix
Recommends: yunohost-admin
, ntp, inetutils-ping | iputils-ping
Expand All @@ -39,17 +39,8 @@ Recommends: yunohost-admin
, libdbd-ldap-perl, libnet-dns-perl
Suggests: htop, vim, rsync, acpi-support-base, udisks2
Conflicts: iptables-persistent
, moulinette-yunohost, yunohost-config
, yunohost-config-others, yunohost-config-postfix
, yunohost-config-dovecot, yunohost-config-slapd
, yunohost-config-nginx, yunohost-config-amavis
, yunohost-config-mysql, yunohost-predepends
, apache2, bind9
Replaces: moulinette-yunohost, yunohost-config
, yunohost-config-others, yunohost-config-postfix
, yunohost-config-dovecot, yunohost-config-slapd
, yunohost-config-nginx, yunohost-config-amavis
, yunohost-config-mysql, yunohost-predepends
, apache2
, bind9
Description: manageable and configured self-hosting server
YunoHost aims to make self-hosting accessible to everyone. It configures
an email, Web and IM server alongside a LDAP base. It also provides
Expand Down

0 comments on commit ca0d493

Please sign in to comment.