lp:~ubuntu-branches/ubuntu/precise/pidgin/precise-201204042121

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/precise/pidgin

Ubuntu branches: Pending requested 2012-04-04

Diff: 1812 lines (+1779/-0) (has conflicts)

4 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/70_farstream_rename.patch/libpurple/Makefile.am (+335/-0)
.pc/70_farstream_rename.patch/libpurple/media.c (+1442/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

83. By Ken VanDine on 2012-04-04

releasing version 1:2.10.2-1ubuntu2

82. By Sebastien Bacher on 2012-01-05

New upstream version based on the Debian update

81. By Ken VanDine on 2012-03-09

releasing version 1:2.10.1-1ubuntu2

80. By Ken VanDine on 2012-03-05

releasing version 1:2.10.1-1ubuntu2~build1

79. By Ken VanDine on 2012-03-05

* debian/control
  - build depend on farstream instead of farsight, it was renamed upstream
* debian/patches/70_farstream_rename.patch
  - updated includes and configure.ac to work with farstream

78. By Sebastien Bacher on 2012-01-05

New upstream version based on the Debian update

77. By Colin Watson on 2011-11-15

Rebuild for Perl 5.14 (LP: #890845).

76. By Mathieu Trudel-Lapierre on 2011-09-23

debian/patches/irc_disable_periodic_who.patch: work around spontaneous
disconnects from IRC due to 'Max SendQ exceeded' errors caused by periodic
/who checks. (LP: #856631)

75. By Mathieu Trudel-Lapierre on 2011-08-25

* New upstream release.
* debian/patches/60_1024x600_gtkprefs.c.patch: refreshed.

74. By Mathieu Trudel-Lapierre on 2011-07-29

* Merge with Debian; remaining changes: (LP: #802374)
  - debian/libpurple0.symbols: update symbols for epoch.
  - debian/patches/02_lpi.patch: add Launchpad integration support.
  - debian/patches/04_let_crasher_for_apport.patch: stop catching the SIGSEGV
    signal and let apport handle it.
  - debian/patches/05_default_to_irc_ubuntu_com.patch: set the default IRC
    server to irc.ubuntu.com.
  - debian/patches/10_docklet_default_off.patch: default behavior to have no
    notification area icon.
  - debian/patches/11_buddy_list_really_show.patch: the buddy list tries
    harder to appear. This fixes some issues with it not appearing.
  - debian/patches/13_sounds_and_timers.patch: mute notification sounds for
    15 seconds at login time.
  - debian/patches/60_1024x600_gtk*.c.patch: add scrollbars into preferences
    and pounce dialogs
  - debian/prefs.xml: ship extra default settings for notifications, add
    the notification plugin by default and turn on logging by default.
  - debian/rules:
    - use autoreconf.
    - add translation domain for desktop file / update translations.
    - add launcher desktop file for indicator-messages.
  - debian/control:
    - add launchpad-integration, libtool, dh-autoreconf to Build-Depends.
    - drop pidgin-data Depends from libpurple0.
    - drop libpurple0 Depends from libpurple-bin.
    - add pidgin-libnotify as Recommends for pidgin binary.