Comment 18 for bug 415908

Revision history for this message
Felix Geyer (debfx) wrote : Re: Please merge pidgin 2.6.1-1 (main) from Debian experimental (main)

Removed libgnt symbols, merge with 2.6.1-2 (no Debian changes) and dropped all Ubuntu-specific conflicts/replaces (version before hardy):

pidgin (1:2.6.1-2ubuntu1) karmic; urgency=low

  * Merge with Debian unstable (LP: #415908), remaining changes:
    + debian/prefs.xml: Update 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.
    + 60_1024x600_gtk*.c.patch: Add scrollbars into preferences and
      pounce dialogs
    + debian/libpurple0.symbols: Add epochs
    + Drop libpurple0 dependency from libpurple-bin
    + Drop pidgin-data dependency from libpurple0
  * Refresh 13_sounds_and_timers.patch: partly applied upstream
  * Update 60_1024x600_gtkprefs.c.patch: add scrollbars to additional tabs
  * Drop 60_1024x600_gtkaccount.c.patch, 99_autoreconf.patch:
    not needed anymore
  * Drop 73_upstream_change_fix_high_dpi_status_msg.patch: applied upstream
  * Remove libgnt symbols from debian/libpurple0.symbols