Merge lp:~andreserl/maas/pkg_lp1424287_17 into lp:~maas-maintainers/maas/packaging.utopic

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 352
Merged at revision: 352
Proposed branch: lp:~andreserl/maas/pkg_lp1424287_17
Merge into: lp:~maas-maintainers/maas/packaging.utopic
Diff against target: 24 lines (+3/-0)
2 files modified
debian/changelog (+2/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/pkg_lp1424287_17
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+250788@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-01-30 11:58:32 +0000
+++ debian/changelog 2015-02-24 16:00:20 +0000
@@ -1,6 +1,8 @@
1maas (1.7.2+bzr3341-0ubuntu1) UNRELEASED; urgency=medium1maas (1.7.2+bzr3341-0ubuntu1) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * UNRELEASED
4 * debian/control: Depends on ubuntu-cloudimage-keyring
5 for region (LP: #1424287)
46
5 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 30 Jan 2015 11:58:07 +00007 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 30 Jan 2015 11:58:07 +0000
68
79
=== modified file 'debian/control'
--- debian/control 2014-12-06 17:43:42 +0000
+++ debian/control 2015-02-24 16:00:20 +0000
@@ -62,6 +62,7 @@
62 python-maas-provisioningserver (= ${binary:Version}),62 python-maas-provisioningserver (= ${binary:Version}),
63 python-djorm-ext-pgarray,63 python-djorm-ext-pgarray,
64 rsyslog,64 rsyslog,
65 ubuntu-cloudimage-keyring,
65 maas-proxy (= ${binary:Version}),66 maas-proxy (= ${binary:Version}),
66 ${misc:Depends},67 ${misc:Depends},
67 ${python:Depends}68 ${python:Depends}

Subscribers

People subscribed via source and target branches

to all changes: