Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b228231efa05b7ca1c02bf42ed97009d0855feec
commit b228231efa05b7ca1c02bf42ed97009d0855feec Author: bouleetbil <bouleet...@frogdev.info> Date: Sun Feb 6 00:36:05 2011 +0100 telepathy-butterfly-0.5.15-2-i686 *fixes depends *added patch (fix import new papyon) *msn empathy works ! diff --git a/source/lib-extra/telepathy-butterfly/FixImport.diff b/source/lib-extra/telepathy-butterfly/FixImport.diff new file mode 100644 index 0000000..ba1b75d --- /dev/null +++ b/source/lib-extra/telepathy-butterfly/FixImport.diff @@ -0,0 +1,27 @@ +From 18b44dd2909b2cb75e8cc91a80f6e6b8ba253a7f Mon Sep 17 00:00:00 2001 +From: Ionut Biru <ib...@archlinux.org> +Date: Mon, 6 Dec 2010 04:22:45 -0800 +Subject: [PATCH 1/1] bugfix: remove bad import from im module + +Signed-off-by: Ionut Biru <ib...@archlinux.org> +Signed-off-by: Jonny Lamb <jonny.l...@collabora.co.uk> +--- + butterfly/channel/im.py | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py +index 1781234..ac8dd44 100644 +--- a/butterfly/channel/im.py ++++ b/butterfly/channel/im.py +@@ -30,8 +30,6 @@ import papyon.event + + from butterfly.channel.text import ButterflyTextChannel + +-from butterfly.Channel_Interface_Conference import CHANNEL_INTERFACE_CONFERENCE +- + __all__ = ['ButterflyImChannel'] + + logger = logging.getLogger('Butterfly.ImChannel') +-- +1.7.2.3 + diff --git a/source/lib-extra/telepathy-butterfly/FrugalBuild b/source/lib-extra/telepathy-butterfly/FrugalBuild index ac49bce..6fa6092 100644 --- a/source/lib-extra/telepathy-butterfly/FrugalBuild +++ b/source/lib-extra/telepathy-butterfly/FrugalBuild @@ -3,12 +3,13 @@ pkgname=telepathy-butterfly pkgver=0.5.15 -pkgrel=1 +pkgrel=2 pkgdesc="An MSN connection manager for Telepathy" url="http://telepathy.freedesktop.org/releases/$pkgname" up2date="lynx -dump $url | Flasttar" -source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -depends=('telepathy-python' 'papyon') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz FixImport.diff) +depends=('telepathy-python' 'papyon' 'libproxy-python') groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('73c9dba9f97ae5a6d981485e5f51c5930168f8ce') +sha1sums=('73c9dba9f97ae5a6d981485e5f51c5930168f8ce' \ + 'e5722bff7fd7cd924b1d22c7f47cc655a951a277') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git