Merge lp:~julian-edwards/maas/packaging into lp:~maas-maintainers/maas/packaging

Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 250
Proposed branch: lp:~julian-edwards/maas/packaging
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 33 lines (+4/-3)
2 files modified
debian/changelog (+3/-3)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+212123@code.launchpad.net

Commit message

maas-cluster-controller now depends on shim-signed for uefi stuff

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Selfing.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

lp:~julian-edwards/maas/packaging updated
250. By Julian Edwards

[r=julian-edwards][bug=1052805,1282218][author=julian-edwards] maas-cluster-controller now depends on shim-signed for uefi stuff

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 2014-03-20 03:03:43 +0000
3+++ debian/changelog 2014-03-21 10:21:09 +0000
4@@ -1,4 +1,4 @@
5-maas (1.5+bzr2128-0ubuntu4) UNRELEASED; urgency=low
6+maas (1.5+bzr2153-0ubuntu0) UNRELEASED; urgency=low
7
8 * New upstream release
9
10@@ -20,9 +20,9 @@
11 /etc/named/maas/named.conf.options.inside.maas file.
12 * debian/control:
13 - maas-dns depends on python-iscpy
14- - maas-cluster-controller depends on python-seamicroclient
15+ - maas-cluster-controller depends on python-seamicroclient and shim-signed
16
17- -- Julian Edwards <julian.edwards@canonical.com> Thu, 20 Mar 2014 13:00:44 +1000
18+ -- Julian Edwards <julian.edwards@canonical.com> Fri, 21 Mar 2014 20:15:02 +1000
19
20 maas (1.5+bzr1977-0ubuntu1) trusty; urgency=low
21
22
23=== modified file 'debian/control'
24--- debian/control 2014-03-20 03:03:43 +0000
25+++ debian/control 2014-03-21 10:21:09 +0000
26@@ -207,6 +207,7 @@
27 python-twisted,
28 python-zope.interface,
29 rsyslog,
30+ shim-signed,
31 syslinux-common,
32 tgt,
33 ubuntu-cloudimage-keyring,

Subscribers

People subscribed via source and target branches