Online Accounts: Account plugins

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

  1. lp1323820
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
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
David Barth (community) Approve
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.
Revision history for this message
David Barth (dbarth) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/31/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2014-03-31 08:21:46 +0000
+++ Makefile.am 2014-09-10 07:58:23 +0000
@@ -80,7 +80,6 @@
80 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@80 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
8181
82services_in_files = \82services_in_files = \
83 data/services/facebook-contacts.service.in \
84 data/services/facebook-im.service.in \83 data/services/facebook-im.service.in \
85 data/services/facebook-microblog.service.in \84 data/services/facebook-microblog.service.in \
86 data/services/facebook-sharing.service.in \85 data/services/facebook-sharing.service.in \
8786
=== removed file 'data/services/facebook-contacts.service.in'
--- data/services/facebook-contacts.service.in 2013-06-27 14:17:22 +0000
+++ data/services/facebook-contacts.service.in 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="facebook-contacts">
3 <type>contacts</type>
4 <name>Facebook</name>
5 <icon>facebook</icon>
6 <provider>facebook</provider>
7 <translations>account-plugins</translations>
8</service>
90
=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install 2013-06-27 14:17:22 +0000
+++ debian/account-plugin-facebook.install 2014-09-10 07:58:23 +0000
@@ -1,6 +1,5 @@
1etc/signon-ui/webkit-options.d/www.facebook.com.conf1etc/signon-ui/webkit-options.d/www.facebook.com.conf
2usr/share/accounts/services/facebook-sharing.service2usr/share/accounts/services/facebook-sharing.service
3usr/share/accounts/services/facebook-contacts.service
4usr/share/accounts/services/facebook-microblog.service3usr/share/accounts/services/facebook-microblog.service
5usr/share/accounts/services/facebook-im.service4usr/share/accounts/services/facebook-im.service
6usr/share/accounts/providers/facebook.provider5usr/share/accounts/providers/facebook.provider

Subscribers

People subscribed via source and target branches