Merge lp://qastaging/~dbarth/webapps-demo/click-packages into lp://qastaging/webapps-demo

Proposed by David Barth
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 27
Merged at revision: 26
Proposed branch: lp://qastaging/~dbarth/webapps-demo/click-packages
Merge into: lp://qastaging/webapps-demo
Diff against target: 364 lines (+216/-8)
20 files modified
README (+6/-0)
debian/changelog (+9/-0)
debian/control (+20/-4)
debian/postinst (+21/-0)
debian/rules (+24/-1)
debian/webapps-demo-click.install (+1/-2)
debian/webapps-demo.install (+2/-0)
webapp-amazon/manifest.json (+15/-0)
webapp-amazon/webapp-amazon.json (+7/-0)
webapp-ebay/manifest.json (+15/-0)
webapp-ebay/webapp-ebay.json (+7/-0)
webapp-facebook/manifest.json (+15/-0)
webapp-facebook/webapp-facebook.json (+7/-0)
webapp-gmail/manifest.json (+15/-0)
webapp-gmail/webapp-gmail.json (+7/-0)
webapp-twitter/manifest.json (+15/-0)
webapp-twitter/webapp-twitter.desktop (+1/-1)
webapp-twitter/webapp-twitter.json (+7/-0)
webapp-ubuntuone/manifest.json (+15/-0)
webapp-ubuntuone/webapp-ubuntuone.json (+7/-0)
To merge this branch: bzr merge lp://qastaging/~dbarth/webapps-demo/click-packages
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+184639@code.qastaging.launchpad.net

Commit message

Migrate webapps definitions to click packages

Description of the change

This migrates webapps definitions to click packages.

I didn't take the qmlscene.desktop for now, but it should be resolved which package should contain it moving forward.

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

FAILED: Continuous integration, rev:25
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/~dbarth/webapps-demo/click-packages/+merge/184639/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/14/rebuild

review: Needs Fixing (continuous-integration)
25. By Ugo Riboni

Remove dependency on the hud as the package will be removed. Fixes: https://bugs.launchpad.net/bugs/1221344.

Approved by Günter Schwann, PS Jenkins bot.

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

re-merge click packages changes and resolve a conflict in debian/control

27. By David Barth

add click as build dependency as well

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

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