Merge lp:~marcoceppi/ubuntu/saucy/charm-tools/fix-deps into lp:ubuntu/saucy/charm-tools

[Marco Ceppi]

[Martin Pitt (pitti)]

Thanks! Uploaded with LP bug ref in the changelog.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-23 13:52:08 +0000
+++ debian/changelog	2013-05-22 17:38:25 +0000
@@ -1,3 +1,11 @@
+charm-tools (0.3+151-0ubuntu2) saucy; urgency=low
+
+  * Build-Depend on pep8
+  * charm-tools recommend juju-core OR juju
+  * charm-tools-sh suggest juju-core OR juju
+
+ -- Marco Ceppi <[e-mail]>  Wed, 22 May 2013 10:06:33 -0400
+
 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-05-22 17:38:25 +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
 
@@ -11,7 +11,7 @@
 Depends: ${misc:Depends}, ${python:Depends}, bzr, mr, python, python-apt, python-cheetah, python-launchpadlib, curl, python-yaml
 Breaks: principia-tools
 Replaces: principia-tools
-Recommends: juju
+Recommends: juju-core | juju
 Description: tools for maintaining Juju charms
  This project is a set of tools for authoring and maintaining charms in
  the Juju charms distribution.
@@ -24,7 +24,7 @@
 Package: charm-helper-sh
 Architecture: all
 Depends: wget, bind9-host, ${misc:Depends}
-Suggests: juju
+Suggests: juju-core | juju
 Provides: charm-helper-bash
 Description: shell script helpers for use in juju charms
  This project is a set of tools for authoring and maintaining charms in