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
=== modified file 'Makefile.am'
--- Makefile.am 2013-03-19 10:36:36 +0000
+++ Makefile.am 2013-03-19 14:50:30 +0000
@@ -49,30 +49,6 @@
49 src/generic-oauth.vala49 src/generic-oauth.vala
50endif # ENABLE_LIBACCOUNT_PLUGIN50endif # ENABLE_LIBACCOUNT_PLUGIN
5151
52iconsdir = $(datadir)/icons/hicolor/32x32/apps
53dist_icons_DATA = \
54 data/icons/aim.png \
55 data/icons/facebook.png \
56 data/icons/flickr.png \
57 data/icons/foursquare.png \
58 data/icons/gadugadu.png \
59 data/icons/google.png \
60 data/icons/groupwise.png \
61 data/icons/identica.png \
62 data/icons/icq.png \
63 data/icons/irc.png \
64 data/icons/jabber.png \
65 data/icons/live.png \
66 data/icons/msn.png \
67 data/icons/mxit.png \
68 data/icons/myspace.png \
69 data/icons/people-nearby.png \
70 data/icons/sametime.png \
71 data/icons/sip.png \
72 data/icons/twitter.png \
73 data/icons/yahoo.png \
74 data/icons/zephyr.png
75
76# Extract transatable strings from .provider files52# Extract transatable strings from .provider files
77%.provider: %.provider.in $(INTLTOOL_MERGE)53%.provider: %.provider.in $(INTLTOOL_MERGE)
78 $(AM_V_at)$(MKDIR_P) $(builddir)/data/providers54 $(AM_V_at)$(MKDIR_P) $(builddir)/data/providers
7955
=== removed directory 'data/icons'
=== removed file 'data/icons/aim.png'
80Binary files data/icons/aim.png 2012-06-21 06:25:04 +0000 and data/icons/aim.png 1970-01-01 00:00:00 +0000 differ56Binary 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
=== removed file 'data/icons/facebook.png'
81Binary files data/icons/facebook.png 2012-06-21 06:24:42 +0000 and data/icons/facebook.png 1970-01-01 00:00:00 +0000 differ57Binary 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
=== removed file 'data/icons/flickr.png'
82Binary files data/icons/flickr.png 2012-06-21 06:24:42 +0000 and data/icons/flickr.png 1970-01-01 00:00:00 +0000 differ58Binary 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
=== removed file 'data/icons/foursquare.png'
83Binary files data/icons/foursquare.png 2012-06-26 10:05:06 +0000 and data/icons/foursquare.png 1970-01-01 00:00:00 +0000 differ59Binary 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
=== removed file 'data/icons/gadugadu.png'
84Binary files data/icons/gadugadu.png 2012-06-21 06:25:04 +0000 and data/icons/gadugadu.png 1970-01-01 00:00:00 +0000 differ60Binary 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
=== removed file 'data/icons/google.png'
85Binary files data/icons/google.png 2012-06-21 06:24:42 +0000 and data/icons/google.png 1970-01-01 00:00:00 +0000 differ61Binary 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
=== removed file 'data/icons/groupwise.png'
86Binary files data/icons/groupwise.png 2012-06-21 06:25:04 +0000 and data/icons/groupwise.png 1970-01-01 00:00:00 +0000 differ62Binary 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
=== removed file 'data/icons/icq.png'
87Binary files data/icons/icq.png 2012-06-21 06:25:04 +0000 and data/icons/icq.png 1970-01-01 00:00:00 +0000 differ63Binary 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
=== removed file 'data/icons/identica.png'
88Binary files data/icons/identica.png 2012-06-21 06:25:04 +0000 and data/icons/identica.png 1970-01-01 00:00:00 +0000 differ64Binary 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
=== removed file 'data/icons/irc.png'
89Binary files data/icons/irc.png 2012-06-21 06:25:04 +0000 and data/icons/irc.png 1970-01-01 00:00:00 +0000 differ65Binary 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
=== removed file 'data/icons/jabber.png'
90Binary files data/icons/jabber.png 2012-06-21 06:25:04 +0000 and data/icons/jabber.png 1970-01-01 00:00:00 +0000 differ66Binary 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
=== removed file 'data/icons/linkedin.png'
91Binary files data/icons/linkedin.png 2012-06-21 06:25:04 +0000 and data/icons/linkedin.png 1970-01-01 00:00:00 +0000 differ67Binary 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
=== removed file 'data/icons/live.png'
92Binary files data/icons/live.png 2012-06-21 06:25:04 +0000 and data/icons/live.png 1970-01-01 00:00:00 +0000 differ68Binary 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
=== removed file 'data/icons/msn.png'
93Binary files data/icons/msn.png 2012-06-21 06:25:04 +0000 and data/icons/msn.png 1970-01-01 00:00:00 +0000 differ69Binary 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
=== removed file 'data/icons/mxit.png'
94Binary files data/icons/mxit.png 2012-06-21 06:25:04 +0000 and data/icons/mxit.png 1970-01-01 00:00:00 +0000 differ70Binary 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
=== removed file 'data/icons/myspace.png'
95Binary files data/icons/myspace.png 2012-06-21 06:25:04 +0000 and data/icons/myspace.png 1970-01-01 00:00:00 +0000 differ71Binary 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
=== removed file 'data/icons/novell.png'
96Binary files data/icons/novell.png 2012-06-21 06:25:04 +0000 and data/icons/novell.png 1970-01-01 00:00:00 +0000 differ72Binary 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
=== removed file 'data/icons/people-nearby.png'
97Binary 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 differ73Binary 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
=== removed file 'data/icons/people-nearby1.png'
98Binary 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 differ74Binary 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
=== removed file 'data/icons/sametime.png'
99Binary files data/icons/sametime.png 2012-06-21 06:25:04 +0000 and data/icons/sametime.png 1970-01-01 00:00:00 +0000 differ75Binary 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
=== removed file 'data/icons/sip.png'
100Binary files data/icons/sip.png 2012-09-05 13:29:29 +0000 and data/icons/sip.png 1970-01-01 00:00:00 +0000 differ76Binary 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
=== removed file 'data/icons/skype.png'
101Binary files data/icons/skype.png 2012-06-21 06:25:04 +0000 and data/icons/skype.png 1970-01-01 00:00:00 +0000 differ77Binary 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
=== removed file 'data/icons/twitter.png'
102Binary files data/icons/twitter.png 2012-06-21 06:24:42 +0000 and data/icons/twitter.png 1970-01-01 00:00:00 +0000 differ78Binary 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
=== removed file 'data/icons/yahoo.png'
103Binary files data/icons/yahoo.png 2012-06-21 06:25:04 +0000 and data/icons/yahoo.png 1970-01-01 00:00:00 +0000 differ79Binary 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
=== removed file 'data/icons/zephyr.png'
104Binary files data/icons/zephyr.png 2012-06-21 06:25:04 +0000 and data/icons/zephyr.png 1970-01-01 00:00:00 +0000 differ80Binary 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
=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install 2013-02-22 15:17:49 +0000
+++ debian/account-plugin-facebook.install 2013-03-19 14:50:30 +0000
@@ -3,4 +3,3 @@
3usr/share/accounts/services/facebook-microblog.service3usr/share/accounts/services/facebook-microblog.service
4usr/share/accounts/services/facebook-im.service4usr/share/accounts/services/facebook-im.service
5usr/share/accounts/providers/facebook.provider5usr/share/accounts/providers/facebook.provider
6usr/share/icons/hicolor/32x32/apps/facebook.png
76
=== modified file 'debian/account-plugin-flickr.install'
--- debian/account-plugin-flickr.install 2013-02-22 15:17:49 +0000
+++ debian/account-plugin-flickr.install 2013-03-19 14:50:30 +0000
@@ -2,4 +2,3 @@
2etc/signon-ui/webkit-options.d/secure.flickr.com.conf2etc/signon-ui/webkit-options.d/secure.flickr.com.conf
3usr/share/accounts/services/flickr-*.service3usr/share/accounts/services/flickr-*.service
4usr/share/accounts/providers/flickr.provider4usr/share/accounts/providers/flickr.provider
5usr/share/icons/hicolor/32x32/apps/flickr.png
65
=== modified file 'debian/account-plugin-foursquare.install'
--- debian/account-plugin-foursquare.install 2013-02-22 15:17:49 +0000
+++ debian/account-plugin-foursquare.install 2013-03-19 14:50:30 +0000
@@ -1,4 +1,3 @@
1etc/signon-ui/webkit-options.d/foursquare.com.conf1etc/signon-ui/webkit-options.d/foursquare.com.conf
2usr/share/accounts/services/foursquare-microblog.service2usr/share/accounts/services/foursquare-microblog.service
3usr/share/accounts/providers/foursquare.provider3usr/share/accounts/providers/foursquare.provider
4usr/share/icons/hicolor/32x32/apps/foursquare.png
54
=== modified file 'debian/account-plugin-google.install'
--- debian/account-plugin-google.install 2012-11-09 16:15:25 +0000
+++ debian/account-plugin-google.install 2013-03-19 14:50:30 +0000
@@ -4,4 +4,3 @@
4usr/share/accounts/services/google-im.service4usr/share/accounts/services/google-im.service
5usr/share/accounts/services/picasa.service5usr/share/accounts/services/picasa.service
6usr/share/accounts/providers/google.provider6usr/share/accounts/providers/google.provider
7usr/share/icons/hicolor/32x32/apps/google.png
87
=== removed file 'debian/account-plugin-icons.install'
--- debian/account-plugin-icons.install 2012-11-09 16:15:25 +0000
+++ debian/account-plugin-icons.install 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1usr/share/icons/hicolor/32x32/apps/aim.png
2usr/share/icons/hicolor/32x32/apps/gadugadu.png
3usr/share/icons/hicolor/32x32/apps/groupwise.png
4usr/share/icons/hicolor/32x32/apps/icq.png
5usr/share/icons/hicolor/32x32/apps/irc.png
6usr/share/icons/hicolor/32x32/apps/jabber.png
7usr/share/icons/hicolor/32x32/apps/msn.png
8usr/share/icons/hicolor/32x32/apps/mxit.png
9usr/share/icons/hicolor/32x32/apps/myspace.png
10usr/share/icons/hicolor/32x32/apps/people-nearby.png
11usr/share/icons/hicolor/32x32/apps/sametime.png
12usr/share/icons/hicolor/32x32/apps/sip.png
13usr/share/icons/hicolor/32x32/apps/yahoo.png
14usr/share/icons/hicolor/32x32/apps/zephyr.png
150
=== modified file 'debian/account-plugin-identica.install'
--- debian/account-plugin-identica.install 2013-02-22 15:17:49 +0000
+++ debian/account-plugin-identica.install 2013-03-19 14:50:30 +0000
@@ -1,4 +1,3 @@
1etc/signon-ui/webkit-options.d/identi.ca.conf1etc/signon-ui/webkit-options.d/identi.ca.conf
2usr/share/accounts/services/identica-microblog.service2usr/share/accounts/services/identica-microblog.service
3usr/share/accounts/providers/identica.provider3usr/share/accounts/providers/identica.provider
4usr/share/icons/hicolor/32x32/apps/identica.png
54
=== modified file 'debian/account-plugin-twitter.install'
--- debian/account-plugin-twitter.install 2013-02-22 15:17:49 +0000
+++ debian/account-plugin-twitter.install 2013-03-19 14:50:30 +0000
@@ -1,4 +1,3 @@
1etc/signon-ui/webkit-options.d/api.twitter.com.conf1etc/signon-ui/webkit-options.d/api.twitter.com.conf
2usr/share/accounts/services/twitter-microblog.service2usr/share/accounts/services/twitter-microblog.service
3usr/share/accounts/providers/twitter.provider3usr/share/accounts/providers/twitter.provider
4usr/share/icons/hicolor/32x32/apps/twitter.png
54
=== modified file 'debian/account-plugin-windows-live.install'
--- debian/account-plugin-windows-live.install 2013-02-22 15:17:49 +0000
+++ debian/account-plugin-windows-live.install 2013-03-19 14:50:30 +0000
@@ -1,4 +1,3 @@
1etc/signon-ui/webkit-options.d/login.live.com.conf1etc/signon-ui/webkit-options.d/login.live.com.conf
2usr/share/accounts/services/wlm.service2usr/share/accounts/services/wlm.service
3usr/share/accounts/providers/windows-live.provider3usr/share/accounts/providers/windows-live.provider
4usr/share/icons/hicolor/32x32/apps/live.png
54
=== modified file 'debian/control'
--- debian/control 2013-03-19 12:49:38 +0000
+++ debian/control 2013-03-19 14:50:30 +0000
@@ -32,63 +32,72 @@
32Architecture: any32Architecture: any
33Depends: ${shlibs:Depends}, ${misc:Depends},33Depends: ${shlibs:Depends}, ${misc:Depends},
34 signon-keyring-extension,34 signon-keyring-extension,
35 signon-plugin-oauth235 signon-plugin-oauth2,
36 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
36Description: GNOME Control Center account plugin for single signon37Description: GNOME Control Center account plugin for single signon
37 GNOME Control Center account plugins for single signon38 GNOME Control Center account plugins for single signon
3839
39Package: account-plugin-facebook40Package: account-plugin-facebook
40Architecture: any41Architecture: any
41Depends: ${misc:Depends},42Depends: ${misc:Depends},
42 account-plugin-generic-oauth43 account-plugin-generic-oauth,
44 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
43Description: GNOME Control Center account plugin for single signon - facebook45Description: GNOME Control Center account plugin for single signon - facebook
44 GNOME Control Center account plugins for single signon46 GNOME Control Center account plugins for single signon
4547
46Package: account-plugin-twitter48Package: account-plugin-twitter
47Architecture: any49Architecture: any
48Depends: ${misc:Depends},50Depends: ${misc:Depends},
49 account-plugin-generic-oauth51 account-plugin-generic-oauth,
52 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
50Description: GNOME Control Center account plugin for single signon - twitter53Description: GNOME Control Center account plugin for single signon - twitter
51 GNOME Control Center account plugins for single signon54 GNOME Control Center account plugins for single signon
5255
53Package: account-plugin-flickr56Package: account-plugin-flickr
54Architecture: any57Architecture: any
55Depends: ${misc:Depends},58Depends: ${misc:Depends},
56 account-plugin-generic-oauth59 account-plugin-generic-oauth,
60 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
57Description: GNOME Control Center account plugin for single signon - flickr61Description: GNOME Control Center account plugin for single signon - flickr
58 GNOME Control Center account plugins for single signon62 GNOME Control Center account plugins for single signon
5963
60Package: account-plugin-identica64Package: account-plugin-identica
61Architecture: any65Architecture: any
62Depends: ${misc:Depends},66Depends: ${misc:Depends},
63 account-plugin-generic-oauth67 account-plugin-generic-oauth,
68 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
64Description: GNOME Control Center account plugin for single signon - identica69Description: GNOME Control Center account plugin for single signon - identica
65 GNOME Control Center account plugins for single signon70 GNOME Control Center account plugins for single signon
6671
67Package: account-plugin-foursquare72Package: account-plugin-foursquare
68Architecture: any73Architecture: any
69Depends: ${misc:Depends},74Depends: ${misc:Depends},
70 account-plugin-generic-oauth75 account-plugin-generic-oauth,
76 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
71Description: GNOME Control Center account plugin for single signon - foursquare77Description: GNOME Control Center account plugin for single signon - foursquare
72 GNOME Control Center account plugins for single signon78 GNOME Control Center account plugins for single signon
7379
74Package: account-plugin-windows-live80Package: account-plugin-windows-live
75Architecture: any81Architecture: any
76Depends: ${misc:Depends},82Depends: ${misc:Depends},
77 account-plugin-generic-oauth83 account-plugin-generic-oauth,
84 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
78Description: GNOME Control Center account plugin for single signon - windows live85Description: GNOME Control Center account plugin for single signon - windows live
79 GNOME Control Center account plugins for single signon86 GNOME Control Center account plugins for single signon
8087
81Package: account-plugin-sohu88Package: account-plugin-sohu
82Architecture: any89Architecture: any
83Depends: ${misc:Depends},90Depends: ${misc:Depends},
84 account-plugin-generic-oauth91 account-plugin-generic-oauth,
92 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
85Description: GNOME Control Center account plugin for single signon - sohu93Description: GNOME Control Center account plugin for single signon - sohu
86 GNOME Control Center account plugins for single signon94 GNOME Control Center account plugins for single signon
8795
88Package: account-plugin-sina96Package: account-plugin-sina
89Architecture: any97Architecture: any
90Depends: ${misc:Depends},98Depends: ${misc:Depends},
91 account-plugin-generic-oauth99 account-plugin-generic-oauth,
100 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
92Description: GNOME Control Center account plugin for single signon - sina101Description: GNOME Control Center account plugin for single signon - sina
93 GNOME Control Center account plugins for single signon102 GNOME Control Center account plugins for single signon
94103
@@ -101,12 +110,7 @@
101 gir1.2-signon-1.0,110 gir1.2-signon-1.0,
102 gir1.2-accounts-1.0,111 gir1.2-accounts-1.0,
103 signon-keyring-extension,112 signon-keyring-extension,
104 signon-plugin-oauth2113 signon-plugin-oauth2,
114 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
105Description: GNOME Control Center account plugins for single signon - tools115Description: GNOME Control Center account plugins for single signon - tools
106 GNOME Control Center account plugins for single signon116 GNOME Control Center account plugins for single signon
107
108Package: account-plugin-icons
109Architecture: all
110Depends: ${misc:Depends},
111Description: GNOME Control Center account plugin for single signon - icons
112 GNOME Control Center account plugins for single signon

Subscribers

People subscribed via source and target branches

to all changes: