-
Committer:
Bazaar Package Importer
-
Author(s):
Nick Andrik
-
Date:
2009-05-27 02:23:16 UTC
-
mfrom:
(1.1.18 upstream)
(2.1.1 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090527022316-xdj3a6svtqk7aojv
Tags: 1:2.5.6-1ubuntu1
* Merge from debian, remaining changes (LP: #380806 ):
- 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
- debian/patches:
+ 02_lpi.patch for LP integration
+ 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. This fixes (LP: #340366)
+ 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. (LP: #341142)
+ 12_rate_limit_aim_blist_warning.patch to rate limit popups when
AIM buddy list is unavailable (LP: #345774)
+ 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.
(LP: #345494)
+ 60_1024x600_gtk*.c.patch: Add scrolled bars into account dialog,
pounce windows and preference window when screen height is less than 600.
+ 70_autoconf.patch
- debian/control:
+ Drop the libpurple0 dependency on libpurple-bin
+ Add Build-Deps on liblaunchpad-integration-dev, intltool,
network-manager-dev
+ Make finch conflict & replace old versions of gaim (closes: #440351)
+ Add epoch in dependencies
- debian/libpurple0.symbols:
+ Add libgnt to symbols
+ Add epoch to versions
- debian/pidgin-dbg.preinst, debian/pidgin-dev.preinst,
debian/pidgin.preinst: Add epoch
- debian/rules:
+ remove --disable-nm as nm has been fixed in Ubuntu
+ Add X-Ubuntu-Gettext-Domain to the desktop file and update the
translation templates in common-install-impl::