Unity Asset Pool

Merge lp:~townsend/unity-asset-pool/lp1070344 into lp: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:~townsend/unity-asset-pool/lp1070344
Merge into: lp: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:~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.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
=== added directory 'account-plugins-icons'
=== added file 'account-plugins-icons/aim.png'
0Binary files account-plugins-icons/aim.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/aim.png 2013-03-15 18:10:25 +0000 differ0Binary files account-plugins-icons/aim.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/aim.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/facebook.png'
1Binary files account-plugins-icons/facebook.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/facebook.png 2013-03-15 18:10:25 +0000 differ1Binary files account-plugins-icons/facebook.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/facebook.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/flickr.png'
2Binary files account-plugins-icons/flickr.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/flickr.png 2013-03-15 18:10:25 +0000 differ2Binary files account-plugins-icons/flickr.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/flickr.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/foursquare.png'
3Binary files account-plugins-icons/foursquare.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/foursquare.png 2013-03-15 18:10:25 +0000 differ3Binary files account-plugins-icons/foursquare.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/foursquare.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/gadugadu.png'
4Binary files account-plugins-icons/gadugadu.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/gadugadu.png 2013-03-15 18:10:25 +0000 differ4Binary files account-plugins-icons/gadugadu.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/gadugadu.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/google.png'
5Binary files account-plugins-icons/google.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/google.png 2013-03-15 18:10:25 +0000 differ5Binary files account-plugins-icons/google.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/google.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/groupwise.png'
6Binary files account-plugins-icons/groupwise.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/groupwise.png 2013-03-15 18:10:25 +0000 differ6Binary files account-plugins-icons/groupwise.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/groupwise.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/icq.png'
7Binary files account-plugins-icons/icq.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/icq.png 2013-03-15 18:10:25 +0000 differ7Binary files account-plugins-icons/icq.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/icq.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/identica.png'
8Binary files account-plugins-icons/identica.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/identica.png 2013-03-15 18:10:25 +0000 differ8Binary files account-plugins-icons/identica.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/identica.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/irc.png'
9Binary files account-plugins-icons/irc.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/irc.png 2013-03-15 18:10:25 +0000 differ9Binary files account-plugins-icons/irc.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/irc.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/jabber.png'
10Binary files account-plugins-icons/jabber.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/jabber.png 2013-03-15 18:10:25 +0000 differ10Binary files account-plugins-icons/jabber.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/jabber.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/linkedin.png'
11Binary files account-plugins-icons/linkedin.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/linkedin.png 2013-03-15 18:10:25 +0000 differ11Binary files account-plugins-icons/linkedin.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/linkedin.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/live.png'
12Binary files account-plugins-icons/live.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/live.png 2013-03-15 18:10:25 +0000 differ12Binary files account-plugins-icons/live.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/live.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/msn.png'
13Binary files account-plugins-icons/msn.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/msn.png 2013-03-15 18:10:25 +0000 differ13Binary files account-plugins-icons/msn.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/msn.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/mxit.png'
14Binary files account-plugins-icons/mxit.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/mxit.png 2013-03-15 18:10:25 +0000 differ14Binary files account-plugins-icons/mxit.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/mxit.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/myspace.png'
15Binary files account-plugins-icons/myspace.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/myspace.png 2013-03-15 18:10:25 +0000 differ15Binary files account-plugins-icons/myspace.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/myspace.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/novell.png'
16Binary files account-plugins-icons/novell.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/novell.png 2013-03-15 18:10:25 +0000 differ16Binary files account-plugins-icons/novell.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/novell.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/people-nearby.png'
17Binary files account-plugins-icons/people-nearby.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/people-nearby.png 2013-03-15 18:10:25 +0000 differ17Binary files account-plugins-icons/people-nearby.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/people-nearby.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/people-nearby1.png'
18Binary files account-plugins-icons/people-nearby1.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/people-nearby1.png 2013-03-15 18:10:25 +0000 differ18Binary files account-plugins-icons/people-nearby1.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/people-nearby1.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/sametime.png'
19Binary files account-plugins-icons/sametime.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/sametime.png 2013-03-15 18:10:25 +0000 differ19Binary files account-plugins-icons/sametime.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/sametime.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/sip.png'
20Binary files account-plugins-icons/sip.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/sip.png 2013-03-15 18:10:25 +0000 differ20Binary files account-plugins-icons/sip.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/sip.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/skype.png'
21Binary files account-plugins-icons/skype.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/skype.png 2013-03-15 18:10:25 +0000 differ21Binary files account-plugins-icons/skype.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/skype.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/twitter.png'
22Binary files account-plugins-icons/twitter.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/twitter.png 2013-03-15 18:10:25 +0000 differ22Binary files account-plugins-icons/twitter.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/twitter.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/yahoo.png'
23Binary files account-plugins-icons/yahoo.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/yahoo.png 2013-03-15 18:10:25 +0000 differ23Binary files account-plugins-icons/yahoo.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/yahoo.png 2013-03-15 18:10:25 +0000 differ
=== added file 'account-plugins-icons/zephyr.png'
24Binary files account-plugins-icons/zephyr.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/zephyr.png 2013-03-15 18:10:25 +0000 differ24Binary files account-plugins-icons/zephyr.png 1970-01-01 00:00:00 +0000 and account-plugins-icons/zephyr.png 2013-03-15 18:10:25 +0000 differ
=== modified file 'debian/control'
--- debian/control 2012-11-08 03:47:33 +0000
+++ debian/control 2013-03-15 18:10:25 +0000
@@ -17,6 +17,10 @@
17 gnome-icon-theme,17 gnome-icon-theme,
18 hicolor-icon-theme18 hicolor-icon-theme
19Provides: unity-icon-theme19Provides: unity-icon-theme
20Replaces: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),
21 unity-webapps-common (<= 2.4.13-0ubuntu1)
22Breaks: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),
23 unity-webapps-common (<= 2.4.13-0ubuntu1)
20Description: Unity Assets Pool24Description: Unity Assets Pool
21 Includes icons and other images for Unity25 Includes icons and other images for Unity
2226
2327
=== modified file 'debian/install'
--- debian/install 2012-11-08 03:47:33 +0000
+++ debian/install 2013-03-15 18:10:25 +0000
@@ -1,3 +1,6 @@
1launcher/* usr/share/unity/themes1launcher/* usr/share/unity/themes
2panel/* usr/share/unity/themes2panel/* usr/share/unity/themes
3unity-icon-theme usr/share/icons3unity-icon-theme usr/share/icons
4account-plugins-icons/* usr/share/icons/hicolor/32x32/apps
5unity-webapps-applications usr/share/icons
6unity-webapps-applications/apps/128/* usr/share/icons/hicolor/128x128/apps
47
=== added directory 'unity-webapps-applications'
=== added directory 'unity-webapps-applications/apps'
=== added directory 'unity-webapps-applications/apps/128'
=== added file 'unity-webapps-applications/apps/128/amazon-store.png'
5Binary files unity-webapps-applications/apps/128/amazon-store.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/128/amazon-store.png 2013-03-15 18:10:25 +0000 differ8Binary files unity-webapps-applications/apps/128/amazon-store.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/128/amazon-store.png 2013-03-15 18:10:25 +0000 differ
=== added file 'unity-webapps-applications/apps/128/ubuntuone-music.png'
6Binary files unity-webapps-applications/apps/128/ubuntuone-music.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/128/ubuntuone-music.png 2013-03-15 18:10:25 +0000 differ9Binary files unity-webapps-applications/apps/128/ubuntuone-music.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/128/ubuntuone-music.png 2013-03-15 18:10:25 +0000 differ
=== added directory 'unity-webapps-applications/apps/48'
=== added file 'unity-webapps-applications/apps/48/amazon-store.png'
7Binary files unity-webapps-applications/apps/48/amazon-store.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/48/amazon-store.png 2013-03-15 18:10:25 +0000 differ10Binary files unity-webapps-applications/apps/48/amazon-store.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/48/amazon-store.png 2013-03-15 18:10:25 +0000 differ
=== added file 'unity-webapps-applications/apps/48/ubuntuone-music.png'
8Binary files unity-webapps-applications/apps/48/ubuntuone-music.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/48/ubuntuone-music.png 2013-03-15 18:10:25 +0000 differ11Binary files unity-webapps-applications/apps/48/ubuntuone-music.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/48/ubuntuone-music.png 2013-03-15 18:10:25 +0000 differ
=== added directory 'unity-webapps-applications/apps/52'
=== added file 'unity-webapps-applications/apps/52/amazon-store.png'
9Binary files unity-webapps-applications/apps/52/amazon-store.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/52/amazon-store.png 2013-03-15 18:10:25 +0000 differ12Binary files unity-webapps-applications/apps/52/amazon-store.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/52/amazon-store.png 2013-03-15 18:10:25 +0000 differ
=== added directory 'unity-webapps-applications/apps/64'
=== added file 'unity-webapps-applications/apps/64/amazon-store.png'
10Binary files unity-webapps-applications/apps/64/amazon-store.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/64/amazon-store.png 2013-03-15 18:10:25 +0000 differ13Binary files unity-webapps-applications/apps/64/amazon-store.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/64/amazon-store.png 2013-03-15 18:10:25 +0000 differ
=== added file 'unity-webapps-applications/apps/64/ubuntuone-music.png'
11Binary files unity-webapps-applications/apps/64/ubuntuone-music.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/64/ubuntuone-music.png 2013-03-15 18:10:25 +0000 differ14Binary files unity-webapps-applications/apps/64/ubuntuone-music.png 1970-01-01 00:00:00 +0000 and unity-webapps-applications/apps/64/ubuntuone-music.png 2013-03-15 18:10:25 +0000 differ

Subscribers

People subscribed via source and target branches