Empathy

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

  1. lp1432613-trusty
  2. Merge into ubuntutrusty
Proposed by Alberto Mardegan
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 Pending
Ubuntu Desktop 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
367. By Alberto Mardegan

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

Subscribers

People subscribed via source and target branches