Last commit made on 2008-10-24
Get this branch:
git clone -b ubuntu/intrepid https://git.launchpad.net/ubuntu/+source/pidgin
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

a9300a8... by Sebastien Bacher on 2008-10-22

Import patches-unapplied version 1:2.5.2-0ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 5f7b4281acf1050d13262b89504f7fda7737d84c

New changelog entries:
  * New upstream version
  * debian/patches/06_ssl_null_pointer_deref.patch:
    - the change is in the new version

5f7b428... by Sebastien Bacher on 2008-10-09

Import patches-unapplied version 1:2.5.1-0ubuntu3 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: e5216c81384d81e4ef3e24f346bff4f6b32b0b15

New changelog entries:
  * debian/prefs.xml:
    - enable the standard logging options by default (lp: #180796)

e5216c8... by Iain Lane on 2008-09-19

Import patches-unapplied version 1:2.5.1-0ubuntu2 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: b2f11c501e8bfcd6fbb95a426906aa18b63b9c49

New changelog entries:
  * debian/patches/06_ssl_null_pointer_deref.patch:
    - Backport fix from upstream MTN to fix null pointer defererence leading
      to a crash. This can be dropped if and when we get 2.5.2. (LP: #265055)

b2f11c5... by Sebastien Bacher on 2008-09-16

Import patches-unapplied version 1:2.5.1-0ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: ca18a7227713d74a2ddd17bda09e5575fff31025

New changelog entries:
  * New upstream version
  * debian/patches/70_autoconf.patch:
    - new version update

ca18a72... by Sebastien Bacher on 2008-08-20

Import patches-unapplied version 1:2.5.0-0ubuntu2 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: e5a0b1ac9403defd8ea991219c0ca3acae7a4636

New changelog entries:
  * debian/control:
    - build-depends on ca-certificates since the configure requires the
      directory to be there during the build

e5a0b1a... by Sebastien Bacher on 2008-08-20

Import patches-unapplied version 1:2.5.0-0ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 46f93a1fce6cb9d9f7bda1075d1e5011097096ac

New changelog entries:
  * New upstream version (lp: #259453)
  * debian/libpurple0.symbols:
    - new version update
  * debian/patches/00_debian-ca-certs.patch:
    - not required in the new version there is a configure option
  * debian/patches/02_manpage-desc.patch:
    - the change is in the new version
  * debian/patches/03_gconf-gstreamer.patch:
    - the change is in the new version
  * debian/patches/16_yahoo_icon_crash.patch:
    - not required the new versions fixes the issue
  * debian/patches/20_purple-remote_friendly.patch:
    - the change is in the new version
  * debian/patches/21_zephyr-external.patch:
    - don't use debian change which doesn't apply to the new version
  * debian/patches/75_occured-occurred.patch:
    - the change is in the new version
  * debian/rules:
    - use new configure option to specificy ssl-certs directory

46f93a1... by Sebastien Bacher on 2008-07-02

Import patches-unapplied version 1:2.4.3-0ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: faacc4311677da1b2660130e362cba009d9bd4f5

New changelog entries:
  * New upstream version:
    - can connect to the icq server (lp: #244591)
  * debian/control,
    - build-depends on libsilc which is in main now (lp: #44728)
  * debian/patches/16_yahoo_icon_crash.patch:
    - updated, some of the changes are in the new version

faacc43... by Nathan Handler on 2008-06-15

Import patches-unapplied version 1:2.4.2-2ubuntu2 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: b912a319cc05a74b531b1a768345547ec5c749c6

New changelog entries:
  * Add 75_occured-occurred.patch (LP: #217916)
    - Replaces "occured" with "occurred"

b912a31... by Pedro Fragoso on 2008-05-23

Import patches-unapplied version 1:2.4.2-2ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: a2e8d88ce096469f7c97f24ca621566b6ae94c1c

New changelog entries:
  * Sync with Debian, remaining Ubuntu changes; (LP: #233845)
    - debian/control:
      + Set Maintainer to Ubuntu Core Developers.
      + Add Build-Deps on liblaunchpad-integration-dev, intltool
      + Drop Build-Deps on libsilc-1.1-2-dev | libsilc-dev (>= 1.1.1) as
        this library is in universe.
      + Drop the libpurple0 recommends on libpurple-bin
    - debian/rules:
      + Pass --disable-silc to configure to disable silc support even if
        it's installed in the build environment.
      + Add X-Ubuntu-Gettext-Domain to the desktop file and update the
        translation templates in common-install-impl::.
    - Update debian/prefs.xml to set the notify plugin prefs
      /plugins/gtk/X11/notify/* and set /pidgin/plugins/loaded to load
      the notify plugin
    - debian/patches:
      + 02_lpi for LP integration
      + 04_let_crasher_for_apport to stop catching the SIGSEGV signal
        and let apport handle it
      + 05_default_to_irc_ubuntu_com to set the default IRC
        server to irc.ubuntu.com.
      + 70_autoconf patch
  * debian/libpurple0.symbols:
    - Added epoch to symbols
  * Fix broken Build-Depends line that was causing a lack of SILC support
  * New upstream release
  * Enable NetworkManager support now that it doesn't add an extra dependency
  * Remove 11_reread-resolvconf.patch since we have NM support and it didn't
    apply cleanly anyway
  * Fix spelling error in dh_pidgin man page (Closes: #474681)
  * Apply modified patch from Adrien Cunin to move finch dependency on libx11-6
    to a suggests, and add an entry in the description about it
    (Closes: #473997)
  * Update libpurple0.symbols for 2.4.0
  * New upstream release
    - Fixes crash in XMPP if network connection goes down after resume
      (Closes: #472057)
  * Add finch.pc to finch-dev
  * debian/patches/22_zephyr-crash.patch:
    - Add patch from upstream to prevent crash in Zephyr when reading
      accounts.xml file (Closes: #470947)
  * debian/patches/23_empty-edit.patch:
    - Add patch from upstream to prevent an invisible edit box in
      message windows (Closes: #471365)
  * debian/patches/24_debian-gconf.patch:
    - Fix an earlier screwup where we set /pidgin/browsers/command in
      prefs.xml as a string when it should've been a path, so it was never
      recognized properly and prevented people from using a custom browser if
      they had run 2.3.1-1. (Closes: #472929)
  * New upstream release
  * Install manpages into their appropriate packages, not pidgin-data
    (Closes: #459908)
  * Seed libpurple0.symbols file
  * Build with -fstack-protector
  * Add ${perl:Depends} to libpurple0 and pidgin to get the proper perlapi
    versioning (Closes: #463143)
  * Fix syntax problem in pidgin manpage (Closes: #463021)
  * Make libpurple0 shlibs slightly looser by making it
    >= MAJOR.MINOR.0 instead of >= VERSION.
  * Change browser command in /etc/purple/prefs.xml to be of type
    'path' instead of 'string', to match what is set by pidgin.
    Thanks to Will Thompson for the fix. (Closes: #456441)
  * Fix FTBFS when doing a "make docs" by adding an appropriate $(top_srcdir)
    before the path to an included file. (Closes: #454549)
  * New upstream release
    - Fixes problems logging into MSN (Closes: #454592)
    - Fixes MSN display name randomly changing (Closes: #454490)
  * New upstream release
    - Fixes Jabber crash in non-UTF-8 locale (Closes: #436236)
    - Fixes problem entering password manually into Jabber (Closes: #446365)
  * 21_zephyr-external.patch
    - Apply patch from Klee Dienes to fix the Zephyr protocol when
      compiled against the system library, as we do (Closes: #451165)
  * Build the Contact Availability Prediction plugin, and make sqlite optional
    (Closes: #448096)
  * Remove 14_xulrunner_nss patch and bump build-depends for libnss3-dev
    (Closes: #450402)
  * New upstream version
    - Fixes a possible crash when parsing invalid HTML (CVE-2007-4999)
  * 00_debian-ca-certs.patch:
    - Make the X.509 certificate authority code look in /etc/ssl/certs and
      make libpurple0 Recommend: ca-certificates. As far as I know
      this is not used in any protocols yet.
  * Fix dpkg-shlibdeps warning when trying to resolve plugin dependencies
    (by making an shlibs.local with empty libjabber and liboscar entries),
    since this will be a failure in the experimental version of dpkg
  * New upstream release
    - Fixes remote DoS (crash) in the MSN protocol (CVE-2007-4996)
    - Fixes wrong file transfer size shown on MSN (Closes: #443447)
  * Remove circular dependencies on libpurple0/-bin (Closes: #444148)
  * New upstream version
    - Fixes tabbed window preference (Closes: #440260)
    - Fixes crash in music messaging plugin when sending message to offline
      buddy (Closes: #441852)
    - Adds option to show protocol icons in buddy list (Closes: #432077)
  * pidgin-dev and finch-dev should depend on libpurple-dev (Closes: #441191)
  * Make finch conflict & replace old versions of gaim (closes: #440351)
  [ Laurent Bigonville ]
  * Bump Standards-Version
  * Split finch out of the pidgin package (Closes: #428678)
  * Split libpurple out of the pidgin package (Closes: #421282)
  * Add override file to quiet lintian a bit
  * Remove symlinks for /usr/share/doc/pidgin{,-dev,-dbg} and really install
    them instead
  [ Ari Pollak ]
  * Move gconf schema into pidgin, so only pidgin needs to depend on gconf
  * Make dh_pidgin add a versioned misc:Conflict on the next major version
    of pidgin, in preparation for getting rid of the pidgin (<< 3.0)
    dependency, and adding dh_purple/dh_finch.
  * New upstream version
  * Update new SVN repository information in debian/control
  * Install Finch's window managers correctly (Closes: #438536)
  * New upstream version
    - Fixes a spelling mistake in MSN (Closes: #427170)
    - Fixes a tray icon scaling problem on vertical panels (Closes: #433909)
  * Make package binNMU-safe (Closes: #430101)
  * Add Depends: python
  * New upstream version (Closes: #429222)
  * Enable SILC support (Closes: #260420)
  * 21_purple-remote_syntax.patch:
    - Fix syntax error in purple-remote script (Closes: #429623)
  * New upstream release
    - Should fix some buddy list synchronization crashes (Closes: #424062)
  * Fix gevolution dependency exclusion
  * Add appropriate Conflicts in addition to Replaces
  * Fix dh_pidgin warning due to current lack of package epoch
  * Remove bashism in debian/rules
  * Make pidgin-dev Replaces: gaim-dev (Closes: #422724)

a2e8d88... by Ari Pollak on 2007-05-08

Import patches-unapplied version 2.0.0+dfsg.1-3 to ubuntu/gutsy

Imported using git-ubuntu import.