~ubuntu-branches/ubuntu/maverick/empathy/maverick-updates

Viewing all changes in revision 116.

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-08-24 12:55:07 UTC
  • mfrom: (6.3.25 experimental) (6.4.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100824125507-ecvnz600bq2fviva
Tags: 2.31.90-1ubuntu1
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Build-depend on dh-autoreconf, gnome-common
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add indicator build-depends
  - Add Vcz-Bzr link
  - Don't recommend libdconf0 - we do that at a higher level
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommends the freedesktop sound theme we have an ubuntu one
* debian/rules:
  - Use autoreconf.mk
  - Enable libindicate
  - Disable map and location
  - Make sure favourite-contacts is disabled, it requires telepathy-logger
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/02_notifications_focus.patch: 
  - gsettings doesn't allow overwritting defaults yet to change the schemas
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/11_empathy_accounts_category.patch:
  - Put empathy-accounts in correct category
* debian/patches/20_libindicate.patch:
  - Integrate into messaging menu
* debian/patches/21_login_indicators.patch:
  - Only display indicator for signon events if the preference is set
* debian/patches/31_really_raise_window.patch:
  - Force focus of the window when selected from the indicator
* debian/patches/34_start_raised_execpt_in_session.patch:
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: