Ubuntu Application Launcher

Merge lp://qastaging/~ted/ubuntu-app-launch/zg-reenable into lp://qastaging/ubuntu-app-launch/14.04

  1. zg-reenable
  2. Merge into trunk.14.04
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 90
Merged at revision: 85
Proposed branch: lp://qastaging/~ted/ubuntu-app-launch/zg-reenable
Merge into: lp://qastaging/ubuntu-app-launch/14.04
Prerequisite: lp://qastaging/~ted/ubuntu-app-launch/mock-lib-tests
Diff against target: 203 lines (+90/-17)
7 files modified
CMakeLists.txt (+3/-3)
application-click.conf.in (+2/-5)
application-legacy.conf.in (+2/-5)
debian/control (+2/-1)
tests/CMakeLists.txt (+10/-0)
tests/zg-test.cc (+68/-0)
zg-report-app.c (+3/-3)
To merge this branch: bzr merge lp://qastaging/~ted/ubuntu-app-launch/zg-reenable
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+194570@code.qastaging.launchpad.net

Commit message

Reenable ZG and port to libzg-2.0

Description of the change

Switches back on ZG after we turned it off for the release, so that it's back for this one. Also upgrades to libzg-2 and adds a test for it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/144/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/3/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/upstart-app-launch-ci/144/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

The code looks ok and the tests are a nice plus, just need to make Jenkins happy...

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

FAILED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/149/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/upstart-app-launch-ci/149/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ted/ubuntu-app-launch/zg-reenable updated
88. By Ted Gould

Updating mock lib branch

89. By Ted Gould

Put ZG in the wrong package

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

FAILED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/152/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/upstart-app-launch-ci/152/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/153/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/upstart-app-launch-ci/153/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~ted/ubuntu-app-launch/zg-reenable updated
90. By Ted Gould

Avoid an error in the ZG headers

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

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/upstart-app-launch-ci/154/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
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