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

[Sidnei da Silva]

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

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

[Mark Mims (mark-mims)]

lgtm

review: Approve

[Didier Roche-Tolomelli (didrocks)]

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)]

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)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-23 13:52:08 +0000
+++ debian/changelog	2013-04-02 22:30:31 +0000
@@ -1,3 +1,12 @@
+charm-tools (0.3+172-0ubuntu1) raring; urgency=low
+
+  * build-dep on pep8 so 'make check' can run. 
+  * build-dep on python-testtools, also required for tests. 
+  * build-dep on python-simplejson, also required for tests. 
+  * build-dep on python-shelltoolbox, also required for tests. 
+
+ -- Sidnei da Silva <[e-mail]>  Tue, 02 Apr 2013 09:59:22 -0300
+
 charm-tools (0.3+151-0ubuntu1) quantal; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2012-07-23 13:52:08 +0000
+++ debian/control	2013-04-02 22:30:31 +0000
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Clint Byrum <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~), wget, python, pwgen, openssh-server, openssh-client, rsync, python-setuptools ( >= 0.6c11~ ), python-yaml, python-apt, python-cheetah
+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
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/charm-tools