lp:~ubuntu-branches/ubuntu/maverick/empathy/maverick-proposed-201101251021

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/maverick-proposed/empathy

Ubuntu Development Team: Pending requested 2011-01-25

Diff: 128 lines (+116/-0) (has conflicts)

2 files modified

debian/patches/22_dont_display_notifications_for_pending_messages.patch (+23/-0)
debian/patches/22_tell_if_the_message_is_a_pending_one_or_not.patch (+93/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

127. By Ken VanDine on 2011-01-21

releasing version 2.32.1-0ubuntu1.1

126. By Ken VanDine on 2011-01-21

releasing version 2.32.1-0ubuntu2

125. By Brian Curtis on 2010-11-16

* New Upstream Release
  - Empathy doesn't build with gcr-3 (Guillaume Desmottes)
  - Empathy 2.32.x needs to require libnotify < 0.7 (Guillaume Desmottes)
  - Empathy 2.32.x shouldn't support GTK 3 (Guillaume Desmottes)
  - (LP: #655090), window resizes irreversibly when perfoming a contact
    search (Guillaume Desmottes)
  - Fixed (LP: #641949) Honour preference 'disable notifications when
    busy or away'
  - Updated translations
* patches/20_libindicate.patch
  - fixed hunk failures

124. By Ken VanDine on 2010-10-04

* New upstream release (LP: #654981)
  - auth client crashes when trying to connect (Cosimo Cecchi)
  - show the "new message" icon regardless of focus, active tab (Guillaume Desmottes)
  - Should leave fullscreen mode when call is disconnected (Guillaume Desmottes)
  - doesn't check unique result (Guillaume Desmottes)
  - Better heuristic to pick default individual (Guillaume Desmottes)
  - Contacts list window triggers _NET_ACTIVE_WINDOW timestamp error from Metacity (Guillaume Desmottes)
  - update Empathy to deprecation changes in GTK+ 2.22 (Diego Escalante Urrelo)
  - Hitting redial doesn't clear error messages (Guillaume Desmottes)
  - Empathy Loses ContactInfo data it doesn't support in the UI (Guillaume Desmottes)
  - Always show status icon in contact right-click menu (for meta-contacts)
  - Refers to a nonexistent UI item (Milo Casagrande)
  - Recommended SIP provider no longer available (Milo Casagrande)

123. By Didier Roche-Tolomelli on 2010-10-01

* debian/patches/91_git_fix_gtalk_for_new_accounts.patch:
  - from upstream: fix empathy to be compatible with gtalk new accounts

122. By Brian Curtis on 2010-09-27

New upstream release.
-(LP: #634892) Double contacts after adding new contact in group "Ungrouped" (Philip Withnall)
-Blacklist Haze's sip protocol (Guillaume Desmottes)
-Failed assertion in contact_widget_details_feature_prepared_cb() (Guillaume Desmottes)
-(LP: #638270) empathy-accounts assert failure: **glibc detected *** /usr/bin/empathy-accounts: free(): invalid pointer: 0x0809d5b6 *** (Guillaume Desmottes)
-File missing from POTFILES.in (Gabor Kelemen)
-Untranslatable strings (Gabor Kelemen)
-Typo in user guide: witn (Gabor Kelemen)

121. By Ken VanDine on 2010-09-14

* debian/patches/20_libindicate.patch
  - Don't use notify_notification_new_with_status_icon when the status
    icon isn't visible (LP: #603526)

120. By Didier Roche-Tolomelli on 2010-09-14

* New upstream release:
  This is the GNOME 2.32 release candidate. A bunch of meta-contacts related
  bugs have been fixed and the audio/video client has been improved to
  reduce the bandwith used by the video stream.
  We also use the stable API of the Conference, ServerTLSConnection and
  TLSCertificate interfaces so you should upgrade to telepathy-gabble 0.9.18
  if you want to use these features.
* debian/control:
  - bump libtelepathy-glib-dev build-dep
* debian/patches/91_git_unref_empathyindividualview_later.patch:
  - in upstream version

119. By Sebastien Bacher on 2010-09-06

Depends on telepathy-logger (lp: #623516), recommends libdconf0

118. By Didier Roche-Tolomelli on 2010-09-03

* debian/control:
  - readd libebook1.2-dev build-dep as built with --with_eds (default value)