Checkbox

Merge lp://staging/~cr3/checkbox/1049218 into lp://staging/checkbox

1049218
Merge into trunk

Proposed by Marc Tardif on 2012-09-12

Status:	Merged
Merged at revision:	1689
Proposed branch:	lp://staging/~cr3/checkbox/1049218
Merge into:	lp://staging/checkbox
Diff against target:	163 lines (+61/-27) 2 files modified debian/changelog (+2/-0) setup.py (+59/-27)
To merge this branch:	bzr merge lp://staging/~cr3/checkbox/1049218
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Kevin McDermott (community)	2012-09-12	Approve on 2012-09-20
Marc Tardif (community)		Needs Resubmitting on 2012-09-12
Review via email: mp+124034@code.staging.launchpad.net

Description of the change

Here we go again, please see if this merge request fixes the problem with the required dependency on distutils-extra. Thanks!

lp://staging/~cr3/checkbox/1049218 updated on 2012-09-12

1668. By Marc Tardif on 2012-09-12: Merged from trunk.
1669. By Marc Tardif on 2012-09-12: Re-fixed setup.py to be PEP8 compliant.
1670. By Marc Tardif on 2012-09-12: Re-fixed required dependency on distutils-extra by providing fake implementations of build_i18n and build_icons.
1671. By Marc Tardif on 2012-09-12: Re-added Launchpad bug number to debian/changelog.

Revision history for this message

Marc Tardif (cr3) wrote on 2012-09-12:

Sorry about that, I had to re-apply the changes I pushed to trunk accidentally and reverted. The diff in this merge request should look good once Launchpad finally finishes updating the diff. Again, sorry for all the noise :)

review: Needs Resubmitting

Revision history for this message

Marc Tardif (cr3) wrote on 2012-09-12:

For your reassurance, even though this merge request is for the trunk of the project which uses Python3, the same changes could be ported back to Precise which uses Python2. We're actually working on an SRU for Precise this iteration so the timing is perfect. You could then have a tarball with the fix shortly.

Revision history for this message

Kevin McDermott (bigkevmcd) wrote on 2012-09-20:

Thanks for the fix...

Looks good to me, running it yields one error (but this is not related to this branch AFAICT)

...
creating /home/kevin/.virtualenvs/cr3/lib/checkbox
creating /home/kevin/.virtualenvs/cr3/lib/checkbox/qt
copying qt/checkbox-qt.ui -> /home/kevin/.virtualenvs/cr3/lib/checkbox/qt/
error: can't copy 'qt/frontend/checkbox-qt-service': doesn't exist or not a regular file