-
Committer:
Bazaar Package Importer
-
Author(s):
Mathieu Trudel-Lapierre
-
Date:
2011-07-29 10:45:37 UTC
-
mfrom:
(2.3.22 sid)
-
Revision ID:
james.westby@ubuntu.com-20110729104537-bv5vrvot2cimg5gs
Tags: 1:2.9.0-3ubuntu1
* Merge with Debian; remaining changes: (LP: #802374)
- debian/libpurple0.symbols: update symbols for epoch.
- debian/patches/02_lpi.patch: add Launchpad integration support.
- debian/patches/04_let_crasher_for_apport.patch: stop catching the SIGSEGV
signal and let apport handle it.
- debian/patches/05_default_to_irc_ubuntu_com.patch: set the default IRC
server to irc.ubuntu.com.
- debian/patches/10_docklet_default_off.patch: default behavior to have no
notification area icon.
- debian/patches/11_buddy_list_really_show.patch: the buddy list tries
harder to appear. This fixes some issues with it not appearing.
- debian/patches/13_sounds_and_timers.patch: mute notification sounds for
15 seconds at login time.
- debian/patches/60_1024x600_gtk*.c.patch: add scrollbars into preferences
and pounce dialogs
- debian/prefs.xml: ship extra default settings for notifications, add
the notification plugin by default and turn on logging by default.
- debian/rules:
- use autoreconf.
- add translation domain for desktop file / update translations.
- add launcher desktop file for indicator-messages.
- debian/control:
- add launchpad-integration, libtool, dh-autoreconf to Build-Depends.
- drop pidgin-data Depends from libpurple0.
- drop libpurple0 Depends from libpurple-bin.
- add pidgin-libnotify as Recommends for pidgin binary.