[arch-commits] Commit in telepathy-butterfly/trunk (2 files)

[Ionut Biru]

    Date: Monday, December 6, 2010 @ 07:36:03
  Author: ibiru
Revision: 102171

upgpkg: telepathy-butterfly 0.5.15-1
fix bad import

Added:
  telepathy-butterfly/trunk/0001-bugfix-remove-bad-import-from-im-module.patch
Modified:
  telepathy-butterfly/trunk/PKGBUILD

----------------------------------------------------+
 0001-bugfix-remove-bad-import-from-im-module.patch |   26 +++++++++++++++++++
 PKGBUILD                                           |    7 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)

Added: 0001-bugfix-remove-bad-import-from-im-module.patch
===================================================================
--- 0001-bugfix-remove-bad-import-from-im-module.patch	                        (rev 0)
+++ 0001-bugfix-remove-bad-import-from-im-module.patch	2010-12-06 12:36:03 UTC (rev 102171)
@@ -0,0 +1,26 @@
+From 501b46c364c5608d1b3b84dd48fe57abcabd4aea Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru at 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 at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-06 12:35:05 UTC (rev 102170)
+++ PKGBUILD	2010-12-06 12:36:03 UTC (rev 102171)
@@ -10,12 +10,15 @@
 groups=('telepathy')
 license=('GPL')
 depends=('papyon>=0.5.4' 'python-telepathy>=0.15.19')
-source=(http://telepathy.freedesktop.org/releases/telepathy-butterfly/telepathy-butterfly-${pkgver}.tar.gz)
+source=(http://telepathy.freedesktop.org/releases/telepathy-butterfly/telepathy-butterfly-${pkgver}.tar.gz
+        0001-bugfix-remove-bad-import-from-im-module.patch)
 install=telepathy-butterfly.install
-md5sums=('4baa6337822f01d817c4b9d8fd406e82')
+md5sums=('4baa6337822f01d817c4b9d8fd406e82'
+         '08417a06a0e4a1875f1baf4b910cdcf4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-bugfix-remove-bad-import-from-im-module.patch"
   ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
   make
   make DESTDIR="${pkgdir}" install