Unity Asset Pool

Merge lp://qastaging/~townsend/unity-asset-pool/lp1070344 into lp://qastaging/unity-asset-pool

  1. lp1070344
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Francis Ginther
Approved revision: 70
Merged at revision: 67
Proposed branch: lp://qastaging/~townsend/unity-asset-pool/lp1070344
Merge into: lp://qastaging/unity-asset-pool
Diff against target: 97 lines (+7/-0)
2 files modified
debian/control (+4/-0)
debian/install (+3/-0)
To merge this branch: bzr merge lp://qastaging/~townsend/unity-asset-pool/lp1070344
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ken VanDine Approve
Review via email: mp+147771@code.qastaging.launchpad.net

Commit message

Added icons from account-plugins and webapps-applications. (LP: #1070344)

Description of the change

This adds the icons from account-plugins and webapps-applications.

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/account-plugins/lp1070344/+merge/147769

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

You should add a Breaks/Conflicts for account-plugin-icons.

For the webapps icons, I think those should get installed in hicolor, just like the account icons. However, in doing that we need to make sure the libunity-webapps deals with that OK. I don't think installing the webapps icons from unity-asset-pool into a separate icon theme directory really helps much. We want other apps that want to use the amazon icon to be able to use the same one. If we do install the webapps icons in /usr/share/icons/unity-webapps-applications, we need to add a Breaks/Conflicts for that as well.

review: Needs Fixing
Revision history for this message
Christopher Townsend (townsend) wrote :

I'm a bit confused as to why we need to Breaks/Conflicts the other packages in unity-asset-pool. I thought the purpose of this bug is to move the icons *only*, not the other aspects of account-plugin-icons and webapps-applications packages such as the tools, etc. This is why I had those packages depend on unity-asset-pool since they need the icons to work properly.

Revision history for this message
Christopher Townsend (townsend) wrote :

Oh, and I'll look into moving the Amazon and U1 icons into hicolor instead.

Revision history for this message
Christopher Townsend (townsend) wrote :

I chatted w/ Alexandre Abreu about only having the Amazon and U1 icons in hicolor and he said that as of right now, the webapps depend on having the theme installed and Unity needs to have them in hicolor. Since we are past feature freeze for changing webapps to only need hicolor, we have decided to leave them in both places for now and open a new bug to change webapps to only use hicolor.

Once webapps is changed, then we can get rid of the webapps-applications theme out of this package.

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good now

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-asset-pool-mbs-autolanding/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-asset-pool-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-asset-pool-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-asset-pool-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/6/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Some new hardware was added to the jenkins build environment and it wasn't completely configured. It should work now. Re-approving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
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