Merge lp:~mardy/empathy/lp1432613 into lp:~ubuntu-desktop/empathy/ubuntu

Proposed by Alberto Mardegan on 2015-04-17
Status: Merged
Merged at revision: 375
Proposed branch: lp:~mardy/empathy/lp1432613
Merge into: lp:~ubuntu-desktop/empathy/ubuntu
Diff against target: 236 lines (+46/-40)
2 files modified
debian/changelog (+8/-0)
debian/control (+38/-40)
To merge this branch: bzr merge lp:~mardy/empathy/lp1432613
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2015-04-17 Pending
Review via email: mp+256651@code.launchpad.net

Commit message

Remove WLM and Fabook plugins from Recommends

Also, update the package descriptions.

Description of the change

Remove WLM and Fabook plugins from Recommends

Also, update the package descriptions.

To post a comment you must log in.
lp:~mardy/empathy/lp1432613 updated on 2015-04-17
376. By Alberto Mardegan on 2015-04-17

* debian/control:

  - Remove WLM and Facebook plugins from Recommends (LP: #1432613)
  - Remove WLM and Facebook from package descriptions.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-04-17 09:41:20 +0000
3+++ debian/changelog 2015-04-17 13:24:42 +0000
4@@ -1,3 +1,11 @@
5+empathy (3.12.9-1ubuntu2) UNRELEASED; urgency=medium
6+
7+ * debian/control:
8+ - Remove WLM and Facebook plugins from Recommends (LP: #1432613)
9+ - Remove WLM and Facebook from package descriptions.
10+
11+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Fri, 17 Apr 2015 16:22:50 +0300
12+
13 empathy (3.12.9-1ubuntu1) vivid; urgency=medium
14
15 * Merge with Debian, remaining changes:
16
17=== modified file 'debian/control'
18--- debian/control 2015-03-16 17:47:24 +0000
19+++ debian/control 2015-04-17 13:24:42 +0000
20@@ -84,8 +84,8 @@
21 Description: GNOME multi-protocol chat and call client
22 Instant messaging program supporting text, voice, video, file transfers
23 and inter-application communication over many different protocols,
24- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Yahoo!, Salut,
25- Gadu-Gadu, Groupwise and ICQ.
26+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
27+ Groupwise and ICQ.
28 .
29 This package contains the Empathy IM application and account manager.
30
31@@ -97,8 +97,8 @@
32 Description: GNOME multi-protocol chat and call client (debug symbols)
33 Instant messaging program supporting text, voice, video, file transfers
34 and inter-application communication over many different protocols,
35- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Yahoo!, Salut,
36- Gadu-Gadu, Groupwise, ICQ and QQ.
37+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
38+ Groupwise and ICQ.
39 .
40 This package contains debug symbols for the Empathy IM application and
41 account manager.
42@@ -113,8 +113,8 @@
43 Description: GNOME multi-protocol chat and call client (common files)
44 Instant messaging program supporting text, voice, video, file transfers
45 and inter-application communication over many different protocols,
46- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Yahoo!, Salut,
47- Gadu-Gadu, Groupwise and ICQ.
48+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
49+ Groupwise and ICQ.
50 .
51 This package contains the architecture independent files for Empathy
52 IM application.
53@@ -127,8 +127,8 @@
54 Description: GNOME multi-protocol chat and call client (GOA plugin)
55 Instant messaging program supporting text, voice, video, file transfers
56 and inter-application communication over many different protocols,
57- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
58- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
59+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
60+ Groupwise and ICQ.
61 .
62 This package contains GNOME Online Accounts plugin for Mission Control.
63
64@@ -143,8 +143,6 @@
65 account-plugin-aim,
66 account-plugin-jabber,
67 account-plugin-google,
68- account-plugin-facebook,
69- account-plugin-windows-live,
70 account-plugin-yahoo,
71 account-plugin-salut
72 Suggests: account-plugin-gadugadu,
73@@ -162,8 +160,8 @@
74 Description: GNOME multi-protocol chat and call client (UOA plugin)
75 Instant messaging program supporting text, voice, video, file transfers
76 and inter-application communication over many different protocols,
77- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
78- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
79+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
80+ Groupwise and ICQ.
81 .
82 This package contains Ubuntu Online Accounts plugin for Mission Control.
83
84@@ -180,8 +178,8 @@
85 Description: Messaging account plugin for AIM
86 Instant messaging program supporting text, voice, video, file transfers
87 and inter-application communication over many different protocols,
88- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
89- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
90+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
91+ Groupwise and ICQ.
92 .
93 This package contains UOA account plugins for the Empathy IM application.
94
95@@ -198,8 +196,8 @@
96 Description: Messaging account plugin for GaduGadu
97 Instant messaging program supporting text, voice, video, file transfers
98 and inter-application communication over many different protocols,
99- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
100- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
101+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
102+ Groupwise and ICQ.
103 .
104 This package contains UOA account plugins for the Empathy IM application.
105
106@@ -216,8 +214,8 @@
107 Description: Messaging account plugin for Groupwise
108 Instant messaging program supporting text, voice, video, file transfers
109 and inter-application communication over many different protocols,
110- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
111- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
112+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
113+ Groupwise and ICQ.
114 .
115 This package contains UOA account plugins for the Empathy IM application.
116
117@@ -234,8 +232,8 @@
118 Description: Messaging account plugin for ICQ
119 Instant messaging program supporting text, voice, video, file transfers
120 and inter-application communication over many different protocols,
121- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
122- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
123+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
124+ Groupwise and ICQ.
125 .
126 This package contains UOA account plugins for the Empathy IM application.
127
128@@ -252,8 +250,8 @@
129 Description: Messaging account plugin for IRC
130 Instant messaging program supporting text, voice, video, file transfers
131 and inter-application communication over many different protocols,
132- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
133- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
134+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
135+ Groupwise and ICQ.
136 .
137 This package contains UOA account plugins for the Empathy IM application.
138
139@@ -270,8 +268,8 @@
140 Description: Messaging account plugin for Jabber/XMPP
141 Instant messaging program supporting text, voice, video, file transfers
142 and inter-application communication over many different protocols,
143- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
144- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
145+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
146+ Groupwise and ICQ.
147 .
148 This package contains UOA account plugins for the Empathy IM application.
149
150@@ -288,8 +286,8 @@
151 Description: Messaging account plugin for Mxit
152 Instant messaging program supporting text, voice, video, file transfers
153 and inter-application communication over many different protocols,
154- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
155- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
156+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
157+ Groupwise and ICQ.
158 .
159 This package contains UOA account plugins for the Empathy IM application.
160
161@@ -306,8 +304,8 @@
162 Description: Messaging account plugin for MySpace
163 Instant messaging program supporting text, voice, video, file transfers
164 and inter-application communication over many different protocols,
165- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
166- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
167+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
168+ Groupwise and ICQ.
169 .
170 This package contains UOA account plugins for the Empathy IM application.
171
172@@ -324,8 +322,8 @@
173 Description: Messaging account plugin for Local XMPP (Salut)
174 Instant messaging program supporting text, voice, video, file transfers
175 and inter-application communication over many different protocols,
176- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
177- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
178+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
179+ Groupwise and ICQ.
180 .
181 This package contains UOA account plugins for the Empathy IM application.
182
183@@ -342,8 +340,8 @@
184 Description: Messaging account plugin for Sametime
185 Instant messaging program supporting text, voice, video, file transfers
186 and inter-application communication over many different protocols,
187- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
188- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
189+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
190+ Groupwise and ICQ.
191 .
192 This package contains UOA account plugins for the Empathy IM application.
193
194@@ -360,8 +358,8 @@
195 Description: Messaging account plugin for SIP
196 Instant messaging program supporting text, voice, video, file transfers
197 and inter-application communication over many different protocols,
198- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
199- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
200+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
201+ Groupwise and ICQ.
202 .
203 This package contains UOA account plugins for the Empathy IM application.
204
205@@ -378,8 +376,8 @@
206 Description: Messaging account plugin for Yahoo!
207 Instant messaging program supporting text, voice, video, file transfers
208 and inter-application communication over many different protocols,
209- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
210- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
211+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
212+ Groupwise and ICQ.
213 .
214 This package contains UOA account plugins for the Empathy IM application.
215
216@@ -396,8 +394,8 @@
217 Description: Messaging account plugin for Yahoo Japan
218 Instant messaging program supporting text, voice, video, file transfers
219 and inter-application communication over many different protocols,
220- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
221- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
222+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
223+ Groupwise and ICQ.
224 .
225 This package contains UOA account plugins for the Empathy IM application.
226
227@@ -414,7 +412,7 @@
228 Description: Messaging account plugin for Zephyr
229 Instant messaging program supporting text, voice, video, file transfers
230 and inter-application communication over many different protocols,
231- including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,
232- Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.
233+ including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
234+ Groupwise and ICQ.
235 .
236 This package contains UOA account plugins for the Empathy IM application.

Subscribers

People subscribed via source and target branches

to all changes: