[arch-commits] Commit in telepathy-butterfly/repos (12 files)
Ionut Biru
ibiru at archlinux.org
Thu Feb 23 12:45:25 UTC 2012
Date: Thursday, February 23, 2012 @ 07:45:25
Author: ibiru
Revision: 150850
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
telepathy-butterfly/repos/extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch
(from rev 150849, telepathy-butterfly/trunk/0001-bugfix-remove-bad-import-from-im-module.patch)
telepathy-butterfly/repos/extra-i686/PKGBUILD
(from rev 150849, telepathy-butterfly/trunk/PKGBUILD)
telepathy-butterfly/repos/extra-i686/telepathy-butterfly.install
(from rev 150849, telepathy-butterfly/trunk/telepathy-butterfly.install)
telepathy-butterfly/repos/extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch
(from rev 150849, telepathy-butterfly/trunk/0001-bugfix-remove-bad-import-from-im-module.patch)
telepathy-butterfly/repos/extra-x86_64/PKGBUILD
(from rev 150849, telepathy-butterfly/trunk/PKGBUILD)
telepathy-butterfly/repos/extra-x86_64/telepathy-butterfly.install
(from rev 150849, telepathy-butterfly/trunk/telepathy-butterfly.install)
Deleted:
telepathy-butterfly/repos/extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch
telepathy-butterfly/repos/extra-i686/PKGBUILD
telepathy-butterfly/repos/extra-i686/telepathy-butterfly.install
telepathy-butterfly/repos/extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch
telepathy-butterfly/repos/extra-x86_64/PKGBUILD
telepathy-butterfly/repos/extra-x86_64/telepathy-butterfly.install
-----------------------------------------------------------------+
extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch | 52 ++++-----
extra-i686/PKGBUILD | 56 +++++-----
extra-i686/telepathy-butterfly.install | 26 ++--
extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch | 52 ++++-----
extra-x86_64/PKGBUILD | 56 +++++-----
extra-x86_64/telepathy-butterfly.install | 26 ++--
6 files changed, 134 insertions(+), 134 deletions(-)
Deleted: extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch
===================================================================
--- extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch 2012-02-23 12:44:42 UTC (rev 150849)
+++ extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch 2012-02-23 12:45:25 UTC (rev 150850)
@@ -1,26 +0,0 @@
-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
-
Copied: telepathy-butterfly/repos/extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch (from rev 150849, telepathy-butterfly/trunk/0001-bugfix-remove-bad-import-from-im-module.patch)
===================================================================
--- extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch (rev 0)
+++ extra-i686/0001-bugfix-remove-bad-import-from-im-module.patch 2012-02-23 12:45:25 UTC (rev 150850)
@@ -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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-23 12:44:42 UTC (rev 150849)
+++ extra-i686/PKGBUILD 2012-02-23 12:45:25 UTC (rev 150850)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Daniel Balieiro <daniel at balieiro.com>
-pkgname=telepathy-butterfly
-pkgver=0.5.15
-pkgrel=1
-pkgdesc="A MSN connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-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
- 0001-bugfix-remove-bad-import-from-im-module.patch)
-install=telepathy-butterfly.install
-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
-
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- "${pkgdir}/usr/lib/telepathy/telepathy-butterfly"
-}
Copied: telepathy-butterfly/repos/extra-i686/PKGBUILD (from rev 150849, telepathy-butterfly/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-23 12:45:25 UTC (rev 150850)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Daniel Balieiro <daniel at balieiro.com>
+pkgname=telepathy-butterfly
+pkgver=0.5.15
+pkgrel=2
+pkgdesc="A MSN connection manager for Telepathy"
+arch=('i686' 'x86_64')
+url="http://telepathy.freedesktop.org"
+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
+ 0001-bugfix-remove-bad-import-from-im-module.patch)
+install=telepathy-butterfly.install
+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
+
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ "${pkgdir}/usr/lib/telepathy/telepathy-butterfly"
+}
Deleted: extra-i686/telepathy-butterfly.install
===================================================================
--- extra-i686/telepathy-butterfly.install 2012-02-23 12:44:42 UTC (rev 150849)
+++ extra-i686/telepathy-butterfly.install 2012-02-23 12:45:25 UTC (rev 150850)
@@ -1,13 +0,0 @@
-post_install() {
- killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
Copied: telepathy-butterfly/repos/extra-i686/telepathy-butterfly.install (from rev 150849, telepathy-butterfly/trunk/telepathy-butterfly.install)
===================================================================
--- extra-i686/telepathy-butterfly.install (rev 0)
+++ extra-i686/telepathy-butterfly.install 2012-02-23 12:45:25 UTC (rev 150850)
@@ -0,0 +1,13 @@
+post_install() {
+ killall -HUP dbus-daemon 2>&1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch
===================================================================
--- extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch 2012-02-23 12:44:42 UTC (rev 150849)
+++ extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch 2012-02-23 12:45:25 UTC (rev 150850)
@@ -1,26 +0,0 @@
-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
-
Copied: telepathy-butterfly/repos/extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch (from rev 150849, telepathy-butterfly/trunk/0001-bugfix-remove-bad-import-from-im-module.patch)
===================================================================
--- extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch (rev 0)
+++ extra-x86_64/0001-bugfix-remove-bad-import-from-im-module.patch 2012-02-23 12:45:25 UTC (rev 150850)
@@ -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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-23 12:44:42 UTC (rev 150849)
+++ extra-x86_64/PKGBUILD 2012-02-23 12:45:25 UTC (rev 150850)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Daniel Balieiro <daniel at balieiro.com>
-pkgname=telepathy-butterfly
-pkgver=0.5.15
-pkgrel=1
-pkgdesc="A MSN connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-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
- 0001-bugfix-remove-bad-import-from-im-module.patch)
-install=telepathy-butterfly.install
-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
-
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- "${pkgdir}/usr/lib/telepathy/telepathy-butterfly"
-}
Copied: telepathy-butterfly/repos/extra-x86_64/PKGBUILD (from rev 150849, telepathy-butterfly/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-23 12:45:25 UTC (rev 150850)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Daniel Balieiro <daniel at balieiro.com>
+pkgname=telepathy-butterfly
+pkgver=0.5.15
+pkgrel=2
+pkgdesc="A MSN connection manager for Telepathy"
+arch=('i686' 'x86_64')
+url="http://telepathy.freedesktop.org"
+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
+ 0001-bugfix-remove-bad-import-from-im-module.patch)
+install=telepathy-butterfly.install
+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
+
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ "${pkgdir}/usr/lib/telepathy/telepathy-butterfly"
+}
Deleted: extra-x86_64/telepathy-butterfly.install
===================================================================
--- extra-x86_64/telepathy-butterfly.install 2012-02-23 12:44:42 UTC (rev 150849)
+++ extra-x86_64/telepathy-butterfly.install 2012-02-23 12:45:25 UTC (rev 150850)
@@ -1,13 +0,0 @@
-post_install() {
- killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
Copied: telepathy-butterfly/repos/extra-x86_64/telepathy-butterfly.install (from rev 150849, telepathy-butterfly/trunk/telepathy-butterfly.install)
===================================================================
--- extra-x86_64/telepathy-butterfly.install (rev 0)
+++ extra-x86_64/telepathy-butterfly.install 2012-02-23 12:45:25 UTC (rev 150850)
@@ -0,0 +1,13 @@
+post_install() {
+ killall -HUP dbus-daemon 2>&1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list