-
Committer:
Bazaar Package Importer
-
Author(s):
Iain Lane
-
Date:
2009-06-22 17:14:29 UTC
-
mfrom:
(1.1.19 upstream)
(2.1.2 sid)
-
Revision ID:
james.westby@ubuntu.com-20090622171429-lt7fyq3q11zpnijs
Tags: 1:2.5.7-1ubuntu1
* Merge with Debian unstable (LP: #390249, #390297), remaining changes:
- Update debian/prefs.xml to set the notify plugin prefs
/plugins/gtk/X11/notify/*, set /pidgin/plugins/loaded to load
the notify plugin and enable the standard logging options by default
+ 02_lpi.patch for LP integration. Add liblaunchpad-integration-dev to
build-deps for this
+ 04_let_crasher_for_apport.patch to stop catching the SIGSEGV signal
and let apport handle it
+ 05_default_to_irc_ubuntu_com.patch to set the default IRC
server to irc.ubuntu.com
+ 10_docklet_default_off.patch for default behavior to have no
notification area icon.
+ 11_buddy_list_really_show.patch to make it so that the buddy
list tries harder to appear. This fixes some issues with it
not appearing.
+ 13_sounds_and_timers.patch which adjusts the time out for sounds
to be 15 seconds, which helps get fewer spurious login
notifications on slow connections. Also, switches a few long
term timers to _add_seconds to get a little bit of power savings.
+ 60_1024x600_gtk*.c.patch: Add scrolled bars into account dialog,
+ 73_upstream_change_fix_high_dpi_status_msg.patch: upstream change to
stop the clipping of the infopane text when using high DPI
pounce windows and preference window when screen height is less than 600.
+ Add nm-dev to build-deps to enable NM integration. Remove --disable-nm
from configure line.
+ debian/libpurple0.symbols: Add libgdl & epochs
+ debian/control: Remove libpurple0 from deps of libpurple-bin
* Also fixes Yahoo! connection problems (LP: #389322)
* debian/libpurple0.symbols: Update
* 99_autoconf: Refresh