Merge lp:~renatofilho/empathy/split-mcp-plugins into lp:~ubuntu-desktop/empathy/ubuntu

[Renato Araujo Oliveira Filho]

Split mcp-account-manager-uoa in two packages.

To be used by external apps.

[Ken VanDine (ken-vandine)]

I don't think empathy will be landed with bileto, so we need a debian/changelog entry for this.

review: Needs Fixing

[lp:~renatofilho/empathy/split-mcp-plugins]

387. By Renato Araujo Oliveira Filho on 2017-01-09

update changelog.

Unmerged revisions

387. By Renato Araujo Oliveira Filho on 2017-01-09

update changelog.

386. By Renato Araujo Oliveira Filho on 2017-01-09

Split mcp-account-manager-uoa in two packages.

To be used by external apps.

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-29 14:23:36 +0000
+++ debian/changelog	2017-01-09 18:29:24 +0000
@@ -1,3 +1,9 @@
+empathy (3.12.12-3ubuntu2) UNRELEASED; urgency=medium
+
+  * Split mcp-account-manager-uoa in two packages.
+
+ -- Renato Araujo Oliveira Filho <[e-mail]>  Mon, 09 Jan 2017 15:22:20 -0300
+
 empathy (3.12.12-3ubuntu1) yakkety; urgency=medium
 
   * Merge with Debian. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2016-09-29 14:23:30 +0000
+++ debian/control	2017-01-09 18:29:24 +0000
@@ -114,13 +114,26 @@
  .
  This package contains GNOME Online Accounts plugin for Mission Control.
 
+Package: mcp-account-manager-uoa-common
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         telepathy-mission-control-5 (>= 1:5.13.0-0ubuntu3)
+Description: GNOME multi-protocol chat and call client (GOA plugin)
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
+ Groupwise and ICQ.
+ .
+ This package contains Ubuntu Online Accounts plugin for Mission Control.
+
 Package: mcp-account-manager-uoa
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         mcp-account-manager-uoa-common (= ${binary:Version}),
          empathy (= ${binary:Version}),
-         signon-plugin-password,
-         telepathy-mission-control-5 (>= 1:5.13.0-0ubuntu3)
+         signon-plugin-password
 Recommends: ubuntu-control-center-signon,
             account-plugin-aim,
             account-plugin-jabber, 
@@ -145,7 +158,7 @@
  including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
  Groupwise and ICQ.
  .
- This package contains Ubuntu Online Accounts plugin for Mission Control.
+ This package contains Ubuntu Online Accounts plugin.
 
 Package: account-plugin-aim
 Architecture: any

=== added file 'debian/mcp-account-manager-uoa-common.install'
--- debian/mcp-account-manager-uoa-common.install	1970-01-01 00:00:00 +0000
+++ debian/mcp-account-manager-uoa-common.install	2017-01-09 18:29:24 +0000
@@ -0,0 +1,1 @@
+usr/lib/mission-control-plugins.0/mcp-account-manager-uoa.*

=== modified file 'debian/mcp-account-manager-uoa.install'
--- debian/mcp-account-manager-uoa.install	2013-05-31 10:25:14 +0000
+++ debian/mcp-account-manager-uoa.install	2017-01-09 18:29:24 +0000
@@ -1,4 +1,3 @@
-usr/lib/mission-control-plugins.0/mcp-account-manager-uoa.*
 usr/lib/libaccount-plugin-1.0/applications
 usr/lib/libaccount-plugin-1.0/providers/libempathy-accounts-plugin.so
 usr/share/accounts/applications