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

commit d4c48a908e20751a6b386a6c2d66512c0666636f
Author: Devil505 <[email protected]>
Date:   Fri Jun 10 10:07:09 2011 +0200

deluge-1.3.2-1-i686
* fixing conflict with version in current repo

diff --git a/source/gnome-extra/deluge/FrugalBuild 
b/source/gnome-extra/deluge/FrugalBuild
index b396992..4e006df 100644
--- a/source/gnome-extra/deluge/FrugalBuild
+++ b/source/gnome-extra/deluge/FrugalBuild
@@ -5,16 +5,11 @@
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' 'distribute' 'librsvg' \
+depends=('pygtk' 'pyxdg' 'libboost>=1.46.1' 'notify-python' 
'notification-daemon' 'setuptools' 'librsvg' \
'chardet' 'libtorrent-rasterbar-python>=0.15.0' 'twisted')
makedepends=('boost')
groups=('gnome-extra')
@@ -36,3 +31,4 @@ else
fi

# optimization OK
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to