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

Proposed by Alberto Mardegan on 2015-04-28
Status: Merged
Merged at revision: 367
Proposed branch: lp:~mardy/empathy/lp1432613-trusty
Merge into: lp:~ubuntu-desktop/empathy/ubuntutrusty
Diff against target: 240 lines (+45/-41)
2 files modified
debian/changelog (+7/-1)
debian/control (+38/-40)
To merge this branch: bzr merge lp:~mardy/empathy/lp1432613-trusty
Reviewer Review Type Date Requested Status
Iain Lane 2015-04-28 Pending
Ubuntu Desktop 2015-04-28 Pending
Review via email: mp+257667@code.launchpad.net

Commit message

Remove WLM and Facebook plugins from Recommends

Also, remove WLM and Facebook from package descriptions.

Description of the change

Remove WLM and Facebook plugins from Recommends

Also, remove WLM and Facebook from package descriptions.

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

Update changelog

[ Alberto Mardegan ]
[ Iain Lane ]
Update Vcs-Bzr for trusty

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-04-28 16:10:51 +0000
+++ debian/changelog 2015-04-28 16:41:08 +0000
@@ -1,8 +1,14 @@
1empathy (3.8.6-0ubuntu9.2) UNRELEASED; urgency=medium1empathy (3.8.6-0ubuntu9.2) UNRELEASED; urgency=medium
22
3 [ Alberto Mardegan ]
4 * debian/control:
5 - Remove WLM and Facebook plugins from Recommends (LP: #1432613)
6 - Remove WLM and Facebook from package descriptions.
7
8 [ Iain Lane ]
3 * Update Vcs-Bzr for trusty9 * Update Vcs-Bzr for trusty
410
5 -- Iain Lane <iain@orangesquash.org.uk> Tue, 28 Apr 2015 17:10:35 +010011 -- Alberto Mardegan <alberto.mardegan@canonical.com> Tue, 28 Apr 2015 11:19:43 -0500
612
7empathy (3.8.6-0ubuntu9.1) trusty; urgency=medium13empathy (3.8.6-0ubuntu9.1) trusty; urgency=medium
814
915
=== modified file 'debian/control'
--- debian/control 2015-04-28 16:10:51 +0000
+++ debian/control 2015-04-28 16:41:08 +0000
@@ -86,8 +86,8 @@
86Description: GNOME multi-protocol chat and call client86Description: GNOME multi-protocol chat and call client
87 Instant messaging program supporting text, voice, video, file transfers87 Instant messaging program supporting text, voice, video, file transfers
88 and inter-application communication over many different protocols,88 and inter-application communication over many different protocols,
89 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,89 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
90 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.90 Groupwise and ICQ.
91 .91 .
92 This package contains the Empathy IM application and account manager.92 This package contains the Empathy IM application and account manager.
9393
@@ -99,8 +99,8 @@
99Description: GNOME multi-protocol chat and call client (debug symbols)99Description: GNOME multi-protocol chat and call client (debug symbols)
100 Instant messaging program supporting text, voice, video, file transfers100 Instant messaging program supporting text, voice, video, file transfers
101 and inter-application communication over many different protocols,101 and inter-application communication over many different protocols,
102 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,102 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
103 Yahoo!, Salut, Gadu-Gadu, Groupwise, ICQ and QQ.103 Groupwise and ICQ.
104 .104 .
105 This package contains debug symbols for the Empathy IM application and105 This package contains debug symbols for the Empathy IM application and
106 account manager.106 account manager.
@@ -115,8 +115,8 @@
115Description: GNOME multi-protocol chat and call client (common files)115Description: GNOME multi-protocol chat and call client (common files)
116 Instant messaging program supporting text, voice, video, file transfers116 Instant messaging program supporting text, voice, video, file transfers
117 and inter-application communication over many different protocols,117 and inter-application communication over many different protocols,
118 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,118 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
119 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.119 Groupwise and ICQ.
120 .120 .
121 This package contains the architecture independent files for Empathy121 This package contains the architecture independent files for Empathy
122 IM application.122 IM application.
@@ -147,8 +147,8 @@
147Description: GNOME multi-protocol chat and call client (GOA plugin)147Description: GNOME multi-protocol chat and call client (GOA plugin)
148 Instant messaging program supporting text, voice, video, file transfers148 Instant messaging program supporting text, voice, video, file transfers
149 and inter-application communication over many different protocols,149 and inter-application communication over many different protocols,
150 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,150 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
151 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.151 Groupwise and ICQ.
152 .152 .
153 This package contains GNOME Online Accounts plugin for Mission Control.153 This package contains GNOME Online Accounts plugin for Mission Control.
154154
@@ -163,8 +163,6 @@
163 account-plugin-aim,163 account-plugin-aim,
164 account-plugin-jabber, 164 account-plugin-jabber,
165 account-plugin-google,165 account-plugin-google,
166 account-plugin-facebook,
167 account-plugin-windows-live,
168 account-plugin-yahoo, 166 account-plugin-yahoo,
169 account-plugin-salut 167 account-plugin-salut
170Suggests: account-plugin-gadugadu,168Suggests: account-plugin-gadugadu,
@@ -182,8 +180,8 @@
182Description: GNOME multi-protocol chat and call client (UOA plugin)180Description: GNOME multi-protocol chat and call client (UOA plugin)
183 Instant messaging program supporting text, voice, video, file transfers181 Instant messaging program supporting text, voice, video, file transfers
184 and inter-application communication over many different protocols,182 and inter-application communication over many different protocols,
185 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,183 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
186 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.184 Groupwise and ICQ.
187 .185 .
188 This package contains Ubuntu Online Accounts plugin for Mission Control.186 This package contains Ubuntu Online Accounts plugin for Mission Control.
189187
@@ -200,8 +198,8 @@
200Description: Messaging account plugin for AIM198Description: Messaging account plugin for AIM
201 Instant messaging program supporting text, voice, video, file transfers199 Instant messaging program supporting text, voice, video, file transfers
202 and inter-application communication over many different protocols,200 and inter-application communication over many different protocols,
203 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,201 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
204 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.202 Groupwise and ICQ.
205 .203 .
206 This package contains UOA account plugins for the Empathy IM application.204 This package contains UOA account plugins for the Empathy IM application.
207205
@@ -218,8 +216,8 @@
218Description: Messaging account plugin for GaduGadu216Description: Messaging account plugin for GaduGadu
219 Instant messaging program supporting text, voice, video, file transfers217 Instant messaging program supporting text, voice, video, file transfers
220 and inter-application communication over many different protocols,218 and inter-application communication over many different protocols,
221 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,219 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
222 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.220 Groupwise and ICQ.
223 .221 .
224 This package contains UOA account plugins for the Empathy IM application.222 This package contains UOA account plugins for the Empathy IM application.
225223
@@ -236,8 +234,8 @@
236Description: Messaging account plugin for Groupwise234Description: Messaging account plugin for Groupwise
237 Instant messaging program supporting text, voice, video, file transfers235 Instant messaging program supporting text, voice, video, file transfers
238 and inter-application communication over many different protocols,236 and inter-application communication over many different protocols,
239 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,237 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
240 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.238 Groupwise and ICQ.
241 .239 .
242 This package contains UOA account plugins for the Empathy IM application.240 This package contains UOA account plugins for the Empathy IM application.
243241
@@ -254,8 +252,8 @@
254Description: Messaging account plugin for ICQ252Description: Messaging account plugin for ICQ
255 Instant messaging program supporting text, voice, video, file transfers253 Instant messaging program supporting text, voice, video, file transfers
256 and inter-application communication over many different protocols,254 and inter-application communication over many different protocols,
257 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,255 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
258 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.256 Groupwise and ICQ.
259 .257 .
260 This package contains UOA account plugins for the Empathy IM application.258 This package contains UOA account plugins for the Empathy IM application.
261259
@@ -272,8 +270,8 @@
272Description: Messaging account plugin for IRC270Description: Messaging account plugin for IRC
273 Instant messaging program supporting text, voice, video, file transfers271 Instant messaging program supporting text, voice, video, file transfers
274 and inter-application communication over many different protocols,272 and inter-application communication over many different protocols,
275 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,273 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
276 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.274 Groupwise and ICQ.
277 .275 .
278 This package contains UOA account plugins for the Empathy IM application.276 This package contains UOA account plugins for the Empathy IM application.
279277
@@ -290,8 +288,8 @@
290Description: Messaging account plugin for Jabber/XMPP288Description: Messaging account plugin for Jabber/XMPP
291 Instant messaging program supporting text, voice, video, file transfers289 Instant messaging program supporting text, voice, video, file transfers
292 and inter-application communication over many different protocols,290 and inter-application communication over many different protocols,
293 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,291 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
294 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.292 Groupwise and ICQ.
295 .293 .
296 This package contains UOA account plugins for the Empathy IM application.294 This package contains UOA account plugins for the Empathy IM application.
297295
@@ -308,8 +306,8 @@
308Description: Messaging account plugin for Mxit306Description: Messaging account plugin for Mxit
309 Instant messaging program supporting text, voice, video, file transfers307 Instant messaging program supporting text, voice, video, file transfers
310 and inter-application communication over many different protocols,308 and inter-application communication over many different protocols,
311 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,309 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
312 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.310 Groupwise and ICQ.
313 .311 .
314 This package contains UOA account plugins for the Empathy IM application.312 This package contains UOA account plugins for the Empathy IM application.
315313
@@ -326,8 +324,8 @@
326Description: Messaging account plugin for MySpace324Description: Messaging account plugin for MySpace
327 Instant messaging program supporting text, voice, video, file transfers325 Instant messaging program supporting text, voice, video, file transfers
328 and inter-application communication over many different protocols,326 and inter-application communication over many different protocols,
329 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,327 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
330 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.328 Groupwise and ICQ.
331 .329 .
332 This package contains UOA account plugins for the Empathy IM application.330 This package contains UOA account plugins for the Empathy IM application.
333331
@@ -344,8 +342,8 @@
344Description: Messaging account plugin for Local XMPP (Salut)342Description: Messaging account plugin for Local XMPP (Salut)
345 Instant messaging program supporting text, voice, video, file transfers343 Instant messaging program supporting text, voice, video, file transfers
346 and inter-application communication over many different protocols,344 and inter-application communication over many different protocols,
347 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,345 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
348 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.346 Groupwise and ICQ.
349 .347 .
350 This package contains UOA account plugins for the Empathy IM application.348 This package contains UOA account plugins for the Empathy IM application.
351349
@@ -362,8 +360,8 @@
362Description: Messaging account plugin for Sametime360Description: Messaging account plugin for Sametime
363 Instant messaging program supporting text, voice, video, file transfers361 Instant messaging program supporting text, voice, video, file transfers
364 and inter-application communication over many different protocols,362 and inter-application communication over many different protocols,
365 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,363 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
366 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.364 Groupwise and ICQ.
367 .365 .
368 This package contains UOA account plugins for the Empathy IM application.366 This package contains UOA account plugins for the Empathy IM application.
369367
@@ -380,8 +378,8 @@
380Description: Messaging account plugin for SIP378Description: Messaging account plugin for SIP
381 Instant messaging program supporting text, voice, video, file transfers379 Instant messaging program supporting text, voice, video, file transfers
382 and inter-application communication over many different protocols,380 and inter-application communication over many different protocols,
383 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,381 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
384 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.382 Groupwise and ICQ.
385 .383 .
386 This package contains UOA account plugins for the Empathy IM application.384 This package contains UOA account plugins for the Empathy IM application.
387385
@@ -398,8 +396,8 @@
398Description: Messaging account plugin for Yahoo!396Description: Messaging account plugin for Yahoo!
399 Instant messaging program supporting text, voice, video, file transfers397 Instant messaging program supporting text, voice, video, file transfers
400 and inter-application communication over many different protocols,398 and inter-application communication over many different protocols,
401 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,399 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
402 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.400 Groupwise and ICQ.
403 .401 .
404 This package contains UOA account plugins for the Empathy IM application.402 This package contains UOA account plugins for the Empathy IM application.
405403
@@ -416,8 +414,8 @@
416Description: Messaging account plugin for Yahoo Japan414Description: Messaging account plugin for Yahoo Japan
417 Instant messaging program supporting text, voice, video, file transfers415 Instant messaging program supporting text, voice, video, file transfers
418 and inter-application communication over many different protocols,416 and inter-application communication over many different protocols,
419 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,417 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
420 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.418 Groupwise and ICQ.
421 .419 .
422 This package contains UOA account plugins for the Empathy IM application.420 This package contains UOA account plugins for the Empathy IM application.
423421
@@ -434,7 +432,7 @@
434Description: Messaging account plugin for Zephyr432Description: Messaging account plugin for Zephyr
435 Instant messaging program supporting text, voice, video, file transfers433 Instant messaging program supporting text, voice, video, file transfers
436 and inter-application communication over many different protocols,434 and inter-application communication over many different protocols,
437 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,435 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
438 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.436 Groupwise and ICQ.
439 .437 .
440 This package contains UOA account plugins for the Empathy IM application.438 This package contains UOA account plugins for the Empathy IM application.

Subscribers

People subscribed via source and target branches