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

Proposed by Christopher Townsend on 2013-02-11
Status: Merged
Approved by: Francis Ginther on 2013-03-19
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 on 2013-03-19
Ken VanDine 2013-02-11 Approve on 2013-03-19
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.
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
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.

Christopher Townsend (townsend) wrote :

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

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.

Ken VanDine (ken-vandine) wrote :

Looks good now

review: Approve
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.

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'account-plugins-icons'
2=== added file 'account-plugins-icons/aim.png'
3Binary 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
4=== added file 'account-plugins-icons/facebook.png'
5Binary 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
6=== added file 'account-plugins-icons/flickr.png'
7Binary 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
8=== added file 'account-plugins-icons/foursquare.png'
9Binary 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
10=== added file 'account-plugins-icons/gadugadu.png'
11Binary 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
12=== added file 'account-plugins-icons/google.png'
13Binary 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
14=== added file 'account-plugins-icons/groupwise.png'
15Binary 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
16=== added file 'account-plugins-icons/icq.png'
17Binary 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
18=== added file 'account-plugins-icons/identica.png'
19Binary 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
20=== added file 'account-plugins-icons/irc.png'
21Binary 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
22=== added file 'account-plugins-icons/jabber.png'
23Binary 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
24=== added file 'account-plugins-icons/linkedin.png'
25Binary 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
26=== added file 'account-plugins-icons/live.png'
27Binary 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
28=== added file 'account-plugins-icons/msn.png'
29Binary 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
30=== added file 'account-plugins-icons/mxit.png'
31Binary 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
32=== added file 'account-plugins-icons/myspace.png'
33Binary 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
34=== added file 'account-plugins-icons/novell.png'
35Binary 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
36=== added file 'account-plugins-icons/people-nearby.png'
37Binary 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
38=== added file 'account-plugins-icons/people-nearby1.png'
39Binary 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
40=== added file 'account-plugins-icons/sametime.png'
41Binary 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
42=== added file 'account-plugins-icons/sip.png'
43Binary 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
44=== added file 'account-plugins-icons/skype.png'
45Binary 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
46=== added file 'account-plugins-icons/twitter.png'
47Binary 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
48=== added file 'account-plugins-icons/yahoo.png'
49Binary 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
50=== added file 'account-plugins-icons/zephyr.png'
51Binary 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
52=== modified file 'debian/control'
53--- debian/control 2012-11-08 03:47:33 +0000
54+++ debian/control 2013-03-15 18:10:25 +0000
55@@ -17,6 +17,10 @@
56 gnome-icon-theme,
57 hicolor-icon-theme
58 Provides: unity-icon-theme
59+Replaces: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),
60+ unity-webapps-common (<= 2.4.13-0ubuntu1)
61+Breaks: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),
62+ unity-webapps-common (<= 2.4.13-0ubuntu1)
63 Description: Unity Assets Pool
64 Includes icons and other images for Unity
65
66
67=== modified file 'debian/install'
68--- debian/install 2012-11-08 03:47:33 +0000
69+++ debian/install 2013-03-15 18:10:25 +0000
70@@ -1,3 +1,6 @@
71 launcher/* usr/share/unity/themes
72 panel/* usr/share/unity/themes
73 unity-icon-theme usr/share/icons
74+account-plugins-icons/* usr/share/icons/hicolor/32x32/apps
75+unity-webapps-applications usr/share/icons
76+unity-webapps-applications/apps/128/* usr/share/icons/hicolor/128x128/apps
77
78=== added directory 'unity-webapps-applications'
79=== added directory 'unity-webapps-applications/apps'
80=== added directory 'unity-webapps-applications/apps/128'
81=== added file 'unity-webapps-applications/apps/128/amazon-store.png'
82Binary 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
83=== added file 'unity-webapps-applications/apps/128/ubuntuone-music.png'
84Binary 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
85=== added directory 'unity-webapps-applications/apps/48'
86=== added file 'unity-webapps-applications/apps/48/amazon-store.png'
87Binary 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
88=== added file 'unity-webapps-applications/apps/48/ubuntuone-music.png'
89Binary 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
90=== added directory 'unity-webapps-applications/apps/52'
91=== added file 'unity-webapps-applications/apps/52/amazon-store.png'
92Binary 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
93=== added directory 'unity-webapps-applications/apps/64'
94=== added file 'unity-webapps-applications/apps/64/amazon-store.png'
95Binary 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
96=== added file 'unity-webapps-applications/apps/64/ubuntuone-music.png'
97Binary 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