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

Proposed by Andres Rodriguez on 2015-02-24
Status: Merged
Approved by: Andres Rodriguez on 2015-02-24
Approved revision: 357
Merged at revision: 356
Proposed branch: lp:~andreserl/maas/packaging_lp1424287
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 43 lines (+5/-3)
2 files modified
debian/changelog (+3/-1)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_lp1424287
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2015-02-24
Review via email: mp+250784@code.launchpad.net

Commit message

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

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

self approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-02-19 15:44:50 +0000
3+++ debian/changelog 2015-02-24 15:55:03 +0000
4@@ -1,7 +1,9 @@
5 maas (1.8.0~alpha2+bzr3532-0ubuntu1) UNRELEASED; urgency=medium
6
7 * New upstream release
8- * debian/control: Depends on libjs-angularjs (LP: #1423457)
9+ * debian/control:
10+ - Depends on libjs-angularjs (LP: #1423457)
11+ - Depends on ubuntu-cloudimage-keyring for region (LP: #1424287)
12
13 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 18 Feb 2015 16:31:02 -0500
14
15
16=== modified file 'debian/control'
17--- debian/control 2015-02-18 20:45:25 +0000
18+++ debian/control 2015-02-24 15:55:03 +0000
19@@ -55,6 +55,7 @@
20 libjs-yui3-full,
21 libjs-yui3-min,
22 maas-common (= ${binary:Version}),
23+ maas-proxy (= ${binary:Version}),
24 python-django (>= 1.4),
25 python-django-maas (= ${binary:Version}),
26 python-django-piston,
27@@ -62,7 +63,7 @@
28 python-maas-provisioningserver (= ${binary:Version}),
29 python-djorm-ext-pgarray,
30 rsyslog,
31- maas-proxy (= ${binary:Version}),
32+ ubuntu-cloudimage-keyring,
33 ${misc:Depends},
34 ${python:Depends}
35 Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
36@@ -159,7 +160,6 @@
37 syslinux-dev | syslinux-common (<< 3:6.00~pre4+dfsg-5),
38 syslinux-common,
39 tgt,
40- ubuntu-cloudimage-keyring,
41 uuid-runtime,
42 wget,
43 ${misc:Depends},

Subscribers

People subscribed via source and target branches

to all changes: