Ubuntu Application Launcher

Merge lp://staging/~ted/ubuntu-app-launch/libertine-detection into lp://staging/ubuntu-app-launch/15.10

libertine-detection
Merge into trunk.15.10

Proposed by Ted Gould on 2015-07-15

Status:	Merged
Approved by:	Christopher Townsend on 2015-08-13
Approved revision:	223
Merged at revision:	206
Proposed branch:	lp://staging/~ted/ubuntu-app-launch/libertine-detection
Merge into:	lp://staging/ubuntu-app-launch/15.10
Prerequisite:	lp://staging/~ted/ubuntu-app-launch/xmir-support
Diff against target:	866 lines (+454/-156) 13 files modified helpers-shared.c (+1/-1) helpers.h (+2/-0) libubuntu-app-launch/CMakeLists.txt (+2/-0) libubuntu-app-launch/app-info.c (+245/-0) libubuntu-app-launch/app-info.h (+27/-0) libubuntu-app-launch/desktop-exec.c (+69/-2) libubuntu-app-launch/desktop-exec.h (+3/-1) libubuntu-app-launch/ubuntu-app-launch-trace.tp (+7/-0) libubuntu-app-launch/ubuntu-app-launch.c (+38/-148) tests/exec-util-test.cc (+37/-0) tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications/test.desktop (+4/-0) tests/libertine-home/libertine-container/user-data/container-name/.local/share/applications/user-app.desktop (+4/-0) tests/libual-test.cc (+15/-4)
To merge this branch:	bzr merge lp://staging/~ted/ubuntu-app-launch/libertine-detection
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Christopher Townsend (community)			Approve on 2015-08-13
PS Jenkins bot (community)	continuous-integration		Approve on 2015-08-11
Charles Kerr (community)		2015-07-15	Approve on 2015-08-11
Review via email: mp+264789@code.staging.launchpad.net

Commit message

Detect applications that are in a libertine container

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-06:

FAILED: Continuous integration, rev:211
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ted/ubuntu-app-launch/libertine-detection/+merge/264789/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/10/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-07:

PASSED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/12/rebuild

review: Approve (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) wrote on 2015-08-10:

Mostly LGTM, no blockers, a few suggestions/questions inline

review: Approve

Revision history for this message

Ted Gould (ted) wrote on 2015-08-11:

Took your comments into account. The shared function was actually in a different branch I was working on, so I pulled it into this one. Also added the detection of libertine apps that are in the container's ~/.local/share/applications, which is important for clients like Steam or WINE.

lp://staging/~ted/ubuntu-app-launch/libertine-detection updated on 2015-08-11

217. By Ted Gould on 2015-08-11: Update to latest xmir-support

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-11:

PASSED: Continuous integration, rev:217
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/14/rebuild

review: Approve (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) on 2015-08-11:

review: Approve

lp://staging/~ted/ubuntu-app-launch/libertine-detection updated on 2015-08-11

218. By Ted Gould on 2015-08-11: Make triplet to appid work for libertine apps

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-11:

PASSED: Continuous integration, rev:218
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/15/rebuild

review: Approve (continuous-integration)

lp://staging/~ted/ubuntu-app-launch/libertine-detection updated on 2015-08-11

219. By Ted Gould on 2015-08-11: Reshuffle code so that JSON and click stuff is all in one file
220. By Ted Gould on 2015-08-11: Grab the libertine cache dirs
221. By Ted Gould on 2015-08-11: Setting data home as well
222. By Ted Gould on 2015-08-11: Testing the libertine triplet cases
223. By Ted Gould on 2015-08-11: Thought of another one