Ubuntu
charm-tools package

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

  1. Saucy (13.10)
  2. fix-deps
  3. Merge into saucy
Proposed by Marco Ceppi
Status: Merged
Merged at revision: 19
Proposed branch: lp:~marcoceppi/ubuntu/saucy/charm-tools/fix-deps
Merge into: lp:ubuntu/saucy/charm-tools
Diff against target: 46 lines (+11/-3)
2 files modified
debian/changelog (+8/-0)
debian/control (+3/-3)
To merge this branch: bzr merge lp:~marcoceppi/ubuntu/saucy/charm-tools/fix-deps
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+165161@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Uploaded with LP bug ref in the changelog.

review: Approve

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-05-22 17:38:25 +0000
4@@ -1,3 +1,11 @@
5+charm-tools (0.3+151-0ubuntu2) saucy; urgency=low
6+
7+ * Build-Depend on pep8
8+ * charm-tools recommend juju-core OR juju
9+ * charm-tools-sh suggest juju-core OR juju
10+
11+ -- Marco Ceppi <marco.ceppi@canonical.com> Wed, 22 May 2013 10:06:33 -0400
12+
13 charm-tools (0.3+151-0ubuntu1) quantal; urgency=low
14
15 * New upstream release.
16
17=== modified file 'debian/control'
18--- debian/control 2012-07-23 13:52:08 +0000
19+++ debian/control 2013-05-22 17:38:25 +0000
20@@ -2,7 +2,7 @@
21 Section: net
22 Priority: optional
23 Maintainer: Clint Byrum <clint@ubuntu.com>
24-Build-Depends: debhelper (>= 7.0.50~), wget, python, pwgen, openssh-server, openssh-client, rsync, python-setuptools ( >= 0.6c11~ ), python-yaml, python-apt, python-cheetah
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, pep8, python-simplejson, python-testtools, python-shelltoolbox
26 Standards-Version: 3.9.2
27 Homepage: https://launchpad.net/charm-tools
28
29@@ -11,7 +11,7 @@
30 Depends: ${misc:Depends}, ${python:Depends}, bzr, mr, python, python-apt, python-cheetah, python-launchpadlib, curl, python-yaml
31 Breaks: principia-tools
32 Replaces: principia-tools
33-Recommends: juju
34+Recommends: juju-core | juju
35 Description: tools for maintaining Juju charms
36 This project is a set of tools for authoring and maintaining charms in
37 the Juju charms distribution.
38@@ -24,7 +24,7 @@
39 Package: charm-helper-sh
40 Architecture: all
41 Depends: wget, bind9-host, ${misc:Depends}
42-Suggests: juju
43+Suggests: juju-core | juju
44 Provides: charm-helper-bash
45 Description: shell script helpers for use in juju charms
46 This project is a set of tools for authoring and maintaining charms in

Subscribers

People subscribed via source and target branches

to all changes: