Merge lp:~mpontillo/maas/make-avahi-and-tcpdump-depends-for-now into lp:~maas-maintainers/maas/packaging

[Mike Pontillo]

Change avahi-utils and tcpdump from Recommends to Depends, until the bug is fixed which makes them truly optional.

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-01 11:05:08 +0000
+++ debian/changelog	2016-09-02 17:09:59 +0000
@@ -1,7 +1,7 @@
 maas (2.1.0~alpha2+bzr5307-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
-  * Add depends on ntp
+  * Add depends on avahi-utils, ntp, and tcpdump.
 
  -- Andres Rodriguez <[e-mail]>  Wed, 31 Aug 2016 20:25:17 +0100
 

=== modified file 'debian/control'
--- debian/control	2016-09-01 22:43:59 +0000
+++ debian/control	2016-09-02 17:09:59 +0000
@@ -96,12 +96,14 @@
 
 Package: maas-region-controller
 Architecture: all
-Depends: dbconfig-pgsql,
+Depends: avahi-utils,
+         dbconfig-pgsql,
          maas-dns (= ${binary:Version}),
          maas-region-api (= ${binary:Version}),
          postgresql (>= 9.1),
+         tcpdump,
          ${misc:Depends},
-Recommends: avahi-utils, openssh-server, tcpdump
+Recommends: openssh-server
 Description: Region Controller for MAAS
  The MAAS region controller (maas-regiond) is the REST API server for
  all MAAS clients, and the postgres database that maintains machine
@@ -184,6 +186,7 @@
 Package: maas-rack-controller
 Architecture: all
 Depends: authbind,
+         avahi-utils,
          bind9utils,
          distro-info,
          freeipmi-tools,
@@ -200,12 +203,12 @@
          python3-twisted,
          python3-zope.interface,
          syslinux-common,
+         tcpdump,
          tgt,
          uuid-runtime,
          wget,
          ${misc:Depends},
          ${python3:Depends}
-Recommends: avahi-utils, tcpdump
 Suggests: amtterm, ipmitool, libvirt-bin, wsmancli
 Conflicts: tftpd-hpa
 Breaks: python-maas-provisioningserver,