Hello community, here is the log from the commit of package telepathy-butterfly for openSUSE:Factory checked in at Wed Dec 29 00:33:38 CET 2010. -------- --- telepathy-butterfly/telepathy-butterfly.changes 2010-12-07 11:38:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/telepathy-butterfly/telepathy-butterfly.changes 2010-12-27 21:32:44.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 27 20:30:05 UTC 2010 - dimstar@opensuse.org + +- Add telepathy-butterfly-bad-import.patch: remove bad import and, + as a result, fix connection issues to MSN. Patch taken from + upstream git. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- telepathy-butterfly-bad-import.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-butterfly.spec ++++++ --- /var/tmp/diff_new_pack.gOARWH/_old 2010-12-29 00:33:31.000000000 +0100 +++ /var/tmp/diff_new_pack.gOARWH/_new 2010-12-29 00:33:31.000000000 +0100 @@ -19,12 +19,14 @@ Name: telepathy-butterfly Version: 0.5.15 -Release: 1 +Release: 2 License: GPLv2+ Summary: MSN (butterfly) connection manager for Telepathy Url: http://telepathy.freedesktop.org/wiki/ Group: Productivity/Networking/Instant Messenger Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM telepathy-butterfly-bad-import.patch dimstar@opensuse.org -- Remove bad import. Taken from upstream git, commit18b44d +Patch0: telepathy-butterfly-bad-import.patch BuildRequires: fdupes BuildRequires: python Requires: papyon @@ -52,6 +54,7 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ telepathy-butterfly-bad-import.patch ++++++ From: Ionut Biru <ibiru@archlinux.org> Date: Mon, 6 Dec 2010 12:22:45 +0000 (-0800) Subject: bugfix: remove bad import from im module X-Git-Url: http://git.collabora.co.uk/?p=telepathy-butterfly.git;a=commitdiff_plain;h=1... bugfix: remove bad import from im module Signed-off-by: Ionut Biru <ibiru@archlinux.org> Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> --- 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') ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org