Merge lp:~andreserl/maas/packaging_lp1424287 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Depends on ubuntu-cloudimage-keyring for region (LP: #1424287)

[Andres Rodriguez (andreserl)]

self approve.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-19 15:44:50 +0000
+++ debian/changelog	2015-02-24 15:55:03 +0000
@@ -1,7 +1,9 @@
 maas (1.8.0~alpha2+bzr3532-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
-  * debian/control: Depends on libjs-angularjs (LP: #1423457)
+  * debian/control:
+    - Depends on libjs-angularjs (LP: #1423457)
+    - Depends on ubuntu-cloudimage-keyring for region (LP: #1424287)
 
  -- Andres Rodriguez <[e-mail]>  Wed, 18 Feb 2015 16:31:02 -0500
 

=== modified file 'debian/control'
--- debian/control	2015-02-18 20:45:25 +0000
+++ debian/control	2015-02-24 15:55:03 +0000
@@ -55,6 +55,7 @@
          libjs-yui3-full,
          libjs-yui3-min,
          maas-common (= ${binary:Version}),
+         maas-proxy (= ${binary:Version}),
          python-django (>= 1.4),
          python-django-maas (= ${binary:Version}),
          python-django-piston,
@@ -62,7 +63,7 @@
          python-maas-provisioningserver (= ${binary:Version}),
          python-djorm-ext-pgarray,
          rsyslog,
-         maas-proxy (= ${binary:Version}),
+         ubuntu-cloudimage-keyring,
          ${misc:Depends},
          ${python:Depends}
 Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
@@ -159,7 +160,6 @@
          syslinux-dev | syslinux-common (<< 3:6.00~pre4+dfsg-5),
          syslinux-common,
          tgt,
-         ubuntu-cloudimage-keyring,
          uuid-runtime,
          wget,
          ${misc:Depends},