Merge lp:~jbicha/unity-asset-pool/drop-obsolete-icons into lp:unity-asset-pool

Proposed by Jeremy Bicha on 2017-05-07
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2017-06-06
Approved revision: 85
Merged at revision: 84
Proposed branch: lp:~jbicha/unity-asset-pool/drop-obsolete-icons
Merge into: lp:unity-asset-pool
Diff against target: 108 lines (+8/-4)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
debian/install (+0/-3)
To merge this branch: bzr merge lp:~jbicha/unity-asset-pool/drop-obsolete-icons
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2017-05-07 Approve on 2017-06-06
Iain Lane Approve on 2017-06-01
Review via email: mp+323724@code.launchpad.net

Commit message

Drop account-plugin-icons (Empathy no longer supports UOA)
Drop unity-webapps icons to allow them to be shipped by the webapps directly

To post a comment you must log in.
Iain Lane (laney) wrote :

What's the reason for doing this out of order with the removal?

Jeremy Bicha (jbicha) wrote :

Right. This probably shouldn't land until whatever webapp implementation ships its own icon first. I needed it for my testing PPA if I wanted to reuse the existing icon name (useful for some "extreme" third-party themes) so I put it in bileto for holding.

I guess I should change the status here to WIP instead of Needs Review?

Iain Lane (laney) wrote :

Let's do this now. Thanks!

In the same silo we should upload Unity to drop the launcher I think. And I might as well put ubuntu-settings (the new webapp) in there. The package removals can happen at a later date but we should make sure to not forget about them.

review: Approve
Jeremy Bicha (jbicha) wrote :

Unless it's easier for you to make your own silo?

Iain Lane (laney) wrote :

I'm putting unity, webapps-applications, ubuntu-settings in there too. The first two (especially the second one) are for tidying up and the third holds the new launcher for Shell. I had uploaded that before but I messed up the paths for the icon theme so it wouldn't have worked once u-a-p dropped the icons.

Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'account-plugins-icons'
2=== removed file 'account-plugins-icons/aim.png'
3Binary files account-plugins-icons/aim.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/aim.png 1970-01-01 00:00:00 +0000 differ
4=== removed file 'account-plugins-icons/facebook.png'
5Binary files account-plugins-icons/facebook.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/facebook.png 1970-01-01 00:00:00 +0000 differ
6=== removed file 'account-plugins-icons/flickr.png'
7Binary files account-plugins-icons/flickr.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/flickr.png 1970-01-01 00:00:00 +0000 differ
8=== removed file 'account-plugins-icons/foursquare.png'
9Binary files account-plugins-icons/foursquare.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/foursquare.png 1970-01-01 00:00:00 +0000 differ
10=== removed file 'account-plugins-icons/gadugadu.png'
11Binary files account-plugins-icons/gadugadu.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/gadugadu.png 1970-01-01 00:00:00 +0000 differ
12=== removed file 'account-plugins-icons/google.png'
13Binary files account-plugins-icons/google.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/google.png 1970-01-01 00:00:00 +0000 differ
14=== removed file 'account-plugins-icons/groupwise.png'
15Binary files account-plugins-icons/groupwise.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/groupwise.png 1970-01-01 00:00:00 +0000 differ
16=== removed file 'account-plugins-icons/icq.png'
17Binary files account-plugins-icons/icq.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/icq.png 1970-01-01 00:00:00 +0000 differ
18=== removed file 'account-plugins-icons/identica.png'
19Binary files account-plugins-icons/identica.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/identica.png 1970-01-01 00:00:00 +0000 differ
20=== removed file 'account-plugins-icons/irc.png'
21Binary files account-plugins-icons/irc.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/irc.png 1970-01-01 00:00:00 +0000 differ
22=== removed file 'account-plugins-icons/jabber.png'
23Binary files account-plugins-icons/jabber.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/jabber.png 1970-01-01 00:00:00 +0000 differ
24=== removed file 'account-plugins-icons/linkedin.png'
25Binary files account-plugins-icons/linkedin.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/linkedin.png 1970-01-01 00:00:00 +0000 differ
26=== removed file 'account-plugins-icons/live.png'
27Binary files account-plugins-icons/live.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/live.png 1970-01-01 00:00:00 +0000 differ
28=== removed file 'account-plugins-icons/msn.png'
29Binary files account-plugins-icons/msn.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/msn.png 1970-01-01 00:00:00 +0000 differ
30=== removed file 'account-plugins-icons/mxit.png'
31Binary files account-plugins-icons/mxit.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/mxit.png 1970-01-01 00:00:00 +0000 differ
32=== removed file 'account-plugins-icons/myspace.png'
33Binary files account-plugins-icons/myspace.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/myspace.png 1970-01-01 00:00:00 +0000 differ
34=== removed file 'account-plugins-icons/novell.png'
35Binary files account-plugins-icons/novell.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/novell.png 1970-01-01 00:00:00 +0000 differ
36=== removed file 'account-plugins-icons/people-nearby.png'
37Binary files account-plugins-icons/people-nearby.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/people-nearby.png 1970-01-01 00:00:00 +0000 differ
38=== removed file 'account-plugins-icons/people-nearby1.png'
39Binary files account-plugins-icons/people-nearby1.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/people-nearby1.png 1970-01-01 00:00:00 +0000 differ
40=== removed file 'account-plugins-icons/sametime.png'
41Binary files account-plugins-icons/sametime.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/sametime.png 1970-01-01 00:00:00 +0000 differ
42=== removed file 'account-plugins-icons/sip.png'
43Binary files account-plugins-icons/sip.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/sip.png 1970-01-01 00:00:00 +0000 differ
44=== removed file 'account-plugins-icons/twitter.png'
45Binary files account-plugins-icons/twitter.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/twitter.png 1970-01-01 00:00:00 +0000 differ
46=== removed file 'account-plugins-icons/yahoo.png'
47Binary files account-plugins-icons/yahoo.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/yahoo.png 1970-01-01 00:00:00 +0000 differ
48=== removed file 'account-plugins-icons/zephyr.png'
49Binary files account-plugins-icons/zephyr.png 2013-02-11 20:36:19 +0000 and account-plugins-icons/zephyr.png 1970-01-01 00:00:00 +0000 differ
50=== modified file 'debian/changelog'
51--- debian/changelog 2014-12-17 23:33:58 +0000
52+++ debian/changelog 2017-05-07 17:35:51 +0000
53@@ -1,3 +1,10 @@
54+unity-asset-pool (0.8.24+15.04.20141217-0ubuntu2) vivid; urgency=medium
55+
56+ * Switch gnome-icon-theme to adwaita-icon-theme, which is its
57+ successor. (LP: #1414613)
58+
59+ -- Iain Lane <iain@orangesquash.org.uk> Mon, 26 Jan 2015 14:55:31 +0000
60+
61 unity-asset-pool (0.8.24+15.04.20141217-0ubuntu1) vivid; urgency=low
62
63 [ Andrea Azzarone ]
64
65=== modified file 'debian/control'
66--- debian/control 2013-03-21 07:13:42 +0000
67+++ debian/control 2017-05-07 17:35:51 +0000
68@@ -14,7 +14,7 @@
69 Package: unity-asset-pool
70 Architecture: all
71 Depends: ${misc:Depends},
72- gnome-icon-theme,
73+ adwaita-icon-theme,
74 hicolor-icon-theme
75 Provides: unity-icon-theme
76 Replaces: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),
77
78=== modified file 'debian/install'
79--- debian/install 2013-03-15 18:06:53 +0000
80+++ debian/install 2017-05-07 17:35:51 +0000
81@@ -1,6 +1,3 @@
82 launcher/* usr/share/unity/themes
83 panel/* usr/share/unity/themes
84 unity-icon-theme usr/share/icons
85-account-plugins-icons/* usr/share/icons/hicolor/32x32/apps
86-unity-webapps-applications usr/share/icons
87-unity-webapps-applications/apps/128/* usr/share/icons/hicolor/128x128/apps
88
89=== removed directory 'unity-webapps-applications'
90=== removed directory 'unity-webapps-applications/apps'
91=== removed directory 'unity-webapps-applications/apps/128'
92=== removed file 'unity-webapps-applications/apps/128/amazon-store.png'
93Binary files unity-webapps-applications/apps/128/amazon-store.png 2013-02-11 20:36:19 +0000 and unity-webapps-applications/apps/128/amazon-store.png 1970-01-01 00:00:00 +0000 differ
94=== removed file 'unity-webapps-applications/apps/128/ubuntuone-music.png'
95Binary files unity-webapps-applications/apps/128/ubuntuone-music.png 2013-02-11 20:36:19 +0000 and unity-webapps-applications/apps/128/ubuntuone-music.png 1970-01-01 00:00:00 +0000 differ
96=== removed directory 'unity-webapps-applications/apps/48'
97=== removed file 'unity-webapps-applications/apps/48/amazon-store.png'
98Binary files unity-webapps-applications/apps/48/amazon-store.png 2013-02-11 20:36:19 +0000 and unity-webapps-applications/apps/48/amazon-store.png 1970-01-01 00:00:00 +0000 differ
99=== removed file 'unity-webapps-applications/apps/48/ubuntuone-music.png'
100Binary files unity-webapps-applications/apps/48/ubuntuone-music.png 2013-02-11 20:36:19 +0000 and unity-webapps-applications/apps/48/ubuntuone-music.png 1970-01-01 00:00:00 +0000 differ
101=== removed directory 'unity-webapps-applications/apps/52'
102=== removed file 'unity-webapps-applications/apps/52/amazon-store.png'
103Binary files unity-webapps-applications/apps/52/amazon-store.png 2013-02-11 20:36:19 +0000 and unity-webapps-applications/apps/52/amazon-store.png 1970-01-01 00:00:00 +0000 differ
104=== removed directory 'unity-webapps-applications/apps/64'
105=== removed file 'unity-webapps-applications/apps/64/amazon-store.png'
106Binary files unity-webapps-applications/apps/64/amazon-store.png 2013-02-11 20:36:19 +0000 and unity-webapps-applications/apps/64/amazon-store.png 1970-01-01 00:00:00 +0000 differ
107=== removed file 'unity-webapps-applications/apps/64/ubuntuone-music.png'
108Binary files unity-webapps-applications/apps/64/ubuntuone-music.png 2013-02-11 20:36:19 +0000 and unity-webapps-applications/apps/64/ubuntuone-music.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: