Merge lp:~mardy/account-plugins/lp1323820 into lp:account-plugins

Proposed by Alberto Mardegan on 2014-09-10
Status: Merged
Approved by: David Barth on 2014-09-11
Approved revision: 139
Merged at revision: 139
Proposed branch: lp:~mardy/account-plugins/lp1323820
Merge into: lp:account-plugins
Diff against target: 35 lines (+0/-10)
3 files modified
Makefile.am (+0/-1)
data/services/facebook-contacts.service.in (+0/-8)
debian/account-plugin-facebook.install (+0/-1)
To merge this branch: bzr merge lp:~mardy/account-plugins/lp1323820
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-09-10
David Barth (community) 2014-09-10 Approve on 2014-09-10
Review via email: mp+234061@code.launchpad.net

Commit message

Remove unused facebook contacts service

Description of the change

Remove unused facebook contacts service

To post a comment you must log in.

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 2014-03-31 08:21:46 +0000
3+++ Makefile.am 2014-09-10 07:58:23 +0000
4@@ -80,7 +80,6 @@
5 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
6
7 services_in_files = \
8- data/services/facebook-contacts.service.in \
9 data/services/facebook-im.service.in \
10 data/services/facebook-microblog.service.in \
11 data/services/facebook-sharing.service.in \
12
13=== removed file 'data/services/facebook-contacts.service.in'
14--- data/services/facebook-contacts.service.in 2013-06-27 14:17:22 +0000
15+++ data/services/facebook-contacts.service.in 1970-01-01 00:00:00 +0000
16@@ -1,8 +0,0 @@
17-<?xml version="1.0" encoding="UTF-8" ?>
18-<service id="facebook-contacts">
19- <type>contacts</type>
20- <name>Facebook</name>
21- <icon>facebook</icon>
22- <provider>facebook</provider>
23- <translations>account-plugins</translations>
24-</service>
25
26=== modified file 'debian/account-plugin-facebook.install'
27--- debian/account-plugin-facebook.install 2013-06-27 14:17:22 +0000
28+++ debian/account-plugin-facebook.install 2014-09-10 07:58:23 +0000
29@@ -1,6 +1,5 @@
30 etc/signon-ui/webkit-options.d/www.facebook.com.conf
31 usr/share/accounts/services/facebook-sharing.service
32-usr/share/accounts/services/facebook-contacts.service
33 usr/share/accounts/services/facebook-microblog.service
34 usr/share/accounts/services/facebook-im.service
35 usr/share/accounts/providers/facebook.provider

Subscribers

People subscribed via source and target branches

to all changes: