Online Accounts: Account plugins

Merge lp://qastaging/~townsend/account-plugins/lp1070344 into lp://qastaging/account-plugins

  1. lp1070344
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Christopher Townsend
Approved revision: 95
Merged at revision: 94
Proposed branch: lp://qastaging/~townsend/account-plugins/lp1070344
Merge into: lp://qastaging/account-plugins
Diff against target: 268 lines (+20/-61)
10 files modified
Makefile.am (+0/-24)
debian/account-plugin-facebook.install (+0/-1)
debian/account-plugin-flickr.install (+0/-1)
debian/account-plugin-foursquare.install (+0/-1)
debian/account-plugin-google.install (+0/-1)
debian/account-plugin-icons.install (+0/-14)
debian/account-plugin-identica.install (+0/-1)
debian/account-plugin-twitter.install (+0/-1)
debian/account-plugin-windows-live.install (+0/-1)
debian/control (+20/-16)
To merge this branch: bzr merge lp://qastaging/~townsend/account-plugins/lp1070344
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ken VanDine Approve
Review via email: mp+147769@code.qastaging.launchpad.net

Commit message

Remove icons since they will be now included in unity-asset-pool. (LP: #1070344)

Description of the change

This removes the icons and references to the icons from the source and into the unity-asset-pool source.

This depends on these two MP's to also be approved:
https://code.launchpad.net/~townsend/webapps-applications/lp1070344/+merge/147770
https://code.launchpad.net/~townsend/unity-asset-pool/lp1070344/+merge/147771

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

PASSED: Continuous integration, rev:91
http://s-jenkins:8080/job/account-plugins-ci/18/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/18/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/18/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/18//rebuild/?

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

PASSED: Continuous integration, rev:92
http://s-jenkins:8080/job/account-plugins-ci/19/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/19/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/19/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/19//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good to me, the unity-asset-pool package needs to add a Breaks/Replaces for account-plugin-icons to ensure that package gets removed on update.

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

PASSED: Continuous integration, rev:93
http://s-jenkins:8080/job/account-plugins-ci/24/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/24/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/24/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/24//rebuild/?

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

PASSED: Continuous integration, rev:94
http://s-jenkins:8080/job/account-plugins-ci/26/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/26/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/26/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/26/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/account-plugins-autolanding/22/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/22/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=i386/22/console

review: Needs Fixing (continuous-integration)
lp://qastaging/~townsend/account-plugins/lp1070344 updated
95. By Christopher Townsend

Merge in from trunk and fix conflict in debian/control.

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

PASSED: Continuous integration, rev:95
http://s-jenkins:8080/job/account-plugins-ci/31/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/31/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/31/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/31/rebuild

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