[Pkg-telepathy-commits] [SCM] Butterfly packaging branch, debian, updated. debian/0.5.14-1-8-ga1f0c03

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 6a246cb7ea6f9c0623525a91d75c393fca65ab93
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Jan 11 19:55:57 2011 +0100

    debian/patches/0001-remove_bad_import.patch: Fix bad import

diff --git a/debian/changelog b/debian/changelog
index 3a61a48..d20f69f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
 telepathy-butterfly (0.5.15-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - Should works with papyon 0.5.4 (Closes: #609358)
   * debian/control:
     - Bump debhelper version to 8
     - Bump python-telepathy and python-papyon dependencies
   * debian/compat: Bump compat version to 8
   * Switch to dpkg-source 3.0 (quilt) format
+  * debian/patches/0001-remove_bad_import.patch: Fix bad import
 
- -- Laurent Bigonville <bigon at debian.org>  Thu, 30 Dec 2010 18:44:53 +0100
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 11 Jan 2011 19:53:44 +0100
 
 telepathy-butterfly (0.5.14-1) experimental; urgency=low
 
diff --git a/debian/patches/0001-remove_bad_import.patch b/debian/patches/0001-remove_bad_import.patch
new file mode 100644
index 0000000..80dcf1e
--- /dev/null
+++ b/debian/patches/0001-remove_bad_import.patch
@@ -0,0 +1,24 @@
+From: Ionut Biru <ibiru at 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=18b44dd2909
+
+bugfix: remove bad import from im module
+
+Signed-off-by: Ionut Biru <ibiru at archlinux.org>
+Signed-off-by: Jonny Lamb <jonny.lamb at 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')
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4c727e7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-remove_bad_import.patch

-- 
Butterfly packaging