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

[Alberto Mardegan]

Remove non-working services

Remove non-working services

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-vivid-i386-ci/4

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

review: Approve (continuous-integration)

[lp:~mardy/account-plugins/lp1432613]

149. By Alberto Mardegan on 2015-04-17

Force removal of windows live plugin

=== modified file 'Makefile.am'
--- Makefile.am	2014-09-10 07:47:30 +0000
+++ Makefile.am	2015-04-17 09:59:46 +0000
@@ -80,7 +80,6 @@
 	$(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
 
 services_in_files = \
-	data/services/facebook-im.service.in \
 	data/services/facebook-microblog.service.in \
 	data/services/facebook-sharing.service.in \
 	data/services/flickr-microblog.service.in \
@@ -94,8 +93,7 @@
 	data/services/picasa.service.in \
 	data/services/sina-microblog.service.in \
 	data/services/sohu-microblog.service.in \
-	data/services/twitter-microblog.service.in \
-	data/services/wlm.service.in
+	data/services/twitter-microblog.service.in
 
 services_DATA = \
 	$(services_in_files:.service.in=.service)

=== removed file 'data/services/facebook-im.service.in'
--- data/services/facebook-im.service.in	2012-10-04 14:18:34 +0000
+++ data/services/facebook-im.service.in	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<service id="facebook-im">
-  <type>IM</type>
-  <name>Facebook</name>
-  <icon>facebook</icon>
-  <provider>facebook</provider>
-  <translations>account-plugins</translations>
-
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="telepathy">
-      <setting name="mc-readonly-params" type="b">true</setting>
-      <setting name="manager">gabble</setting>
-      <setting name="protocol">jabber</setting>
-
-      <setting name="param-account">chat.facebook.com</setting>
-      <setting name="param-server">chat.facebook.com</setting>
-      <setting name="param-fallback-servers">chat.facebook.com:443</setting>
-    </group>
-  </template>
-
-</service>

=== removed file 'data/services/wlm.service.in'
--- data/services/wlm.service.in	2012-10-04 14:18:34 +0000
+++ data/services/wlm.service.in	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<service id="wlm">
-  <type>IM</type>
-  <name>Windows Live Messenger</name>
-  <icon>msn</icon>
-  <provider>windows-live</provider>
-  <translations>account-plugins</translations>
-
-  <!-- default settings (account settings have precedence over these) -->
-  <template>
-    <group name="telepathy">
-      <setting name="mc-readonly-params" type="b">true</setting>
-      <setting name="manager">gabble</setting>
-      <setting name="protocol">jabber</setting>
-
-      <setting name="param-account">messenger.live.com</setting>
-      <setting name="param-fallback-servers">xmpp.messenger.live.com</setting>
-      <setting name="param-extra-certificate-identities">*.gateway.messenger.live.com</setting>
-    </group>
-  </template>
-
-</service>

=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install	2014-09-10 07:47:30 +0000
+++ debian/account-plugin-facebook.install	2015-04-17 09:59:46 +0000
@@ -1,6 +1,5 @@
 etc/signon-ui/webkit-options.d/www.facebook.com.conf
 usr/share/accounts/services/facebook-sharing.service
 usr/share/accounts/services/facebook-microblog.service
-usr/share/accounts/services/facebook-im.service
 usr/share/accounts/providers/facebook.provider
 usr/share/accounts/qml-plugins/facebook/Main.qml

=== modified file 'debian/account-plugin-windows-live.install'
--- debian/account-plugin-windows-live.install	2013-03-19 14:47:46 +0000
+++ debian/account-plugin-windows-live.install	2015-04-17 09:59:46 +0000
@@ -1,3 +1,2 @@
 etc/signon-ui/webkit-options.d/login.live.com.conf
-usr/share/accounts/services/wlm.service
 usr/share/accounts/providers/windows-live.provider

=== modified file 'debian/control'
--- debian/control	2014-03-25 13:30:39 +0000
+++ debian/control	2015-04-17 09:59:46 +0000
@@ -26,7 +26,8 @@
          signon-plugin-oauth2,
 Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
 Breaks: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
-Conflicts: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
+Conflicts: account-plugin-generic-oauth (<< 0.10bzr13.04.30),
+           account-plugin-windows-live,
 Description: GNOME Control Center account plugin for single signon - generic OAuth
  GNOME Control Center account plugins for single signon