Merge lp:~mardy/empathy/lp1432613-trusty into lp:~ubuntu-desktop/empathy/ubuntutrusty
- lp1432613-trusty
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Iain Lane | Pending | ||
| Ubuntu Desktop | Pending | ||
|
Review via email:
|
|||
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.
- 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 | 1 | empathy (3.8.6-0ubuntu9.2) UNRELEASED; urgency=medium | 1 | empathy (3.8.6-0ubuntu9.2) UNRELEASED; urgency=medium |
| 6 | 2 | 2 | ||
| 7 | 3 | [ Alberto Mardegan ] | ||
| 8 | 4 | * debian/control: | ||
| 9 | 5 | - Remove WLM and Facebook plugins from Recommends (LP: #1432613) | ||
| 10 | 6 | - Remove WLM and Facebook from package descriptions. | ||
| 11 | 7 | |||
| 12 | 8 | [ Iain Lane ] | ||
| 13 | 3 | * Update Vcs-Bzr for trusty | 9 | * Update Vcs-Bzr for trusty |
| 14 | 4 | 10 | ||
| 16 | 5 | -- Iain Lane <iain@orangesquash.org.uk> Tue, 28 Apr 2015 17:10:35 +0100 | 11 | -- Alberto Mardegan <alberto.mardegan@canonical.com> Tue, 28 Apr 2015 11:19:43 -0500 |
| 17 | 6 | 12 | ||
| 18 | 7 | empathy (3.8.6-0ubuntu9.1) trusty; urgency=medium | 13 | empathy (3.8.6-0ubuntu9.1) trusty; urgency=medium |
| 19 | 8 | 14 | ||
| 20 | 9 | 15 | ||
| 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 | 86 | Description: GNOME multi-protocol chat and call client | 86 | Description: GNOME multi-protocol chat and call client |
| 26 | 87 | Instant messaging program supporting text, voice, video, file transfers | 87 | Instant messaging program supporting text, voice, video, file transfers |
| 27 | 88 | and inter-application communication over many different protocols, | 88 | and inter-application communication over many different protocols, |
| 30 | 89 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 89 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 31 | 90 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 90 | Groupwise and ICQ. |
| 32 | 91 | . | 91 | . |
| 33 | 92 | This package contains the Empathy IM application and account manager. | 92 | This package contains the Empathy IM application and account manager. |
| 34 | 93 | 93 | ||
| 35 | @@ -99,8 +99,8 @@ | |||
| 36 | 99 | Description: GNOME multi-protocol chat and call client (debug symbols) | 99 | Description: GNOME multi-protocol chat and call client (debug symbols) |
| 37 | 100 | Instant messaging program supporting text, voice, video, file transfers | 100 | Instant messaging program supporting text, voice, video, file transfers |
| 38 | 101 | and inter-application communication over many different protocols, | 101 | and inter-application communication over many different protocols, |
| 41 | 102 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 102 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 42 | 103 | Yahoo!, Salut, Gadu-Gadu, Groupwise, ICQ and QQ. | 103 | Groupwise and ICQ. |
| 43 | 104 | . | 104 | . |
| 44 | 105 | This package contains debug symbols for the Empathy IM application and | 105 | This package contains debug symbols for the Empathy IM application and |
| 45 | 106 | account manager. | 106 | account manager. |
| 46 | @@ -115,8 +115,8 @@ | |||
| 47 | 115 | Description: GNOME multi-protocol chat and call client (common files) | 115 | Description: GNOME multi-protocol chat and call client (common files) |
| 48 | 116 | Instant messaging program supporting text, voice, video, file transfers | 116 | Instant messaging program supporting text, voice, video, file transfers |
| 49 | 117 | and inter-application communication over many different protocols, | 117 | and inter-application communication over many different protocols, |
| 52 | 118 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 118 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 53 | 119 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 119 | Groupwise and ICQ. |
| 54 | 120 | . | 120 | . |
| 55 | 121 | This package contains the architecture independent files for Empathy | 121 | This package contains the architecture independent files for Empathy |
| 56 | 122 | IM application. | 122 | IM application. |
| 57 | @@ -147,8 +147,8 @@ | |||
| 58 | 147 | Description: GNOME multi-protocol chat and call client (GOA plugin) | 147 | Description: GNOME multi-protocol chat and call client (GOA plugin) |
| 59 | 148 | Instant messaging program supporting text, voice, video, file transfers | 148 | Instant messaging program supporting text, voice, video, file transfers |
| 60 | 149 | and inter-application communication over many different protocols, | 149 | and inter-application communication over many different protocols, |
| 63 | 150 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 150 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 64 | 151 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 151 | Groupwise and ICQ. |
| 65 | 152 | . | 152 | . |
| 66 | 153 | This package contains GNOME Online Accounts plugin for Mission Control. | 153 | This package contains GNOME Online Accounts plugin for Mission Control. |
| 67 | 154 | 154 | ||
| 68 | @@ -163,8 +163,6 @@ | |||
| 69 | 163 | account-plugin-aim, | 163 | account-plugin-aim, |
| 70 | 164 | account-plugin-jabber, | 164 | account-plugin-jabber, |
| 71 | 165 | account-plugin-google, | 165 | account-plugin-google, |
| 72 | 166 | account-plugin-facebook, | ||
| 73 | 167 | account-plugin-windows-live, | ||
| 74 | 168 | account-plugin-yahoo, | 166 | account-plugin-yahoo, |
| 75 | 169 | account-plugin-salut | 167 | account-plugin-salut |
| 76 | 170 | Suggests: account-plugin-gadugadu, | 168 | Suggests: account-plugin-gadugadu, |
| 77 | @@ -182,8 +180,8 @@ | |||
| 78 | 182 | Description: GNOME multi-protocol chat and call client (UOA plugin) | 180 | Description: GNOME multi-protocol chat and call client (UOA plugin) |
| 79 | 183 | Instant messaging program supporting text, voice, video, file transfers | 181 | Instant messaging program supporting text, voice, video, file transfers |
| 80 | 184 | and inter-application communication over many different protocols, | 182 | and inter-application communication over many different protocols, |
| 83 | 185 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 183 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 84 | 186 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 184 | Groupwise and ICQ. |
| 85 | 187 | . | 185 | . |
| 86 | 188 | This package contains Ubuntu Online Accounts plugin for Mission Control. | 186 | This package contains Ubuntu Online Accounts plugin for Mission Control. |
| 87 | 189 | 187 | ||
| 88 | @@ -200,8 +198,8 @@ | |||
| 89 | 200 | Description: Messaging account plugin for AIM | 198 | Description: Messaging account plugin for AIM |
| 90 | 201 | Instant messaging program supporting text, voice, video, file transfers | 199 | Instant messaging program supporting text, voice, video, file transfers |
| 91 | 202 | and inter-application communication over many different protocols, | 200 | and inter-application communication over many different protocols, |
| 94 | 203 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 201 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 95 | 204 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 202 | Groupwise and ICQ. |
| 96 | 205 | . | 203 | . |
| 97 | 206 | This package contains UOA account plugins for the Empathy IM application. | 204 | This package contains UOA account plugins for the Empathy IM application. |
| 98 | 207 | 205 | ||
| 99 | @@ -218,8 +216,8 @@ | |||
| 100 | 218 | Description: Messaging account plugin for GaduGadu | 216 | Description: Messaging account plugin for GaduGadu |
| 101 | 219 | Instant messaging program supporting text, voice, video, file transfers | 217 | Instant messaging program supporting text, voice, video, file transfers |
| 102 | 220 | and inter-application communication over many different protocols, | 218 | and inter-application communication over many different protocols, |
| 105 | 221 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 219 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 106 | 222 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 220 | Groupwise and ICQ. |
| 107 | 223 | . | 221 | . |
| 108 | 224 | This package contains UOA account plugins for the Empathy IM application. | 222 | This package contains UOA account plugins for the Empathy IM application. |
| 109 | 225 | 223 | ||
| 110 | @@ -236,8 +234,8 @@ | |||
| 111 | 236 | Description: Messaging account plugin for Groupwise | 234 | Description: Messaging account plugin for Groupwise |
| 112 | 237 | Instant messaging program supporting text, voice, video, file transfers | 235 | Instant messaging program supporting text, voice, video, file transfers |
| 113 | 238 | and inter-application communication over many different protocols, | 236 | and inter-application communication over many different protocols, |
| 116 | 239 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 237 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 117 | 240 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 238 | Groupwise and ICQ. |
| 118 | 241 | . | 239 | . |
| 119 | 242 | This package contains UOA account plugins for the Empathy IM application. | 240 | This package contains UOA account plugins for the Empathy IM application. |
| 120 | 243 | 241 | ||
| 121 | @@ -254,8 +252,8 @@ | |||
| 122 | 254 | Description: Messaging account plugin for ICQ | 252 | Description: Messaging account plugin for ICQ |
| 123 | 255 | Instant messaging program supporting text, voice, video, file transfers | 253 | Instant messaging program supporting text, voice, video, file transfers |
| 124 | 256 | and inter-application communication over many different protocols, | 254 | and inter-application communication over many different protocols, |
| 127 | 257 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 255 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 128 | 258 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 256 | Groupwise and ICQ. |
| 129 | 259 | . | 257 | . |
| 130 | 260 | This package contains UOA account plugins for the Empathy IM application. | 258 | This package contains UOA account plugins for the Empathy IM application. |
| 131 | 261 | 259 | ||
| 132 | @@ -272,8 +270,8 @@ | |||
| 133 | 272 | Description: Messaging account plugin for IRC | 270 | Description: Messaging account plugin for IRC |
| 134 | 273 | Instant messaging program supporting text, voice, video, file transfers | 271 | Instant messaging program supporting text, voice, video, file transfers |
| 135 | 274 | and inter-application communication over many different protocols, | 272 | and inter-application communication over many different protocols, |
| 138 | 275 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 273 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 139 | 276 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 274 | Groupwise and ICQ. |
| 140 | 277 | . | 275 | . |
| 141 | 278 | This package contains UOA account plugins for the Empathy IM application. | 276 | This package contains UOA account plugins for the Empathy IM application. |
| 142 | 279 | 277 | ||
| 143 | @@ -290,8 +288,8 @@ | |||
| 144 | 290 | Description: Messaging account plugin for Jabber/XMPP | 288 | Description: Messaging account plugin for Jabber/XMPP |
| 145 | 291 | Instant messaging program supporting text, voice, video, file transfers | 289 | Instant messaging program supporting text, voice, video, file transfers |
| 146 | 292 | and inter-application communication over many different protocols, | 290 | and inter-application communication over many different protocols, |
| 149 | 293 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 291 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 150 | 294 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 292 | Groupwise and ICQ. |
| 151 | 295 | . | 293 | . |
| 152 | 296 | This package contains UOA account plugins for the Empathy IM application. | 294 | This package contains UOA account plugins for the Empathy IM application. |
| 153 | 297 | 295 | ||
| 154 | @@ -308,8 +306,8 @@ | |||
| 155 | 308 | Description: Messaging account plugin for Mxit | 306 | Description: Messaging account plugin for Mxit |
| 156 | 309 | Instant messaging program supporting text, voice, video, file transfers | 307 | Instant messaging program supporting text, voice, video, file transfers |
| 157 | 310 | and inter-application communication over many different protocols, | 308 | and inter-application communication over many different protocols, |
| 160 | 311 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 309 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 161 | 312 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 310 | Groupwise and ICQ. |
| 162 | 313 | . | 311 | . |
| 163 | 314 | This package contains UOA account plugins for the Empathy IM application. | 312 | This package contains UOA account plugins for the Empathy IM application. |
| 164 | 315 | 313 | ||
| 165 | @@ -326,8 +324,8 @@ | |||
| 166 | 326 | Description: Messaging account plugin for MySpace | 324 | Description: Messaging account plugin for MySpace |
| 167 | 327 | Instant messaging program supporting text, voice, video, file transfers | 325 | Instant messaging program supporting text, voice, video, file transfers |
| 168 | 328 | and inter-application communication over many different protocols, | 326 | and inter-application communication over many different protocols, |
| 171 | 329 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 327 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 172 | 330 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 328 | Groupwise and ICQ. |
| 173 | 331 | . | 329 | . |
| 174 | 332 | This package contains UOA account plugins for the Empathy IM application. | 330 | This package contains UOA account plugins for the Empathy IM application. |
| 175 | 333 | 331 | ||
| 176 | @@ -344,8 +342,8 @@ | |||
| 177 | 344 | Description: Messaging account plugin for Local XMPP (Salut) | 342 | Description: Messaging account plugin for Local XMPP (Salut) |
| 178 | 345 | Instant messaging program supporting text, voice, video, file transfers | 343 | Instant messaging program supporting text, voice, video, file transfers |
| 179 | 346 | and inter-application communication over many different protocols, | 344 | and inter-application communication over many different protocols, |
| 182 | 347 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 345 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 183 | 348 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 346 | Groupwise and ICQ. |
| 184 | 349 | . | 347 | . |
| 185 | 350 | This package contains UOA account plugins for the Empathy IM application. | 348 | This package contains UOA account plugins for the Empathy IM application. |
| 186 | 351 | 349 | ||
| 187 | @@ -362,8 +360,8 @@ | |||
| 188 | 362 | Description: Messaging account plugin for Sametime | 360 | Description: Messaging account plugin for Sametime |
| 189 | 363 | Instant messaging program supporting text, voice, video, file transfers | 361 | Instant messaging program supporting text, voice, video, file transfers |
| 190 | 364 | and inter-application communication over many different protocols, | 362 | and inter-application communication over many different protocols, |
| 193 | 365 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 363 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 194 | 366 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 364 | Groupwise and ICQ. |
| 195 | 367 | . | 365 | . |
| 196 | 368 | This package contains UOA account plugins for the Empathy IM application. | 366 | This package contains UOA account plugins for the Empathy IM application. |
| 197 | 369 | 367 | ||
| 198 | @@ -380,8 +378,8 @@ | |||
| 199 | 380 | Description: Messaging account plugin for SIP | 378 | Description: Messaging account plugin for SIP |
| 200 | 381 | Instant messaging program supporting text, voice, video, file transfers | 379 | Instant messaging program supporting text, voice, video, file transfers |
| 201 | 382 | and inter-application communication over many different protocols, | 380 | and inter-application communication over many different protocols, |
| 204 | 383 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 381 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 205 | 384 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 382 | Groupwise and ICQ. |
| 206 | 385 | . | 383 | . |
| 207 | 386 | This package contains UOA account plugins for the Empathy IM application. | 384 | This package contains UOA account plugins for the Empathy IM application. |
| 208 | 387 | 385 | ||
| 209 | @@ -398,8 +396,8 @@ | |||
| 210 | 398 | Description: Messaging account plugin for Yahoo! | 396 | Description: Messaging account plugin for Yahoo! |
| 211 | 399 | Instant messaging program supporting text, voice, video, file transfers | 397 | Instant messaging program supporting text, voice, video, file transfers |
| 212 | 400 | and inter-application communication over many different protocols, | 398 | and inter-application communication over many different protocols, |
| 215 | 401 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 399 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 216 | 402 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 400 | Groupwise and ICQ. |
| 217 | 403 | . | 401 | . |
| 218 | 404 | This package contains UOA account plugins for the Empathy IM application. | 402 | This package contains UOA account plugins for the Empathy IM application. |
| 219 | 405 | 403 | ||
| 220 | @@ -416,8 +414,8 @@ | |||
| 221 | 416 | Description: Messaging account plugin for Yahoo Japan | 414 | Description: Messaging account plugin for Yahoo Japan |
| 222 | 417 | Instant messaging program supporting text, voice, video, file transfers | 415 | Instant messaging program supporting text, voice, video, file transfers |
| 223 | 418 | and inter-application communication over many different protocols, | 416 | and inter-application communication over many different protocols, |
| 226 | 419 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 417 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 227 | 420 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 418 | Groupwise and ICQ. |
| 228 | 421 | . | 419 | . |
| 229 | 422 | This package contains UOA account plugins for the Empathy IM application. | 420 | This package contains UOA account plugins for the Empathy IM application. |
| 230 | 423 | 421 | ||
| 231 | @@ -434,7 +432,7 @@ | |||
| 232 | 434 | Description: Messaging account plugin for Zephyr | 432 | Description: Messaging account plugin for Zephyr |
| 233 | 435 | Instant messaging program supporting text, voice, video, file transfers | 433 | Instant messaging program supporting text, voice, video, file transfers |
| 234 | 436 | and inter-application communication over many different protocols, | 434 | and inter-application communication over many different protocols, |
| 237 | 437 | including: AIM, Windows Live (MSN), Google Talk (Jabber/XMPP), Facebook, | 435 | including: AIM, Google Talk (Jabber/XMPP), Yahoo!, Salut, Gadu-Gadu, |
| 238 | 438 | Yahoo!, Salut, Gadu-Gadu, Groupwise and ICQ. | 436 | Groupwise and ICQ. |
| 239 | 439 | . | 437 | . |
| 240 | 440 | This package contains UOA account plugins for the Empathy IM application. | 438 | This package contains UOA account plugins for the Empathy IM application. |
