lp://staging/~kiko/ubuntu/karmic/pidgin/updates
- Get this branch:
- bzr branch lp://staging/~kiko/ubuntu/karmic/pidgin/updates
Branch merges
Branch information
- Owner:
- Christian Reis
- Status:
- Development
Recent revisions
- 46. By Iain Lane
-
* 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 - 45. By Dominic Evans
-
* Add 73_upstream_
change_ fix_high_ dpi_status_ msg.patch:
- upstream change to stop the clipping of the infopane text when using
high DPI (LP: #378710) - 44. By Nick Andrik
-
* 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:: - 43. By Sebastien Bacher
-
* debian/
patches/ 72_upstream_ change_ fix_jabber_ crasher. patch:
- upstream change to fix crash on jabber when using a custom image
(lp: #357949) - 42. By Sebastien Bacher
-
* debian/
patches/ 71_upstream_ change_ fix_ssl_ crasher. patch:
- upstream change to fix a crasher issue which has lot of duplicate
(lp: #328878, #341434, #354272) - 41. By Ken VanDine
-
* debian/
patches/ 62_dbus_ fix.patch:
- The buddy list should be raised when launching a second time, this patch
from darkrain42 fixes a bug that prevented that behavior (LP: #354298) - 40. By Ken VanDine
-
* debian/
patches/ 61_crash_ on_close_ 349009. patch
- Patch from darkrain42 to fix a crasher bug triggered by closing
the buddy list with chat rooms open (LP: #349009) - 39. By Mackenzie Morgan
-
Backport fix from http://
developer. pidgin. im/ticket/ 4845
to rate limit popups when AIM buddy list is unavailable
(LP: #345774) - 38. By Ted Gould
-
* Adding debian/
patches/ 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)
* Adding debian/patches/ 10_docklet_ default_ off.patch to set the
default behavior to have no notification area icon. This fixes
(LP: #340366)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/karmic/pidgin