Merge lp:~racb/ubuntu/quantal/cloud-init/960336 into lp:ubuntu/quantal/cloud-init

Proposed by Robie Basak
Status: Merged
Merged at revision: 177
Proposed branch: lp:~racb/ubuntu/quantal/cloud-init/960336
Merge into: lp:ubuntu/quantal/cloud-init
Diff against target: 29 lines (+10/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+4/-1)
To merge this branch: bzr merge lp:~racb/ubuntu/quantal/cloud-init/960336
Reviewer Review Type Date Requested Status
Scott Moser Pending
Ubuntu branches Pending
Review via email: mp+111731@code.launchpad.net
To post a comment you must log in.

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 2012-05-29 20:58:01 +0000
3+++ debian/changelog 2012-06-24 04:15:23 +0000
4@@ -1,3 +1,9 @@
5+cloud-init (0.6.3-0ubuntu3) quantal; urgency=low
6+
7+ * grub-legacy-ec2: add missing dependency on ucf (LP: #960336).
8+
9+ -- Robie Basak <robie.basak@ubuntu.com> Sun, 24 Jun 2012 05:10:13 +0100
10+
11 cloud-init (0.6.3-0ubuntu2) quantal; urgency=high
12
13 * Added -generic to Xen kernels list since -virtual has been dropped with
14
15=== modified file 'debian/control'
16--- debian/control 2012-04-05 05:13:10 +0000
17+++ debian/control 2012-06-24 04:15:23 +0000
18@@ -35,7 +35,10 @@
19 to retrieve and install ssh keys and to let the user run various scripts.
20
21 Package: grub-legacy-ec2
22-Depends: debconf (>= 1.5.19) | cdebconf, util-linux (>= 2.15-1), ${misc:Depends}
23+Depends: debconf (>= 1.5.19) | cdebconf,
24+ ucf,
25+ util-linux (>= 2.15-1),
26+ ${misc:Depends}
27 Conflicts: grub
28 Suggests: grub-legacy-doc
29 Architecture: all

Subscribers

People subscribed via source and target branches

to all changes: