summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2011-09-03 01:55:40 +0200
committerpiernov <piernov@piernov.org>2011-09-03 01:55:40 +0200
commit3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15 (patch)
tree31579afa03acc940fe9c5c42ccb341f160c26bd3
parent189aca5c7e2eb7833e215b83c199d823d05dc6ae (diff)
downloadgnome3-3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15.tar.gz
gnome3-3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15.tar.bz2
gnome3-3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15.tar.xz
gnome3-3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15.zip
telepathy-butterfly 0.5.15-1 ajout port
-rw-r--r--telepathy-butterfly/.footprint.i686101
-rw-r--r--telepathy-butterfly/.footprint.x86_64101
-rw-r--r--telepathy-butterfly/.md5sum.i6862
-rw-r--r--telepathy-butterfly/.md5sum.x86_642
-rwxr-xr-xtelepathy-butterfly/Pkgfile22
-rw-r--r--telepathy-butterfly/post-install3
-rw-r--r--telepathy-butterfly/remove-bad-import-from-im-module.patch26
7 files changed, 257 insertions, 0 deletions
diff --git a/telepathy-butterfly/.footprint.i686 b/telepathy-butterfly/.footprint.i686
new file mode 100644
index 0000000..55a47ef
--- /dev/null
+++ b/telepathy-butterfly/.footprint.i686
@@ -0,0 +1,101 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/python2.7/
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/butterfly/
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/__init__.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/__init__.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/__init__.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/aliasing.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/aliasing.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/aliasing.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/avatars.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/avatars.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/avatars.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/capabilities.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/capabilities.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/capabilities.pyo
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/butterfly/channel/
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/__init__.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/__init__.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/__init__.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/conference.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/conference.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/conference.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/contact_list.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/contact_list.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/contact_list.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/file_transfer.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/file_transfer.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/file_transfer.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/group.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/group.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/group.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/im.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/im.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/im.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/media.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/media.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/media.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/muc.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/muc.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/muc.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/text.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/text.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/text.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel_manager.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel_manager.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel_manager.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection_manager.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection_manager.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection_manager.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/contacts.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/contacts.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/contacts.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/debug.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/debug.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/debug.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/handle.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/handle.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/handle.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/mail_notification.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/mail_notification.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/mail_notification.pyo
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/butterfly/media/
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/__init__.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/__init__.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/__init__.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/constants.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/constants.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/constants.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/session_handler.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/session_handler.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/session_handler.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/stream_handler.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/stream_handler.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/stream_handler.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/presence.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/presence.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/presence.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/protocol.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/protocol.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/protocol.pyo
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/butterfly/util/
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/__init__.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/__init__.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/__init__.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/decorator.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/decorator.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/decorator.pyo
+drwxr-xr-x root/root usr/lib/telepathy/
+-rwxr-xr-x root/root usr/lib/telepathy/telepathy-butterfly
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/dbus-1/
+drwxr-xr-x root/root usr/share/dbus-1/services/
+-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.butterfly.service
+drwxr-xr-x root/root usr/share/telepathy/
+drwxr-xr-x root/root usr/share/telepathy/managers/
+-rw-r--r-- root/root usr/share/telepathy/managers/butterfly.manager
diff --git a/telepathy-butterfly/.footprint.x86_64 b/telepathy-butterfly/.footprint.x86_64
new file mode 100644
index 0000000..55a47ef
--- /dev/null
+++ b/telepathy-butterfly/.footprint.x86_64
@@ -0,0 +1,101 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/python2.7/
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/butterfly/
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/__init__.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/__init__.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/__init__.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/aliasing.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/aliasing.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/aliasing.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/avatars.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/avatars.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/avatars.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/capabilities.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/capabilities.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/capabilities.pyo
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/butterfly/channel/
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/__init__.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/__init__.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/__init__.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/conference.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/conference.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/conference.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/contact_list.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/contact_list.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/contact_list.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/file_transfer.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/file_transfer.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/file_transfer.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/group.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/group.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/group.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/im.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/im.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/im.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/media.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/media.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/media.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/muc.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/muc.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/muc.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/text.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/text.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel/text.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel_manager.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel_manager.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/channel_manager.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection_manager.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection_manager.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/connection_manager.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/contacts.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/contacts.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/contacts.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/debug.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/debug.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/debug.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/handle.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/handle.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/handle.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/mail_notification.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/mail_notification.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/mail_notification.pyo
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/butterfly/media/
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/__init__.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/__init__.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/__init__.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/constants.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/constants.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/constants.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/session_handler.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/session_handler.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/session_handler.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/stream_handler.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/stream_handler.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/media/stream_handler.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/presence.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/presence.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/presence.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/protocol.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/protocol.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/protocol.pyo
+drwxr-xr-x root/root usr/lib/python2.7/site-packages/butterfly/util/
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/__init__.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/__init__.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/__init__.pyo
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/decorator.py
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/decorator.pyc
+-rw-r--r-- root/root usr/lib/python2.7/site-packages/butterfly/util/decorator.pyo
+drwxr-xr-x root/root usr/lib/telepathy/
+-rwxr-xr-x root/root usr/lib/telepathy/telepathy-butterfly
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/dbus-1/
+drwxr-xr-x root/root usr/share/dbus-1/services/
+-rw-r--r-- root/root usr/share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.butterfly.service
+drwxr-xr-x root/root usr/share/telepathy/
+drwxr-xr-x root/root usr/share/telepathy/managers/
+-rw-r--r-- root/root usr/share/telepathy/managers/butterfly.manager
diff --git a/telepathy-butterfly/.md5sum.i686 b/telepathy-butterfly/.md5sum.i686
new file mode 100644
index 0000000..4bf2eb4
--- /dev/null
+++ b/telepathy-butterfly/.md5sum.i686
@@ -0,0 +1,2 @@
+08417a06a0e4a1875f1baf4b910cdcf4 remove-bad-import-from-im-module.patch
+4baa6337822f01d817c4b9d8fd406e82 telepathy-butterfly-0.5.15.tar.gz
diff --git a/telepathy-butterfly/.md5sum.x86_64 b/telepathy-butterfly/.md5sum.x86_64
new file mode 100644
index 0000000..4bf2eb4
--- /dev/null
+++ b/telepathy-butterfly/.md5sum.x86_64
@@ -0,0 +1,2 @@
+08417a06a0e4a1875f1baf4b910cdcf4 remove-bad-import-from-im-module.patch
+4baa6337822f01d817c4b9d8fd406e82 telepathy-butterfly-0.5.15.tar.gz
diff --git a/telepathy-butterfly/Pkgfile b/telepathy-butterfly/Pkgfile
new file mode 100755
index 0000000..3c6be6d
--- /dev/null
+++ b/telepathy-butterfly/Pkgfile
@@ -0,0 +1,22 @@
+# Description: Gestionnaire de connexion MSN pour Telepathy
+# URL: http://telepathy.freedesktop.org/
+# Maintainer: NuTyX core team
+# Packager: piernov <piernov@piernov.org>
+# Depends on: papyon, python-telepathy
+# Run on: papyon,python-telepathy
+
+name=telepathy-butterfly
+version=0.5.15
+release=1
+source=(http://${name%-*}.freedesktop.org/releases/$name/$name-$version.tar.gz
+ remove-bad-import-from-im-module.patch)
+
+build() {
+ cd $name-$version
+ patch -p1 < ../remove-bad-import-from-im-module.patch
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/${name%-*}
+ make
+ make DESTDIR=$PKG install
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $PKG/usr/lib/telepathy/telepathy-butterfly
+}
diff --git a/telepathy-butterfly/post-install b/telepathy-butterfly/post-install
new file mode 100644
index 0000000..b38df00
--- /dev/null
+++ b/telepathy-butterfly/post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/bin/killall -HUP dbus-daemon
diff --git a/telepathy-butterfly/remove-bad-import-from-im-module.patch b/telepathy-butterfly/remove-bad-import-from-im-module.patch
new file mode 100644
index 0000000..6580dcc
--- /dev/null
+++ b/telepathy-butterfly/remove-bad-import-from-im-module.patch
@@ -0,0 +1,26 @@
+From 501b46c364c5608d1b3b84dd48fe57abcabd4aea Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Mon, 6 Dec 2010 04:22:45 -0800
+Subject: [PATCH] bugfix: remove bad import from im module
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+---
+ 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.3.2
+