Xpresser

Merge lp://staging/~sylvain-pineau/xpresser/gtk3-port-with-cairo into lp://staging/xpresser

gtk3-port-with-cairo
Merge into trunk

Proposed by Sylvain Pineau on 2012-04-03

Status:	Rejected
Rejected by:	Chris Wayne on 2012-07-05
Proposed branch:	lp://staging/~sylvain-pineau/xpresser/gtk3-port-with-cairo
Merge into:	lp://staging/xpresser
Diff against target:	1524 lines (+1085/-72) 30 files modified debian/changelog (+78/-0) debian/compat (+1/-0) debian/control (+12/-0) debian/files (+1/-0) debian/python-xpresser.debhelper.log (+46/-0) debian/python-xpresser.postinst.debhelper (+7/-0) debian/python-xpresser.prerm.debhelper (+12/-0) debian/python-xpresser.substvars (+4/-0) debian/python-xpresser/DEBIAN/control (+10/-0) debian/python-xpresser/DEBIAN/md5sums (+10/-0) debian/python-xpresser/DEBIAN/postinst (+9/-0) debian/python-xpresser/DEBIAN/prerm (+14/-0) debian/python-xpresser/usr/share/pyshared/Xpresser-1.0.egg-info (+10/-0) debian/python-xpresser/usr/share/pyshared/xpresser/__init__.py (+23/-0) debian/python-xpresser/usr/share/pyshared/xpresser/errors.py (+23/-0) debian/python-xpresser/usr/share/pyshared/xpresser/image.py (+76/-0) debian/python-xpresser/usr/share/pyshared/xpresser/imagedir.py (+111/-0) debian/python-xpresser/usr/share/pyshared/xpresser/imagematch.py (+54/-0) debian/python-xpresser/usr/share/pyshared/xpresser/opencvfinder.py (+142/-0) debian/python-xpresser/usr/share/pyshared/xpresser/xp.py (+128/-0) debian/python-xpresser/usr/share/pyshared/xpresser/xutils.py (+132/-0) debian/rules (+9/-0) example.py (+3/-3) test (+125/-11) xpresser/__init__.py (+0/-2) xpresser/opencvfinder.py (+9/-18) xpresser/tests/test_opencvfinder.py (+3/-2) xpresser/tests/test_xp.py (+4/-4) xpresser/tests/test_xutils.py (+15/-15) xpresser/xutils.py (+14/-17)
To merge this branch:	bzr merge lp://staging/~sylvain-pineau/xpresser/gtk3-port-with-cairo
Related bugs:	Link a bug report
Related blueprints:	Port Xpresser to GTK3 so it is supported in upcoming Ubuntu Release 12.04 (Undefined) Update Xpresser code to use the latest python bindings for opencv so it is supported in upcoming Ubuntu Release 12.04 (Undefined)

Reviewer	Review Type	Date Requested	Status
Xpresser		2012-04-03	Pending
Review via email: mp+100615@code.staging.launchpad.net

Description of the change

This MR includes the GTK3 port started by Gustavo and the port to the new OpenCV 2.3 python wrapper cv2.
Unfortunately I've neglected to update the tests.

Revision history for this message

Chris Wayne (cwayne) wrote on 2012-07-05:

Rejected, would rather get the simplecv changes in

Unmerged revisions

16. By Sylvain Pineau on 2012-04-03: changelog update

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:

Sylvain Pineau

Xpresser