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
=== modified file 'debian/changelog'
--- debian/changelog 2015-04-17 09:41:20 +0000
+++ debian/changelog 2015-04-17 13:24:42 +0000
@@ -1,3 +1,11 @@
1empathy (3.12.9-1ubuntu2) UNRELEASED; urgency=medium
2
3 * debian/control:
4 - Remove WLM and Facebook plugins from Recommends (LP: #1432613)
5 - Remove WLM and Facebook from package descriptions.
6
7 -- Alberto Mardegan <alberto.mardegan@canonical.com> Fri, 17 Apr 2015 16:22:50 +0300
8
1empathy (3.12.9-1ubuntu1) vivid; urgency=medium9empathy (3.12.9-1ubuntu1) vivid; urgency=medium
210
3 * Merge with Debian, remaining changes:11 * Merge with Debian, remaining changes:
412
=== modified file 'debian/control'
--- debian/control 2015-03-16 17:47:24 +0000
+++ debian/control 2015-04-17 13:24:42 +0000
@@ -84,8 +84,8 @@
84Description: GNOME multi-protocol chat and call client84Description: GNOME multi-protocol chat and call client
85 Instant messaging program supporting text, voice, video, file transfers85 Instant messaging program supporting text, voice, video, file transfers
86 and inter-application communication over many different protocols,86 and inter-application communication over many different protocols,
87 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Yahoo!, Salut,87 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
88 Gadu-Gadu, Groupwise and ICQ.88 Groupwise and ICQ.
89 .89 .
90 This package contains the Empathy IM application and account manager.90 This package contains the Empathy IM application and account manager.
9191
@@ -97,8 +97,8 @@
97Description: GNOME multi-protocol chat and call client (debug symbols)97Description: GNOME multi-protocol chat and call client (debug symbols)
98 Instant messaging program supporting text, voice, video, file transfers98 Instant messaging program supporting text, voice, video, file transfers
99 and inter-application communication over many different protocols,99 and inter-application communication over many different protocols,
100 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Yahoo!, Salut,100 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
101 Gadu-Gadu, Groupwise, ICQ and QQ.101 Groupwise and ICQ.
102 .102 .
103 This package contains debug symbols for the Empathy IM application and103 This package contains debug symbols for the Empathy IM application and
104 account manager.104 account manager.
@@ -113,8 +113,8 @@
113Description: GNOME multi-protocol chat and call client (common files)113Description: GNOME multi-protocol chat and call client (common files)
114 Instant messaging program supporting text, voice, video, file transfers114 Instant messaging program supporting text, voice, video, file transfers
115 and inter-application communication over many different protocols,115 and inter-application communication over many different protocols,
116 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Yahoo!, Salut,116 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
117 Gadu-Gadu, Groupwise and ICQ.117 Groupwise and ICQ.
118 .118 .
119 This package contains the architecture independent files for Empathy119 This package contains the architecture independent files for Empathy
120 IM application.120 IM application.
@@ -127,8 +127,8 @@
127Description: GNOME multi-protocol chat and call client (GOA plugin)127Description: GNOME multi-protocol chat and call client (GOA plugin)
128 Instant messaging program supporting text, voice, video, file transfers128 Instant messaging program supporting text, voice, video, file transfers
129 and inter-application communication over many different protocols,129 and inter-application communication over many different protocols,
130 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,130 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
131 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.131 Groupwise and ICQ.
132 .132 .
133 This package contains GNOME Online Accounts plugin for Mission Control.133 This package contains GNOME Online Accounts plugin for Mission Control.
134134
@@ -143,8 +143,6 @@
143 account-plugin-aim,143 account-plugin-aim,
144 account-plugin-jabber, 144 account-plugin-jabber,
145 account-plugin-google,145 account-plugin-google,
146 account-plugin-facebook,
147 account-plugin-windows-live,
148 account-plugin-yahoo, 146 account-plugin-yahoo,
149 account-plugin-salut 147 account-plugin-salut
150Suggests: account-plugin-gadugadu,148Suggests: account-plugin-gadugadu,
@@ -162,8 +160,8 @@
162Description: GNOME multi-protocol chat and call client (UOA plugin)160Description: GNOME multi-protocol chat and call client (UOA plugin)
163 Instant messaging program supporting text, voice, video, file transfers161 Instant messaging program supporting text, voice, video, file transfers
164 and inter-application communication over many different protocols,162 and inter-application communication over many different protocols,
165 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,163 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
166 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.164 Groupwise and ICQ.
167 .165 .
168 This package contains Ubuntu Online Accounts plugin for Mission Control.166 This package contains Ubuntu Online Accounts plugin for Mission Control.
169167
@@ -180,8 +178,8 @@
180Description: Messaging account plugin for AIM178Description: Messaging account plugin for AIM
181 Instant messaging program supporting text, voice, video, file transfers179 Instant messaging program supporting text, voice, video, file transfers
182 and inter-application communication over many different protocols,180 and inter-application communication over many different protocols,
183 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,181 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
184 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.182 Groupwise and ICQ.
185 .183 .
186 This package contains UOA account plugins for the Empathy IM application.184 This package contains UOA account plugins for the Empathy IM application.
187185
@@ -198,8 +196,8 @@
198Description: Messaging account plugin for GaduGadu196Description: Messaging account plugin for GaduGadu
199 Instant messaging program supporting text, voice, video, file transfers197 Instant messaging program supporting text, voice, video, file transfers
200 and inter-application communication over many different protocols,198 and inter-application communication over many different protocols,
201 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,199 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
202 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.200 Groupwise and ICQ.
203 .201 .
204 This package contains UOA account plugins for the Empathy IM application.202 This package contains UOA account plugins for the Empathy IM application.
205203
@@ -216,8 +214,8 @@
216Description: Messaging account plugin for Groupwise214Description: Messaging account plugin for Groupwise
217 Instant messaging program supporting text, voice, video, file transfers215 Instant messaging program supporting text, voice, video, file transfers
218 and inter-application communication over many different protocols,216 and inter-application communication over many different protocols,
219 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,217 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
220 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.218 Groupwise and ICQ.
221 .219 .
222 This package contains UOA account plugins for the Empathy IM application.220 This package contains UOA account plugins for the Empathy IM application.
223221
@@ -234,8 +232,8 @@
234Description: Messaging account plugin for ICQ232Description: Messaging account plugin for ICQ
235 Instant messaging program supporting text, voice, video, file transfers233 Instant messaging program supporting text, voice, video, file transfers
236 and inter-application communication over many different protocols,234 and inter-application communication over many different protocols,
237 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,235 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
238 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.236 Groupwise and ICQ.
239 .237 .
240 This package contains UOA account plugins for the Empathy IM application.238 This package contains UOA account plugins for the Empathy IM application.
241239
@@ -252,8 +250,8 @@
252Description: Messaging account plugin for IRC250Description: Messaging account plugin for IRC
253 Instant messaging program supporting text, voice, video, file transfers251 Instant messaging program supporting text, voice, video, file transfers
254 and inter-application communication over many different protocols,252 and inter-application communication over many different protocols,
255 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,253 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
256 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.254 Groupwise and ICQ.
257 .255 .
258 This package contains UOA account plugins for the Empathy IM application.256 This package contains UOA account plugins for the Empathy IM application.
259257
@@ -270,8 +268,8 @@
270Description: Messaging account plugin for Jabber/XMPP268Description: Messaging account plugin for Jabber/XMPP
271 Instant messaging program supporting text, voice, video, file transfers269 Instant messaging program supporting text, voice, video, file transfers
272 and inter-application communication over many different protocols,270 and inter-application communication over many different protocols,
273 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,271 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
274 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.272 Groupwise and ICQ.
275 .273 .
276 This package contains UOA account plugins for the Empathy IM application.274 This package contains UOA account plugins for the Empathy IM application.
277275
@@ -288,8 +286,8 @@
288Description: Messaging account plugin for Mxit286Description: Messaging account plugin for Mxit
289 Instant messaging program supporting text, voice, video, file transfers287 Instant messaging program supporting text, voice, video, file transfers
290 and inter-application communication over many different protocols,288 and inter-application communication over many different protocols,
291 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,289 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
292 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.290 Groupwise and ICQ.
293 .291 .
294 This package contains UOA account plugins for the Empathy IM application.292 This package contains UOA account plugins for the Empathy IM application.
295293
@@ -306,8 +304,8 @@
306Description: Messaging account plugin for MySpace304Description: Messaging account plugin for MySpace
307 Instant messaging program supporting text, voice, video, file transfers305 Instant messaging program supporting text, voice, video, file transfers
308 and inter-application communication over many different protocols,306 and inter-application communication over many different protocols,
309 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,307 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
310 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.308 Groupwise and ICQ.
311 .309 .
312 This package contains UOA account plugins for the Empathy IM application.310 This package contains UOA account plugins for the Empathy IM application.
313311
@@ -324,8 +322,8 @@
324Description: Messaging account plugin for Local XMPP (Salut)322Description: Messaging account plugin for Local XMPP (Salut)
325 Instant messaging program supporting text, voice, video, file transfers323 Instant messaging program supporting text, voice, video, file transfers
326 and inter-application communication over many different protocols,324 and inter-application communication over many different protocols,
327 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,325 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
328 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.326 Groupwise and ICQ.
329 .327 .
330 This package contains UOA account plugins for the Empathy IM application.328 This package contains UOA account plugins for the Empathy IM application.
331329
@@ -342,8 +340,8 @@
342Description: Messaging account plugin for Sametime340Description: Messaging account plugin for Sametime
343 Instant messaging program supporting text, voice, video, file transfers341 Instant messaging program supporting text, voice, video, file transfers
344 and inter-application communication over many different protocols,342 and inter-application communication over many different protocols,
345 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,343 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
346 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.344 Groupwise and ICQ.
347 .345 .
348 This package contains UOA account plugins for the Empathy IM application.346 This package contains UOA account plugins for the Empathy IM application.
349347
@@ -360,8 +358,8 @@
360Description: Messaging account plugin for SIP358Description: Messaging account plugin for SIP
361 Instant messaging program supporting text, voice, video, file transfers359 Instant messaging program supporting text, voice, video, file transfers
362 and inter-application communication over many different protocols,360 and inter-application communication over many different protocols,
363 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,361 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
364 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.362 Groupwise and ICQ.
365 .363 .
366 This package contains UOA account plugins for the Empathy IM application.364 This package contains UOA account plugins for the Empathy IM application.
367365
@@ -378,8 +376,8 @@
378Description: Messaging account plugin for Yahoo!376Description: Messaging account plugin for Yahoo!
379 Instant messaging program supporting text, voice, video, file transfers377 Instant messaging program supporting text, voice, video, file transfers
380 and inter-application communication over many different protocols,378 and inter-application communication over many different protocols,
381 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,379 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
382 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.380 Groupwise and ICQ.
383 .381 .
384 This package contains UOA account plugins for the Empathy IM application.382 This package contains UOA account plugins for the Empathy IM application.
385383
@@ -396,8 +394,8 @@
396Description: Messaging account plugin for Yahoo Japan394Description: Messaging account plugin for Yahoo Japan
397 Instant messaging program supporting text, voice, video, file transfers395 Instant messaging program supporting text, voice, video, file transfers
398 and inter-application communication over many different protocols,396 and inter-application communication over many different protocols,
399 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,397 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
400 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.398 Groupwise and ICQ.
401 .399 .
402 This package contains UOA account plugins for the Empathy IM application.400 This package contains UOA account plugins for the Empathy IM application.
403401
@@ -414,7 +412,7 @@
414Description: Messaging account plugin for Zephyr412Description: Messaging account plugin for Zephyr
415 Instant messaging program supporting text, voice, video, file transfers413 Instant messaging program supporting text, voice, video, file transfers
416 and inter-application communication over many different protocols,414 and inter-application communication over many different protocols,
417 including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook,415 including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu,
418 Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ.416 Groupwise and ICQ.
419 .417 .
420 This package contains UOA account plugins for the Empathy IM application.418 This package contains UOA account plugins for the Empathy IM application.

Subscribers

People subscribed via source and target branches

to all changes: