From 4a7ff6a24f56c995fb47e1ecd53c34a11a98e825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Tue, 15 Mar 2016 15:18:10 +0100
Subject: [PATCH] [deb] Clean debian/control with cosmetic changes

The following dependencies have been changed:
 * pyminiupnpc: removed in flavour of official python-miniupnpc Debian package
 * python-pip: moved from Depends to Recommends since it's only intended for
   apps usage and not YunoHost itself - it should definitively be removed when
   the 'requirements' manifest key will allow package installation.
---
 debian/control | 78 ++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 44 deletions(-)

diff --git a/debian/control b/debian/control
index dab0f64f4..4c6279114 100644
--- a/debian/control
+++ b/debian/control
@@ -9,51 +9,41 @@ Homepage: https://yunohost.org/
 
 Package: yunohost
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
- moulinette (>= 2.3.4),
- python-psutil,
- python-requests,
- glances,
- python-pip,
- python-miniupnpc | pyminiupnpc,
- dnsutils,
- bind9utils,
- python-apt,
- ca-certificates,
- python-dnspython,
- netcat-openbsd,
- iproute,
- unzip,
- git-core,
- curl,
- cron,
- mariadb-server | mysql-server, php5-mysql | php5-mysqlnd,
- slapd, ldap-utils, sudo-ldap, libnss-ldapd,
- postfix-ldap, postfix-policyd-spf-perl, postfix-pcre, procmail,
- dovecot-ldap, dovecot-lmtpd, dovecot-managesieved,
- dovecot-antispam, fail2ban,
- nginx-extras (>=1.6.2), php5-fpm, php5-ldap, php5-intl,
- dnsmasq, openssl, avahi-daemon,
- ssowat, metronome,
- rspamd, rmilter (>=1.7.0), redis-server, opendkim-tools
-Recommends: yunohost-admin,
- bash-completion, rsyslog, ntp, openssh-server,
- inetutils-ping | iputils-ping,
- php5-gd, php5-curl, php-gettext, php5-mcrypt,
- unattended-upgrades,
- libdbd-ldap-perl, libnet-dns-perl
+Depends: ${python:Depends}, ${misc:Depends}
+ , moulinette (>= 2.3.4)
+ , python-psutil, python-requests, python-dnspython
+ , python-apt, python-miniupnpc
+ , glances
+ , dnsutils, bind9utils, unzip, git, curl, cron
+ , ca-certificates, netcat-openbsd, iproute
+ , mariadb-server | mysql-server, php5-mysql | php5-mysqlnd
+ , slapd, ldap-utils, sudo-ldap, libnss-ldapd
+ , postfix-ldap, postfix-policyd-spf-perl, postfix-pcre, procmail
+ , dovecot-ldap, dovecot-lmtpd, dovecot-managesieved
+ , dovecot-antispam, fail2ban
+ , nginx-extras (>=1.6.2), php5-fpm, php5-ldap, php5-intl
+ , dnsmasq, openssl, avahi-daemon
+ , ssowat, metronome
+ , rspamd, rmilter (>=1.7.0), redis-server, opendkim-tools
+Recommends: yunohost-admin
+ , openssh-server, ntp, inetutils-ping | iputils-ping
+ , bash-completion, rsyslog
+ , php5-gd, php5-curl, php-gettext, php5-mcrypt
+ , python-pip
+ , unattended-upgrades
+ , 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
-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
+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
+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
 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