DBus Menu

Merge lp://staging/~cyphermox/libdbusmenu/inline into lp://staging/libdbusmenu/13.04

inline
Merge into trunk.13.04

Proposed by Mathieu Trudel-Lapierre on 2012-11-23

Status:	Merged
Merged at revision:	435
Proposed branch:	lp://staging/~cyphermox/libdbusmenu/inline
Merge into:	lp://staging/libdbusmenu/13.04
Diff against target:	2069 lines (+1937/-0) 26 files modified .bzr-builddeb/default.conf (+2/-0) debian/changelog (+1396/-0) debian/compat (+1/-0) debian/control (+240/-0) debian/copyright (+40/-0) debian/gir1.2-dbusmenu-glib-0.4.install (+1/-0) debian/gir1.2-dbusmenu-gtk-0.4.install (+1/-0) debian/gir1.2-dbusmenu-gtk3-0.4.install (+1/-0) debian/libdbusmenu-glib-dev.install (+6/-0) debian/libdbusmenu-glib-doc.install (+1/-0) debian/libdbusmenu-glib4.install (+1/-0) debian/libdbusmenu-glib4.symbols (+81/-0) debian/libdbusmenu-gtk-dev.install (+6/-0) debian/libdbusmenu-gtk-doc.install (+2/-0) debian/libdbusmenu-gtk3-4.install (+1/-0) debian/libdbusmenu-gtk3-4.symbols (+36/-0) debian/libdbusmenu-gtk3-dev.install (+6/-0) debian/libdbusmenu-gtk4.install (+1/-0) debian/libdbusmenu-gtk4.symbols (+36/-0) debian/libdbusmenu-jsonloader-dev.install (+4/-0) debian/libdbusmenu-jsonloader4.install (+1/-0) debian/libdbusmenu-jsonloader4.symbols (+3/-0) debian/libdbusmenu-tools.install (+3/-0) debian/rules (+64/-0) debian/source/format (+1/-0) debian/watch (+2/-0)
To merge this branch:	bzr merge lp://staging/~cyphermox/libdbusmenu/inline
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2012-12-05
Didier Roche-Tolomelli		2012-11-23	Approve on 2012-11-23
Review via email: mp+135804@code.staging.launchpad.net

Description of the change

Inline packaging.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2012-11-23:

FAILED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/6/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=amd64/6/console
FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=i386/6/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/6//rebuild/?

review: Needs Fixing (continuous-integration)

Revision history for this message

Didier Roche-Tolomelli (didrocks) wrote on 2012-11-23:

Awesome work!

Just a small remark:
I see some Breaks:, which seems not valid anymore in our upgrade path (as precise have newer versions that those), can you check every of them and remove if they not needed (meaning right now, if precise has a higher or equal version than the break)

Also, the tests seems to be built, but not run automatically? Can you have a look why.

Once the 2 items are done or have an answer, feel free to get it merged without waiting for me (hence the approval). Good work again :)

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2012-11-23:

PASSED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/7/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=amd64/7/console
SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=i386/7/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/7//rebuild/?

review: Approve (continuous-integration)

Revision history for this message

Allan LeSage (allanlesage) wrote on 2012-11-23:

Updated Jenkins jobs, autolanding should proceed upon approval.

lp://staging/~cyphermox/libdbusmenu/inline updated on 2012-11-23

446. By Mathieu Trudel-Lapierre on 2012-11-23: Remove outdated Breaks:.
447. By Mathieu Trudel-Lapierre on 2012-11-23: Override dh_auto_test to make sure they can be run for both the gtk2 and
gtk3 flavors.

Revision history for this message

Mathieu Trudel-Lapierre (cyphermox) wrote on 2012-11-23:

Updated the branch -- tests disabled temporarily due to bug 1082516.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2012-11-23:

PASSED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/8/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=amd64/8/console
SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=i386/8/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/8//rebuild/?

review: Approve (continuous-integration)

Revision history for this message

Didier Roche-Tolomelli (didrocks) wrote on 2012-11-26:

Looking good, however, rather than disabling the tests, maybe you can sync up with Charles to have a look here? (I'm afraid that if we merge that, we'll never think about enabling the tests again). What do you think?

lp://staging/~cyphermox/libdbusmenu/inline updated on 2012-11-27

448. By Mathieu Trudel-Lapierre on 2012-11-27: Re-enable tests.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2012-11-27:

FAILED: Continuous integration, rev:448
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/13/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=amd64/13/console
FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=i386/13/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/13//rebuild/?

review: Needs Fixing (continuous-integration)

Revision history for this message

Allan LeSage (allanlesage) wrote on 2012-11-28:

This last failure resulted from re-configuring the Jenkins job for a pre-inline MP to go through--everything should be set for autolanding now. Please approve the MP at will!

lp://staging/~cyphermox/libdbusmenu/inline updated on 2012-12-04

449. By Mathieu Trudel-Lapierre on 2012-12-04: Add dbus-test-runner to Build-Depends.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2012-12-04:

FAILED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/16/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/16/console
FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/16/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/16//rebuild/?

review: Needs Fixing (continuous-integration)

Revision history for this message

Allan LeSage (allanlesage) wrote on 2012-12-04:

This appears to be a legit test-failure, possibly involving some intermediate symbols-changes?

lp://staging/~cyphermox/libdbusmenu/inline updated on 2012-12-05

450. By Mathieu Trudel-Lapierre on 2012-12-05: - Add xvfb to Build-Depends.
- Run dh_auto_test through xvfb-run.

Revision history for this message

Mathieu Trudel-Lapierre (cyphermox) wrote on 2012-12-05:

Well, the test errors in gtk-doc have been fixed by Charles in a separate commit also waiting to be merged. I've just added the commits to fix the last other tests that appear to fail in sbuild (when testing with charles' gtk-doc changes)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2012-12-05:

FAILED: Continuous integration, rev:450
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/17/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/17/console
FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/17/console