Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=distribute.git;a=commitdiff;h=e851977d6c0c8e140a5a9b510d8dbd65be19e65b

commit e851977d6c0c8e140a5a9b510d8dbd65be19e65b
Merge: 3dea95d f055f9e
Author: Devil505 <devil505li...@gmail.com>
Date:   Fri Jun 10 10:05:14 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/devel-extra/desktopcouch/FrugalBuild
source/devel-extra/python-distutils-extra/FrugalBuild
source/gnome-extra/deluge/FrugalBuild
source/gnome-extra/gwibber/FrugalBuild
source/gnome-extra/pitivi/FrugalBuild
source/gnome-extra/turpial/FrugalBuild

diff --cc source/devel-extra/desktopcouch/FrugalBuild
index 85b6a65,539efcb..a331cfd
--- a/source/devel-extra/desktopcouch/FrugalBuild
+++ b/source/devel-extra/desktopcouch/FrugalBuild
@@@ -5,8 -5,10 +5,10 @@@ pkgname=desktopcouc
pkgver=1.0.7
pkgrel=2
pkgdesc="Desktop-oriented interface to CouchDB"
- depends=('gnome-keyring' 'couchdb' 'gnome-python-desktop' 'python-couchdb' 
'python-oauth' 'pyxdg')
+ rodepends=('ubuntu-sso-client')
+ depends=('gnome-keyring' 'couchdb' 'gnome-python-desktop' 'python-couchdb' 
'python-oauth' 'pyxdg' \
+       'twisted' 'avahi-python')
-makedepends=('python-distutils-extra>=2.19-3' 'setuptools' 'intltool')
+makedepends=('python-distutils-extra>=2.19-3' 'distribute' 'intltool')
groups=('devel-extra')
archs=('i686' 'x86_64')
Finclude launchpad
diff --cc source/devel-extra/python-distutils-extra/FrugalBuild
index f8d2fe2,f1807ff..48b4240
--- a/source/devel-extra/python-distutils-extra/FrugalBuild
+++ b/source/devel-extra/python-distutils-extra/FrugalBuild
@@@ -2,15 -2,15 +2,14 @@@
# Maintainer: Priyank Gosalia <priyan...@gmail.com>

pkgname=python-distutils-extra
- pkgver=2.26
- pkgrel=2
+ pkgver=2.27
+ pkgrel=1
pkgdesc="provides additional functions to Python's distutils and setuptools"
url="https://launchpad.net/python-distutils-extra";
-depends=('python>=2.7' 'setuptools')
+depends=('python>=2.7' 'distribute')
groups=('devel-extra')
archs=('i686' 'x86_64' 'ppc')
up2date="Flasttar $url"
source=($url/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz)
- sha1sums=('6af0a6f7edb929cfb9515b0c521d5091fa6acd44')
-
+ sha1sums=('5b86ede5c4aa2e58c2669df1badb365bf3ba47e2')

-
diff --cc source/gnome-extra/deluge/FrugalBuild
index a9c0c30,8fe0278..b396992
--- a/source/gnome-extra/deluge/FrugalBuild
+++ b/source/gnome-extra/deluge/FrugalBuild
@@@ -2,12 -2,14 +2,19 @@@
# Maintainer: Michel Hermier <herm...@frugalware.org>
# Contributor: Artur Grunau <gree...@gmail.com>

+ USE_DEVEL=${USE_DEVEL:-"n"}
+
pkgname=deluge
++<<<<<<< HEAD
+pkgver=1.3.1
+pkgrel=3
++=======
+ pkgver=1.3.2
+ pkgrel=1
++>>>>>>> f055f9edc0bbfde5441d9b21964ad4635c347853
pkgdesc="BitTorrent client written in Python and GTK+."
url="http://deluge-torrent.org/";
-depends=('pygtk' 'pyxdg' 'libboost>=1.46.1' 'notify-python' 
'notification-daemon' 'setuptools' 'librsvg' \
+depends=('pygtk' 'pyxdg' 'libboost>=1.46.1' 'notify-python' 
'notification-daemon' 'distribute' 'librsvg' \
'chardet' 'libtorrent-rasterbar-python>=0.15.0' 'twisted')
makedepends=('boost')
groups=('gnome-extra')
diff --cc source/gnome-extra/gwibber/FrugalBuild
index 9ceade0,a8cd1e8..628c41f
--- a/source/gnome-extra/gwibber/FrugalBuild
+++ b/source/gnome-extra/gwibber/FrugalBuild
@@@ -13,9 -13,8 +13,9 @@@ makedepends=('distribute' 'python-distu
options=('scriptlet')
groups=('gnome-extra')
_F_gnome_desktop="y"
- _F_launchpad_branch="3.0"
+ _F_launchpad_branch="3.2"
Finclude gnome-scriptlet launchpad
- 
source=($url/$_F_launchpad_branch/$_F_launchpad_branch/+download/$pkgname-$pkgver.tar.gz)
archs=('i686' 'x86_64')
- sha1sums=('eba3e898009c655912537dc7dd2ca6dc4272bad6')
+ sha1sums=('cd4f835866d4f4185529ca06842d52e763f0d8ac')
replaces=('twitux')
++
diff --cc source/gnome-extra/pitivi/FrugalBuild
index 08895c2,286f3a2..526db53
--- a/source/gnome-extra/pitivi/FrugalBuild
+++ b/source/gnome-extra/pitivi/FrugalBuild
@@@ -6,16 -6,15 +6,16 @@@ pkgver=0.14.
pkgrel=2
pkgdesc="A non-linear video editor in GNOME desktop"
url="http://www.gnome.org";
- depends=('gstreamer' 'python' 'pygoocanvas' \
+ depends=('gstreamer' 'python' 'pygoocanvas' 'gnonlin' \
'pygtk' 'gnome-python' 'gst-python' \
'gnonlin' 'gst-plugins-base' 'gst-ffmpeg' \
-       'gst-plugins-good-png' 'setuptools' 'zopeinterface')
+       'gst-plugins-good-png' 'distribute' 'zopeinterface')
makedepends=('perl-xml-parser' 'intltool')
options=('scriptlet')
groups=('gnome-extra')
archs=('i686' 'x86_64' 'ppc')
_F_gnome_iconcache="y"
_F_gnome_desktop="y"
- _F_gnome_devel="y"
Finclude gnome gnome-scriptlet
- sha1sums=('294042289ed016a4d8a746402ba2fc94db149fa1')
+ sha1sums=('b2f0bc6c85bc7f4e76c8c8451cad4d30ee234f65')
++
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to