-
Committer:
Bazaar Package Importer
-
Author(s):
Brian Curtis, Brian Curtis, Ken VanDine
-
Date:
2011-06-01 10:35:24 UTC
-
mfrom:
(1.1.70 upstream)
(6.3.44 experimental)
-
Revision ID:
james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
- Drop geoclue/mapping build-depends (they are in Universe)
- Add Vcz-Bzr link
- Add Suggests on telepathy-idle
- Bump telepathy-butterfly, telepathy-haze to recommends
- Don't recommend the freedesktop sound theme we have an ubuntu one
- Add build depend for libunity-dev
* debian/rules:
- Use autoreconf.mk
- Disable map and location
* debian/empathy.install:
- Install message indicator configuration
* debian/indicators/empathy:
- Message indicator configuration
* debian/patches/01_lpi.patch:
- Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
- Use the notify-osd image for new messages
* 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
* debian/patches/41_unity_launcher_progress.patch
- Display file transfer progress in the unity launcher
[ Ken VanDine ]
* debian/control
- build depend on libgcr-3-dev instead of libgcr-dev
- dropped build depends for libindicate, we will use telepathy-indicator
- Depend on dconf-gsettings-backend | gsettings-backend
- Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
- Added an override for notifications-focus
* debian/patches/series
- commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has
been ported to gtk3