Merge lp:~lutostag/ubuntu/trusty/maas/1.5.2+packagefix into lp:ubuntu/trusty-proposed/maas

[Greg Lutostanski]

Package dep fixes

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-04 14:31:41 +0000
+++ debian/changelog	2014-06-20 15:45:40 +0000
@@ -1,3 +1,13 @@
+maas (1.5.2+bzr2282-0ubuntu0.2) trusty-proposed; urgency=medium
+
+  * debian/control:
+   - Add missing dependency in maas-cluster-controller for grub-common
+     (LP: #1328231) 
+   - Move dependency from maas-cluster-controller to maas-provisioningserver
+     for python-seamicroclient (LP: #1332532) 
+
+ -- Greg Lutostanski <[e-mail]>  Fri, 20 Jun 2014 10:10:47 -0500
+
 maas (1.5.2+bzr2282-0ubuntu0.1) trusty-proposed; urgency=medium
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2014-06-04 14:31:41 +0000
+++ debian/control	2014-06-20 15:45:40 +0000
@@ -100,6 +100,7 @@
          python-oops-datedir-repo,
          python-oops-twisted,
          python-pyparsing,
+         python-seamicroclient,
          python-simplestreams,
          python-tempita,
          python-twisted-core,
@@ -147,6 +148,7 @@
          bind9utils,
          distro-info,
          freeipmi-tools,
+         grub-common,
          maas-cli (=${binary:Version}),
          maas-common (=${binary:Version}),
          maas-dhcp (=${binary:Version}),
@@ -158,7 +160,6 @@
          python-netaddr,
          python-oauth,
          python-pexpect,
-         python-seamicroclient,
          python-tempita,
          python-twisted,
          python-zope.interface,