Merge lp:~clint-fewbar/pyjuju/add-python-yaml into lp:pyjuju

Proposed by Clint Byrum
Status: Merged
Merged at revision: 252
Proposed branch: lp:~clint-fewbar/pyjuju/add-python-yaml
Merge into: lp:pyjuju
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~clint-fewbar/pyjuju/add-python-yaml
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+64343@code.launchpad.net

Description of the change

Fixes launchpad bug #795894 by adding python-yaml to the dependency list.

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 2011-05-27 15:17:10 +0000
3+++ debian/changelog 2011-06-12 16:18:08 +0000
4@@ -1,3 +1,9 @@
5+ensemble (0.5-0ubuntu2) natty; urgency=low
6+
7+ * d/control: adding python-yaml. (LP: #795894)
8+
9+ -- Clint Byrum <clint@ubuntu.com> Sun, 12 Jun 2011 09:14:47 -0700
10+
11 ensemble (0.5-0ubuntu1) natty; urgency=low
12
13 * Preparing for daily build.
14
15=== modified file 'debian/control'
16--- debian/control 2011-05-27 15:19:48 +0000
17+++ debian/control 2011-06-12 16:18:08 +0000
18@@ -10,7 +10,7 @@
19
20 Package: ensemble
21 Architecture: all
22-Depends: ${python:Depends}, ${misc:Depends}, python-twisted, python-txzookeeper (>= 0.2.0), python-argparse, python-txaws
23+Depends: ${python:Depends}, ${misc:Depends}, python-twisted, python-txzookeeper (>= 0.2.0), python-argparse, python-txaws, python-yaml
24 Provides: ${python:Provides}, ${misc:Depends}
25 XB-Python-Version: ${python:Versions}
26 Description: Cloud automation and orchestration

Subscribers

People subscribed via source and target branches

to status/vote changes: