Please merge pidgin 2.5.6 (main) from Debian sid (unstable)

I have uploaded a merged version in my PPA. Could someone please check it?
--------------------------------------------------------------------------------------------------------------------------------

pidgin (1:2.5.6-1ubuntu1~ppa1~test1) jaunty; urgency=low

  * Merge from debian, 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
    - 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::

 -- Nick Andrik <email address hidden> Wed, 27 May 2009 02:23:16 +0200

New uploaded version in my PPA ( 1:2.5.6-1ubuntu1~ppa1~test2 ) with updated urgency and included the LP bug number.
------------------------------------------------------------------------------

pidgin (1:2.5.6-1ubuntu1~ppa1~test2) jaunty; urgency=high

  * Merge from debian (LP: #380806) , 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
    - 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::

 -- Nick Andrik < <email address hidden>> Wed, 27 May 2009 02:23:16 +0200

Here is the Ubuntu to Debian debdiff

PS: Sorry for the multiple comments, it is my first merge trial

Subscribing ubuntu-main-sponsors so a developer can review the changes. See https://wiki.ubuntu.com/SponsorshipProcess .

The 2.5.6 merge should be targeted for Karmic, not Jaunty. I have opened bug 384222 to deal with the SRU for the security vulnerabilities.

thank you for your work there

This bug was fixed in the package pidgin - 1:2.5.6-1ubuntu1

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

  * 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::

 -- Nick Andrik <email address hidden> Wed, 27 May 2009 02:23:16 +0200

You're welcome Sebastian.

Since it is pidgin (which is one of the most used applications) and also this version fixes security fixes, could I suggest to also upload it to jaunty-backports?

The security fixes have already been applied to *-security. All releases (except Dapper) already have at least Pidgin 2.5.2. If you believe there is a new feature that would be worthwhile backporting, you can open a backport bug. See https://help.ubuntu.com/community/UbuntuBackports for more info. Thanks again for packaging!

I hadn't noticed that there was pidgin with security patches were in jaunty-security.
I guess for now it is OK