Merge lp://staging/~ev/ubuntu-ci-services-itself/cli-packaging into lp://staging/ubuntu-ci-services-itself

Proposed by Evan
Status: Merged
Approved by: Evan
Approved revision: 314
Merged at revision: 314
Proposed branch: lp://staging/~ev/ubuntu-ci-services-itself/cli-packaging
Merge into: lp://staging/ubuntu-ci-services-itself
Diff against target: 217 lines (+137/-1)
14 files modified
ci-utils/ci_utils/setup_helper.py (+6/-1)
ci-utils/debian/changelog (+5/-0)
ci-utils/debian/compat (+1/-0)
ci-utils/debian/control (+31/-0)
ci-utils/debian/copyright (+18/-0)
ci-utils/debian/rules (+11/-0)
ci-utils/debian/source/format (+1/-0)
cli/debian/changelog (+5/-0)
cli/debian/compat (+1/-0)
cli/debian/control (+27/-0)
cli/debian/copyright (+18/-0)
cli/debian/docs (+1/-0)
cli/debian/rules (+11/-0)
cli/debian/source/format (+1/-0)
To merge this branch: bzr merge lp://staging/~ev/ubuntu-ci-services-itself/cli-packaging
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+209428@code.staging.launchpad.net

Commit message

Package ci-utils and the CLI.

Description of the change

Package ci-utils and the CLI.

To post a comment you must log in.
313. By Evan

Add a comment explaining why we use the current working dir for the component dir in the case of package builds.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:313
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/297/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/297/rebuild

review: Approve (continuous-integration)
Revision history for this message
Vincent Ladeuil (vila) wrote :

I'm not a packaging expert so I'm mostly learning here ;)

9 + if os.path.exists(component_dir):
10 + os.chdir(component_dir)
11 + else:
12 + # We're probably in the component dir (like when we're called from the
13 + # Debian package build).
14 + component_dir = os.getcwd()

I thought setup.py and debian packaging where completely separate so I don't quite get why/when this is involved, can you shed some light on what commands you use to trigger that ?

72 === added file 'ci-utils/debian/copyright'
73 --- ci-utils/debian/copyright 1970-01-01 00:00:00 +0000
74 +++ ci-utils/debian/copyright 2014-03-05 11:28:37 +0000

Oooh, that's all it takes ! Will fix my packages accordingly ;)

107 +override_dh_python2:
108 + dh_python2 --no-guessing-deps

What does that do ?

The rest looks similar to what I use myself so I can only approve ;)

review: Approve
314. By Evan

Clarify --no-guessing-deps

Revision history for this message
Evan (ev) wrote :

On 5 March 2014 11:53, Vincent Ladeuil <email address hidden> wrote:
> 9 + if os.path.exists(component_dir):
> 10 + os.chdir(component_dir)
> 11 + else:
> 12 + # We're probably in the component dir (like when we're called from the
> 13 + # Debian package build).
> 14 + component_dir = os.getcwd()
>
> I thought setup.py and debian packaging where completely separate so I don't quite get why/when this is involved, can you shed some light on what commands you use to trigger that ?

setup.py is called by debhelper as part of the package build.
`debian/rules binary` if you want to manually move through it.

Revision history for this message
Evan (ev) wrote :

On 5 March 2014 11:53, Vincent Ladeuil <email address hidden> wrote:
> 107 +override_dh_python2:
> 108 + dh_python2 --no-guessing-deps
>
> What does that do ?

Added a comment to address this.

Revision history for this message
Andy Doan (doanac) wrote :

Out of curiosity: is it not possible to have a single debian directory at the root of the project that could have built 2 packages, uci-cli and uci-utils?

Revision history for this message
Evan (ev) wrote :

It is. I thought this would be a bit cleaner, as when we decoupled
these into their own branches we could just carry their debian
directories with them. However, I'm now running into problems with
bzr-builder that make me think a single debian/ in the root dir is the
way forward.

On 5 March 2014 15:51, Andy Doan <email address hidden> wrote:
> Out of curiosity: is it not possible to have a single debian directory at the root of the project that could have built 2 packages, uci-cli and uci-utils?
> --
> https://code.launchpad.net/~ev/ubuntu-ci-services-itself/cli-packaging/+merge/209428
> You are the owner of lp:~ev/ubuntu-ci-services-itself/cli-packaging.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: