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

Proposed by Christopher Townsend on 2013-02-11
Status: Merged
Approved by: Christopher Townsend on 2013-03-19
Approved revision: 95
Merged at revision: 94
Proposed branch: lp:~townsend/account-plugins/lp1070344
Merge into: lp: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:~townsend/account-plugins/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-02-28
Review via email: mp+147769@code.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.
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
95. By Christopher Townsend on 2013-03-19

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-03-19 10:36:36 +0000
3+++ Makefile.am 2013-03-19 14:50:30 +0000
4@@ -49,30 +49,6 @@
5 src/generic-oauth.vala
6 endif # ENABLE_LIBACCOUNT_PLUGIN
7
8-iconsdir = $(datadir)/icons/hicolor/32x32/apps
9-dist_icons_DATA = \
10- data/icons/aim.png \
11- data/icons/facebook.png \
12- data/icons/flickr.png \
13- data/icons/foursquare.png \
14- data/icons/gadugadu.png \
15- data/icons/google.png \
16- data/icons/groupwise.png \
17- data/icons/identica.png \
18- data/icons/icq.png \
19- data/icons/irc.png \
20- data/icons/jabber.png \
21- data/icons/live.png \
22- data/icons/msn.png \
23- data/icons/mxit.png \
24- data/icons/myspace.png \
25- data/icons/people-nearby.png \
26- data/icons/sametime.png \
27- data/icons/sip.png \
28- data/icons/twitter.png \
29- data/icons/yahoo.png \
30- data/icons/zephyr.png
31-
32 # Extract transatable strings from .provider files
33 %.provider: %.provider.in $(INTLTOOL_MERGE)
34 $(AM_V_at)$(MKDIR_P) $(builddir)/data/providers
35
36=== removed directory 'data/icons'
37=== removed file 'data/icons/aim.png'
38Binary files data/icons/aim.png 2012-06-21 06:25:04 +0000 and data/icons/aim.png 1970-01-01 00:00:00 +0000 differ
39=== removed file 'data/icons/facebook.png'
40Binary files data/icons/facebook.png 2012-06-21 06:24:42 +0000 and data/icons/facebook.png 1970-01-01 00:00:00 +0000 differ
41=== removed file 'data/icons/flickr.png'
42Binary files data/icons/flickr.png 2012-06-21 06:24:42 +0000 and data/icons/flickr.png 1970-01-01 00:00:00 +0000 differ
43=== removed file 'data/icons/foursquare.png'
44Binary files data/icons/foursquare.png 2012-06-26 10:05:06 +0000 and data/icons/foursquare.png 1970-01-01 00:00:00 +0000 differ
45=== removed file 'data/icons/gadugadu.png'
46Binary files data/icons/gadugadu.png 2012-06-21 06:25:04 +0000 and data/icons/gadugadu.png 1970-01-01 00:00:00 +0000 differ
47=== removed file 'data/icons/google.png'
48Binary files data/icons/google.png 2012-06-21 06:24:42 +0000 and data/icons/google.png 1970-01-01 00:00:00 +0000 differ
49=== removed file 'data/icons/groupwise.png'
50Binary files data/icons/groupwise.png 2012-06-21 06:25:04 +0000 and data/icons/groupwise.png 1970-01-01 00:00:00 +0000 differ
51=== removed file 'data/icons/icq.png'
52Binary files data/icons/icq.png 2012-06-21 06:25:04 +0000 and data/icons/icq.png 1970-01-01 00:00:00 +0000 differ
53=== removed file 'data/icons/identica.png'
54Binary files data/icons/identica.png 2012-06-21 06:25:04 +0000 and data/icons/identica.png 1970-01-01 00:00:00 +0000 differ
55=== removed file 'data/icons/irc.png'
56Binary files data/icons/irc.png 2012-06-21 06:25:04 +0000 and data/icons/irc.png 1970-01-01 00:00:00 +0000 differ
57=== removed file 'data/icons/jabber.png'
58Binary files data/icons/jabber.png 2012-06-21 06:25:04 +0000 and data/icons/jabber.png 1970-01-01 00:00:00 +0000 differ
59=== removed file 'data/icons/linkedin.png'
60Binary files data/icons/linkedin.png 2012-06-21 06:25:04 +0000 and data/icons/linkedin.png 1970-01-01 00:00:00 +0000 differ
61=== removed file 'data/icons/live.png'
62Binary files data/icons/live.png 2012-06-21 06:25:04 +0000 and data/icons/live.png 1970-01-01 00:00:00 +0000 differ
63=== removed file 'data/icons/msn.png'
64Binary files data/icons/msn.png 2012-06-21 06:25:04 +0000 and data/icons/msn.png 1970-01-01 00:00:00 +0000 differ
65=== removed file 'data/icons/mxit.png'
66Binary files data/icons/mxit.png 2012-06-21 06:25:04 +0000 and data/icons/mxit.png 1970-01-01 00:00:00 +0000 differ
67=== removed file 'data/icons/myspace.png'
68Binary files data/icons/myspace.png 2012-06-21 06:25:04 +0000 and data/icons/myspace.png 1970-01-01 00:00:00 +0000 differ
69=== removed file 'data/icons/novell.png'
70Binary files data/icons/novell.png 2012-06-21 06:25:04 +0000 and data/icons/novell.png 1970-01-01 00:00:00 +0000 differ
71=== removed file 'data/icons/people-nearby.png'
72Binary files data/icons/people-nearby.png 2012-06-21 06:25:04 +0000 and data/icons/people-nearby.png 1970-01-01 00:00:00 +0000 differ
73=== removed file 'data/icons/people-nearby1.png'
74Binary files data/icons/people-nearby1.png 2012-06-21 06:25:04 +0000 and data/icons/people-nearby1.png 1970-01-01 00:00:00 +0000 differ
75=== removed file 'data/icons/sametime.png'
76Binary files data/icons/sametime.png 2012-06-21 06:25:04 +0000 and data/icons/sametime.png 1970-01-01 00:00:00 +0000 differ
77=== removed file 'data/icons/sip.png'
78Binary files data/icons/sip.png 2012-09-05 13:29:29 +0000 and data/icons/sip.png 1970-01-01 00:00:00 +0000 differ
79=== removed file 'data/icons/skype.png'
80Binary files data/icons/skype.png 2012-06-21 06:25:04 +0000 and data/icons/skype.png 1970-01-01 00:00:00 +0000 differ
81=== removed file 'data/icons/twitter.png'
82Binary files data/icons/twitter.png 2012-06-21 06:24:42 +0000 and data/icons/twitter.png 1970-01-01 00:00:00 +0000 differ
83=== removed file 'data/icons/yahoo.png'
84Binary files data/icons/yahoo.png 2012-06-21 06:25:04 +0000 and data/icons/yahoo.png 1970-01-01 00:00:00 +0000 differ
85=== removed file 'data/icons/zephyr.png'
86Binary files data/icons/zephyr.png 2012-06-21 06:25:04 +0000 and data/icons/zephyr.png 1970-01-01 00:00:00 +0000 differ
87=== modified file 'debian/account-plugin-facebook.install'
88--- debian/account-plugin-facebook.install 2013-02-22 15:17:49 +0000
89+++ debian/account-plugin-facebook.install 2013-03-19 14:50:30 +0000
90@@ -3,4 +3,3 @@
91 usr/share/accounts/services/facebook-microblog.service
92 usr/share/accounts/services/facebook-im.service
93 usr/share/accounts/providers/facebook.provider
94-usr/share/icons/hicolor/32x32/apps/facebook.png
95
96=== modified file 'debian/account-plugin-flickr.install'
97--- debian/account-plugin-flickr.install 2013-02-22 15:17:49 +0000
98+++ debian/account-plugin-flickr.install 2013-03-19 14:50:30 +0000
99@@ -2,4 +2,3 @@
100 etc/signon-ui/webkit-options.d/secure.flickr.com.conf
101 usr/share/accounts/services/flickr-*.service
102 usr/share/accounts/providers/flickr.provider
103-usr/share/icons/hicolor/32x32/apps/flickr.png
104
105=== modified file 'debian/account-plugin-foursquare.install'
106--- debian/account-plugin-foursquare.install 2013-02-22 15:17:49 +0000
107+++ debian/account-plugin-foursquare.install 2013-03-19 14:50:30 +0000
108@@ -1,4 +1,3 @@
109 etc/signon-ui/webkit-options.d/foursquare.com.conf
110 usr/share/accounts/services/foursquare-microblog.service
111 usr/share/accounts/providers/foursquare.provider
112-usr/share/icons/hicolor/32x32/apps/foursquare.png
113
114=== modified file 'debian/account-plugin-google.install'
115--- debian/account-plugin-google.install 2012-11-09 16:15:25 +0000
116+++ debian/account-plugin-google.install 2013-03-19 14:50:30 +0000
117@@ -4,4 +4,3 @@
118 usr/share/accounts/services/google-im.service
119 usr/share/accounts/services/picasa.service
120 usr/share/accounts/providers/google.provider
121-usr/share/icons/hicolor/32x32/apps/google.png
122
123=== removed file 'debian/account-plugin-icons.install'
124--- debian/account-plugin-icons.install 2012-11-09 16:15:25 +0000
125+++ debian/account-plugin-icons.install 1970-01-01 00:00:00 +0000
126@@ -1,14 +0,0 @@
127-usr/share/icons/hicolor/32x32/apps/aim.png
128-usr/share/icons/hicolor/32x32/apps/gadugadu.png
129-usr/share/icons/hicolor/32x32/apps/groupwise.png
130-usr/share/icons/hicolor/32x32/apps/icq.png
131-usr/share/icons/hicolor/32x32/apps/irc.png
132-usr/share/icons/hicolor/32x32/apps/jabber.png
133-usr/share/icons/hicolor/32x32/apps/msn.png
134-usr/share/icons/hicolor/32x32/apps/mxit.png
135-usr/share/icons/hicolor/32x32/apps/myspace.png
136-usr/share/icons/hicolor/32x32/apps/people-nearby.png
137-usr/share/icons/hicolor/32x32/apps/sametime.png
138-usr/share/icons/hicolor/32x32/apps/sip.png
139-usr/share/icons/hicolor/32x32/apps/yahoo.png
140-usr/share/icons/hicolor/32x32/apps/zephyr.png
141
142=== modified file 'debian/account-plugin-identica.install'
143--- debian/account-plugin-identica.install 2013-02-22 15:17:49 +0000
144+++ debian/account-plugin-identica.install 2013-03-19 14:50:30 +0000
145@@ -1,4 +1,3 @@
146 etc/signon-ui/webkit-options.d/identi.ca.conf
147 usr/share/accounts/services/identica-microblog.service
148 usr/share/accounts/providers/identica.provider
149-usr/share/icons/hicolor/32x32/apps/identica.png
150
151=== modified file 'debian/account-plugin-twitter.install'
152--- debian/account-plugin-twitter.install 2013-02-22 15:17:49 +0000
153+++ debian/account-plugin-twitter.install 2013-03-19 14:50:30 +0000
154@@ -1,4 +1,3 @@
155 etc/signon-ui/webkit-options.d/api.twitter.com.conf
156 usr/share/accounts/services/twitter-microblog.service
157 usr/share/accounts/providers/twitter.provider
158-usr/share/icons/hicolor/32x32/apps/twitter.png
159
160=== modified file 'debian/account-plugin-windows-live.install'
161--- debian/account-plugin-windows-live.install 2013-02-22 15:17:49 +0000
162+++ debian/account-plugin-windows-live.install 2013-03-19 14:50:30 +0000
163@@ -1,4 +1,3 @@
164 etc/signon-ui/webkit-options.d/login.live.com.conf
165 usr/share/accounts/services/wlm.service
166 usr/share/accounts/providers/windows-live.provider
167-usr/share/icons/hicolor/32x32/apps/live.png
168
169=== modified file 'debian/control'
170--- debian/control 2013-03-19 12:49:38 +0000
171+++ debian/control 2013-03-19 14:50:30 +0000
172@@ -32,63 +32,72 @@
173 Architecture: any
174 Depends: ${shlibs:Depends}, ${misc:Depends},
175 signon-keyring-extension,
176- signon-plugin-oauth2
177+ signon-plugin-oauth2,
178+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
179 Description: GNOME Control Center account plugin for single signon
180 GNOME Control Center account plugins for single signon
181
182 Package: account-plugin-facebook
183 Architecture: any
184 Depends: ${misc:Depends},
185- account-plugin-generic-oauth
186+ account-plugin-generic-oauth,
187+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
188 Description: GNOME Control Center account plugin for single signon - facebook
189 GNOME Control Center account plugins for single signon
190
191 Package: account-plugin-twitter
192 Architecture: any
193 Depends: ${misc:Depends},
194- account-plugin-generic-oauth
195+ account-plugin-generic-oauth,
196+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
197 Description: GNOME Control Center account plugin for single signon - twitter
198 GNOME Control Center account plugins for single signon
199
200 Package: account-plugin-flickr
201 Architecture: any
202 Depends: ${misc:Depends},
203- account-plugin-generic-oauth
204+ account-plugin-generic-oauth,
205+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
206 Description: GNOME Control Center account plugin for single signon - flickr
207 GNOME Control Center account plugins for single signon
208
209 Package: account-plugin-identica
210 Architecture: any
211 Depends: ${misc:Depends},
212- account-plugin-generic-oauth
213+ account-plugin-generic-oauth,
214+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
215 Description: GNOME Control Center account plugin for single signon - identica
216 GNOME Control Center account plugins for single signon
217
218 Package: account-plugin-foursquare
219 Architecture: any
220 Depends: ${misc:Depends},
221- account-plugin-generic-oauth
222+ account-plugin-generic-oauth,
223+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
224 Description: GNOME Control Center account plugin for single signon - foursquare
225 GNOME Control Center account plugins for single signon
226
227 Package: account-plugin-windows-live
228 Architecture: any
229 Depends: ${misc:Depends},
230- account-plugin-generic-oauth
231+ account-plugin-generic-oauth,
232+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
233 Description: GNOME Control Center account plugin for single signon - windows live
234 GNOME Control Center account plugins for single signon
235
236 Package: account-plugin-sohu
237 Architecture: any
238 Depends: ${misc:Depends},
239- account-plugin-generic-oauth
240+ account-plugin-generic-oauth,
241+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
242 Description: GNOME Control Center account plugin for single signon - sohu
243 GNOME Control Center account plugins for single signon
244
245 Package: account-plugin-sina
246 Architecture: any
247 Depends: ${misc:Depends},
248- account-plugin-generic-oauth
249+ account-plugin-generic-oauth,
250+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
251 Description: GNOME Control Center account plugin for single signon - sina
252 GNOME Control Center account plugins for single signon
253
254@@ -101,12 +110,7 @@
255 gir1.2-signon-1.0,
256 gir1.2-accounts-1.0,
257 signon-keyring-extension,
258- signon-plugin-oauth2
259+ signon-plugin-oauth2,
260+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
261 Description: GNOME Control Center account plugins for single signon - tools
262 GNOME Control Center account plugins for single signon
263-
264-Package: account-plugin-icons
265-Architecture: all
266-Depends: ${misc:Depends},
267-Description: GNOME Control Center account plugin for single signon - icons
268- GNOME Control Center account plugins for single signon

Subscribers

People subscribed via source and target branches

to all changes: