Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e4ef47b91b97f896779c98c966ad9c5acb43961
commit 5e4ef47b91b97f896779c98c966ad9c5acb43961 Author: Slown <[email protected]> Date: Fri Sep 7 10:44:58 2012 +0100 Revert "pyalsa-1.0.26-1-i686" This reverts commit c27818f2d93615d59c2324b0c9a507daf633cea0. Conflicts: source/lib-extra/pyalsa/FrugalBuild diff --git a/source/lib-extra/pyalsa/FrugalBuild b/source/lib-extra/pyalsa/FrugalBuild index 2dd1d23..dfb1882 100644 --- a/source/lib-extra/pyalsa/FrugalBuild +++ b/source/lib-extra/pyalsa/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: 0.03 SBU +# Compiling Time: 0.04 SBU # Maintainer: Slown <[email protected]> pkgname=pyalsa -pkgver=1.0.26 +pkgver=1.0.25 pkgrel=1 pkgdesc="Python bindings for ALSA lib" url="http://alsa-project.org"; @@ -11,6 +11,10 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=(ftp://ftp.alsa-project.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2) +<<<<<<< HEAD sha1sums=('169e2601f5273ec9ec4100d4ba31114e8a4b6d66') +======= +sha1sums=('8eb7e94bf096ca8bd3423214712d4e01f2012eb8') +>>>>>>> parent of c27818f... pyalsa-1.0.26-1-i686 # optimization OK diff --git a/source/lib-extra/python-gevent/FrugalBuild b/source/lib-extra/python-gevent/FrugalBuild index 3050871..1a5f9bf 100644 --- a/source/lib-extra/python-gevent/FrugalBuild +++ b/source/lib-extra/python-gevent/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.01 SBU +# Compiling Time: 0.06 SBU # Maintainer: Slown <[email protected]> pkgname=python-gevent _F_archive_name="gevent" -pkgver=0.13.7 +pkgver=0.13.8 pkgrel=1 pkgdesc="Python network library that uses greenlet and libevent for easy and scalable concurrency" depends=('python-greenlet' 'libevent') @@ -12,6 +12,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') _F_pypi_name="gevent" Finclude pypi -sha1sums=('2b9c63b84e21a36e244a7c825b9bdbaa98b7ec66') +sha1sums=('70f87c67496362a0d57be39e3acda6808a269842') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
