Merge lp:~ubuntuone-pqm-team/ubuntu/raring/charm-tools/raring into lp:ubuntu/raring/charm-tools

Proposed by Sidnei da Silva on 2013-04-02
Status: Work in progress
Proposed branch: lp:~ubuntuone-pqm-team/ubuntu/raring/charm-tools/raring
Merge into: lp:ubuntu/raring/charm-tools
Diff against target: 28 lines (+10/-1)
2 files modified
debian/changelog (+9/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~ubuntuone-pqm-team/ubuntu/raring/charm-tools/raring
Reviewer Review Type Date Requested Status
Mark Mims (community) Disapprove on 2013-04-09
Didier Roche Needs Information on 2013-04-03
Ubuntu branches 2013-04-02 Pending
Review via email: mp+156710@code.launchpad.net

Commit message

Fix missing build-deps so that the build succeeds with tip of lp:charm-tools.

Description of the change

Fix missing build-deps so that the build succeeds with tip of lp:charm-tools.

To post a comment you must log in.
Mark Mims (mark-mims) wrote :

lgtm

review: Approve
Didier Roche (didrocks) wrote :

It sounds good, however, bzr bd doesn't fetch any upstream tarball and you didn't set bzr in split mode, do you mind having a look and either set your branch in bzr split mode or point us to the upstream tarball?

review: Needs Information
Sidnei da Silva (sidnei) wrote :

Looking at the history of this branch, seems like it got messed up somehow. The build-deps that I'm adding were actually *reverted* on r18, and were correctly set on r17. I think this MP needs to be rejected and the branch state reconciled by merging lp:charm-tools and re-reverting r18.

Mark Mims (mark-mims) wrote :

per sidnei's comment

review: Disapprove

Unmerged revisions

22. By Sidnei da Silva on 2013-04-02

- Add build-dep on python-shelltoolbox

21. By Sidnei da Silva on 2013-04-02

- Add python-testtools as well.

20. By Sidnei da Silva on 2013-04-02

- Add build-dep on python-simplejson so upstream make-check runs during build

19. By Sidnei da Silva on 2013-04-02

- Add build-dep on pep8 so upstream make-check runs during build

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-07-23 13:52:08 +0000
3+++ debian/changelog 2013-04-02 22:30:31 +0000
4@@ -1,3 +1,12 @@
5+charm-tools (0.3+172-0ubuntu1) raring; urgency=low
6+
7+ * build-dep on pep8 so 'make check' can run.
8+ * build-dep on python-testtools, also required for tests.
9+ * build-dep on python-simplejson, also required for tests.
10+ * build-dep on python-shelltoolbox, also required for tests.
11+
12+ -- Sidnei da Silva <sidnei.da.silva@canonical.com> Tue, 02 Apr 2013 09:59:22 -0300
13+
14 charm-tools (0.3+151-0ubuntu1) quantal; urgency=low
15
16 * New upstream release.
17
18=== modified file 'debian/control'
19--- debian/control 2012-07-23 13:52:08 +0000
20+++ debian/control 2013-04-02 22:30:31 +0000
21@@ -2,7 +2,7 @@
22 Section: net
23 Priority: optional
24 Maintainer: Clint Byrum <clint@ubuntu.com>
25-Build-Depends: debhelper (>= 7.0.50~), wget, python, pwgen, openssh-server, openssh-client, rsync, python-setuptools ( >= 0.6c11~ ), python-yaml, python-apt, python-cheetah
26+Build-Depends: debhelper (>= 7.0.50~), wget, python, pwgen, openssh-server, openssh-client, rsync, python-setuptools ( >= 0.6c11~ ), python-yaml, python-apt, python-cheetah, pep8, python-simplejson, python-testtools, python-shelltoolbox
27 Standards-Version: 3.9.2
28 Homepage: https://launchpad.net/charm-tools
29

Subscribers

People subscribed via source and target branches