Checkbox

Merge lp://qastaging/~sylvain-pineau/checkbox/vendor_removal_raring_onwards_packaging into lp://qastaging/~checkbox-dev/checkbox/checkbox-packaging

  1. vendor_removal_raring_onwards_packaging
  2. Merge into checkbox-packaging
Proposed by Sylvain Pineau
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 32
Merged at revision: 32
Proposed branch: lp://qastaging/~sylvain-pineau/checkbox/vendor_removal_raring_onwards_packaging
Merge into: lp://qastaging/~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 64 lines (+36/-0)
3 files modified
debian/patches/series (+1/-0)
debian/patches/vendorized_packages_removal.patch (+22/-0)
debian/rules (+13/-0)
To merge this branch: bzr merge lp://qastaging/~sylvain-pineau/checkbox/vendor_removal_raring_onwards_packaging
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Sylvain Pineau (community) Needs Resubmitting
Review via email: mp+193931@code.qastaging.launchpad.net

Description of the change

MR for the packaging branch.

This proposal removes the vendorized sw of plainbox for 13.04+ builds.
As Raring is the first release providing python3.3 (inspect.Signature) and unittest.mock (1.0).

Only extcmd will remain in plainbox/vendor.

I'm using a combination of inline replacements (for mock) and patches (for funcsigs).

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

57 + rm -rf $(CURDIR)/plainbox/plainbox/vendor/mock.py

probably -f is sufficient, I always find rm -rf 'anything scary

Otherwise looks good

lp://qastaging/~sylvain-pineau/checkbox/vendor_removal_raring_onwards_packaging updated
32. By Sylvain Pineau

debian:rules: Remove vendorized modules (in Ubuntu 13.04 onwards)

- Remove explicitly the funcsigs and mock modules in the build target
- Clean the plainbox code (with a quilt patch and inline replacements)

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

rm -f is enough. Fixed

review: Needs Resubmitting
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Thanks, looks great :-)

review: Approve

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