lp:~ilidrissi.amine/ubuntu/maverick/empathy/empathy.bug-256783

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/maverick/empathy

Ubuntu Sponsors: Pending requested 2010-09-01

Diff: 30 lines (+9/-3)

2 files modified

debian/changelog (+6/-0)
debian/control (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #256783: empathy should Recommend: telepathy-idle to support IRC

Undecided

Invalid

Link a bug report

Related blueprints

117. By Mohamed Amine Ilidrissi on 2010-09-01

debian/control: telepathy-idle is now in Recommends (LP: #256783)

116. By Robert Ancell on 2010-08-24

* 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

115. By Robert Ancell on 2010-08-20

* New upstream release
* debian/control:
  - Bump build-depends on libtelepathy-glib-dev, libfolks-dev,
    libtelepathy-logger-dev

114. By Robert Ancell on 2010-08-06

* New upstream release
* debian/control:
  - Add build-depends on libfolks-dev, libfolks-telepathy-dev
  - Bump build-depends on libtelepathy-farsight-dev
  - Use standards-version 3.9.1

113. By Bilal Akhtar on 2010-07-30

* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts (LP: #569289)

112. By Martin Pitt on 2010-08-01

No-change upload to rebuild against new debhelper, to drop sizable
upstream changelog.

111. By Sebastien Bacher on 2010-07-13

* New upstream version:
  Bugs fixed:
  - Fixed #585914, Notification icon must be clicked before user can
    see new messages (lp: #206547)
  - Fixed #597124, Should make better use of libnotify actions
  - Fixed #599161, Audio/Video client should be a separated process
  - Fixed #617405, Empathy's short (menu) description should focus on its use,
    not the technology
  - Fixed #621753, Should be able to build with GTK+3
  - Fixed #622729, duplicated messages when opening chat
  - Fixed #623054, Should re-add data/org.gnome.Empathy.gschema.xml.in
    to POTFILES.in
  - Fixed #623112, Bip backlog are not displayed any more
  - Fixed #623117, Debug window should look for TP clients
  - Fixed #623358, Use TpSimpleHandler to handle text channels
  - Fixed #623396, Fixed some leaks
  - Fixed #623679, /join broken
  - Fixed #623756, empathy-CRITICAL **:
    empathy_chatroom_is_always_urgent: assertion `EMPATHY_IS_CHATROOM
  - Fixed #623817, Sync man pages with Debian
  - Fixed #623914, since tp-logger history is shown as normal messages
    in adium themes
  - Fixed #623937, empathy -h does not start hidden (lp: #603451)
  - Fixed #623972, Toggling [ ] Enabled in the accounts dialog with the
    keyboard doesn't work
  - Fixed #624054, Fix a memory leak in EmpathyAvatar
* debian/empathy.1, debian/empathy-accounts.1, debian/empathy.manpages:
  - drop local manpages copies since they are updated upstream now
* debian/empathy.gconf-defaults, debian/patches/02_notifications_focus.patch:
  - gsettings doesn't allow overwritting defaults yet to change the schemas
* debian/empathy.install:
  - updated for the new files to install

110. By Sebastien Bacher on 2010-07-08

* debian/control:
  - recommends telepathy-logger
* debian/empathy.install:
  - install the gconf configuration migration script

109. By Robert Ancell on 2010-07-05

* New upstream release
* debian/control:
  - Use standards-version 3.9.0
  - Update build-depends
  - Build-depend on libglib2.0-bin
* debian/rules:
  - Build with --disable-schemas-compile
* debian/empathy.install:
  - Update for new schemas

108. By Sebastien Bacher on 2010-06-18

* debian/control, debian/rules:
  - don't use geolocation it's in universe
  - don't recommends the freedesktop sound theme we have an ubuntu one
* debian/empathy.preinst:
  - drop cleaning code which was only required until lucid
* debian/patches/90_revert_removal_stock_person.patch:
  - don't use this change since the new gnome-icon-theme is available now,
    the humanity and mono icon themes might need to be updated though

[ Robert Ancell ]
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Build-depend on gnome-common to run autoconf
  - Add indicator build-depends
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
* debian/rules:
  - Run autotools on build
  - Enable libindicate
  - Make sure favourite-contacts is disabled, it requires telepathy-logger
* debian/empathy.gconf-defaults
  - Enable notifications when chat is not focused
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/empathy.preinst:
  - Remove the old indicator from /etc and remove the directory if it is empty
* 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/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/90_revert_removal_stock_person.patch:
  - Use stock person icon instead of Empathy default icon