Merge ~andreserl/maas:minor_pkg_improvements into maas:master

[Andres Rodriguez]

Minor packaging improvements

[Mike Pontillo (mpontillo)]

Looks good to me overall; some comments and questions below.

review: Approve

880ab7e... by Andres Rodriguez on 2017-08-28

Remove typo

diff --git a/debian/changelog b/debian/changelog
index f3ba3d5..9b3eec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ maas (2.3.0~alpha3-0ubuntu1) UNRELEASED; urgency=medium
     region controller in addition to the rack.
   * Add /usr/lib/maas/maas-common script.
   * Move to debhelper compat level 9.
+  * debian/maas-common.links: Drop as it created a link for a binary that was
+    already deprecated.
 
- -- Mike Pontillo <[e-mail]>  Tue, 22 Aug 2017 15:28:42 -0700
+ -- Andres Rodriguez <[e-mail]>  Fri, 25 Aug 2017 12:18:37 -0400
 
 maas (2.3.0~alpha2-6194-g7fb23b0-0ubuntu1) artful; urgency=medium
 
diff --git a/debian/control b/debian/control
index e0beb12..7992cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: maas
 Section: net
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 8.1.0~),
+Build-Depends: debhelper (>= 9~),
                dh-apport,
                dh-exec,
                dh-python,
@@ -59,6 +59,7 @@ Package: maas-common
 Architecture: all
 Depends: rsyslog,
          ${misc:Depends},
+         ${python3:Depends},
          python3-maas-provisioningserver
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
@@ -165,7 +166,7 @@ Architecture: all
 Depends: python3-maas-client (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends}
-Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
+Breaks: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
 Replaces: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
 Description: MAAS client and command-line interface
  This package contains the 'maas' command-line interface, which
diff --git a/debian/maas-cli.links b/debian/maas-cli.links
deleted file mode 100644
index 3cb6829..0000000
--- a/debian/maas-cli.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/maas usr/bin/maas-cli
diff --git a/debian/maas-cli.lintian-overrides b/debian/maas-cli.lintian-overrides
index 0c046cc..f053786 100644
--- a/debian/maas-cli.lintian-overrides
+++ b/debian/maas-cli.lintian-overrides
@@ -1 +1 @@
-maas-cli: binary-without-manpage usr/bin/maas-cli
+maas-cli: binary-without-manpage usr/bin/maas
diff --git a/debian/maas-common.lintian-overrides b/debian/maas-common.lintian-overrides
index 8a37f94..bb8d8f4 100644
--- a/debian/maas-common.lintian-overrides
+++ b/debian/maas-common.lintian-overrides
@@ -1 +1,2 @@
-maas-common: binary-without-manpage usr/lib/maas/maas-delete-file usr/lib/maas/maas-write-file
+maas-common: binary-without-manpage
+maas-common: maintainer-script-calls-systemctl
diff --git a/debian/maas-rack-controller.lintian-overrides b/debian/maas-rack-controller.lintian-overrides
index 6ae74f7..50d0059 100644
--- a/debian/maas-rack-controller.lintian-overrides
+++ b/debian/maas-rack-controller.lintian-overrides
@@ -1,2 +1 @@
-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-test-enlistment
-maas-common: binary-without-manpage usr/lib/maas/network-monitor usr/lib/maas/beacon-monitor usr/lib/maas/dhcp-monitor
+maas-rack-controller: binary-without-manpage
diff --git a/debian/maas-region-api.lintian-overrides b/debian/maas-region-api.lintian-overrides
index b76fff5..0c504dd 100644
--- a/debian/maas-region-api.lintian-overrides
+++ b/debian/maas-region-api.lintian-overrides
@@ -1,5 +1,7 @@
-maas-region-api: binary-without-manpage usr/sbin/maas
-maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py
-maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
-maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
-maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py
+maas-region-api: maintainer-script-calls-systemctl
+maas-region-api: command-with-path-in-maintainer-script
+maas-region-api: executable-not-elf-or-script
+maas-region-api: binary-without-manpage usr/sbin/maas-region
+maas-region-api: binary-without-manpage usr/sbin/maas-region-admin
+maas-region-api: binary-without-manpage usr/sbin/maas-generate-winrm-cert
+maas-region-api: font-in-non-font-package