Ubuntu
charm-tools package

Merge lp:~marcoceppi/ubuntu/precise/charm-tools/lp1223229 into lp:ubuntu/precise/charm-tools

  1. Precise (12.04)
  2. lp1223229
  3. Merge into precise
Proposed by Marco Ceppi
Status: Merged
Merge reported by: Robie Basak
Merged at revision: not available
Proposed branch: lp:~marcoceppi/ubuntu/precise/charm-tools/lp1223229
Merge into: lp:ubuntu/precise/charm-tools
Diff against target: 49 lines (+8/-5)
2 files modified
debian/changelog (+7/-2)
debian/control (+1/-3)
To merge this branch: bzr merge lp:~marcoceppi/ubuntu/precise/charm-tools/lp1223229
Reviewer Review Type Date Requested Status
Robie Basak Needs Fixing
Review via email: mp+209542@code.launchpad.net

Description of the change

Fixes bug #1182905 by making charm-tools merely suggest instead of recommend juju

To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote :

Hi Marco!

Thank you for the fix. This looks reasonable, but for an SRU to Precise we need a public bug, with SRU justification filled out, and the changelog entry to refer to that bug.

I'm also a little baffled by the lp:ubuntu/precise/charm-tools branch. It is ahead of the version actually in Precise. We can only upload SRU justified fixes, so I can do this minimal fix, but not the previous changes this branch is based on but which were never uploaded to Precise. If this is confusing, don't worry about it - if you can do the bug and update this branch, I can fix it up on upload.

review: Needs Fixing
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

Hi Robie,

Apparently it's had a public bug the whole time, lp:1182905, I've updated the description with this information. As far as the which code to update that unfortunately flies a bit over my head :\

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-04-23 21:54:37 +0000
3+++ debian/changelog 2014-03-05 21:23:50 +0000
4@@ -1,9 +1,14 @@
5-charm-tools (0.3+136-0ubuntu1) UNRELEASED; urgency=low
6+charm-tools (0.3+136-0ubuntu2) precise; urgency=low
7
8+ [ Clint Byrum ]
9 * New upstream release. Includes new python-charmhelpers.
10 * build-dep on python-yaml so charm proof tests can be run.
11
12- -- Clint Byrum <clint@ubuntu.com> Mon, 23 Apr 2012 14:54:10 -0700
13+ [ Marco Ceppi ]
14+ * charm-tools now suggests juju or juju-core instead of recommends
15+ * charm-helpers should not suggest or recommend juju, conflicts juju-core
16+
17+ -- Marco Ceppi <marco@ceppi.net> Wed, 05 Mar 2014 16:13:49 -0500
18
19 charm-tools (0.3+121-0ubuntu1) precise; urgency=low
20
21
22=== modified file 'debian/control'
23--- debian/control 2012-04-23 21:54:37 +0000
24+++ debian/control 2014-03-05 21:23:50 +0000
25@@ -11,7 +11,7 @@
26 Depends: ${misc:Depends}, ${python:Depends}, bzr, mr, python, python-apt, python-cheetah, python-launchpadlib, curl, python-yaml
27 Breaks: principia-tools
28 Replaces: principia-tools
29-Recommends: juju
30+Suggests: juju-core | juju
31 Description: tools for maintaining Juju charms
32 This project is a set of tools for authoring and maintaining charms in
33 the Juju charms distribution.
34@@ -24,7 +24,6 @@
35 Package: charm-helper-sh
36 Architecture: all
37 Depends: wget, bind9-host, ${misc:Depends}
38-Suggests: juju
39 Provides: charm-helper-bash
40 Description: shell script helpers for use in juju charms
41 This project is a set of tools for authoring and maintaining charms in
42@@ -36,7 +35,6 @@
43 Package: python-charmhelpers
44 Architecture: all
45 Depends: ${python:Depends}, ${misc:Depends}
46-Suggests: juju
47 Description: python module for use in juju charms written in python
48 This project is a set of tools for authoring and maintaining charms in
49 the Juju charms distribution.

Subscribers

People subscribed via source and target branches

to all changes: