Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=1d5ec16c0b3f3fd196dfbd9b7a7cac630c63be40
commit 1d5ec16c0b3f3fd196dfbd9b7a7cac630c63be40
Author: Devil505 <devil505li...@gmail.com>
Date: Sun Feb 13 12:48:24 2011 +0100
xfce4-dict-0.6.0-3-i686
* resolve conflict
* updating dependspkgver
* repo can be merged
diff --git a/source/xfce4/xfce4-dict/FrugalBuild
b/source/xfce4/xfce4-dict/FrugalBuild
index e073be1..44bab55 100644
--- a/source/xfce4/xfce4-dict/FrugalBuild
+++ b/source/xfce4/xfce4-dict/FrugalBuild
@@ -3,17 +3,10 @@
pkgname=xfce4-dict
pkgver=0.6.0
-<<<<<<< HEAD
-pkgrel=2
+pkgrel=3
pkgdesc="A dictionary application and panel plugin for XFCE"
makedepends=('intltool')
-depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.4')
-=======
-pkgrel=1
-pkgdesc="A dictionary application and panel plugin for XFCE"
-makedepends=('intltool')
-depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4')
->>>>>>> 95adb94b9277a8911bde96682d703f2616478b23
+depends=('libxfcegui4>=4.8.0' 'xfce4-panel>=4.8.0')
groups=('xfce4' 'xfce4-goodies')
archs=('i686' 'x86_64' 'ppc')
conflicts=('xfce4-dict-plugin')
@@ -24,10 +17,7 @@ _F_xfce_category="apps"
_F_xfce_goodies_ext=".tar.bz2"
Finclude xfce4 gnome-scriptlet
sha1sums=('af004096d6bd935d69b7ef3a989470e89c7be99b')
-<<<<<<< HEAD
source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/$pkgname-$pkgver.tar.bz2)
-=======
->>>>>>> 95adb94b9277a8911bde96682d703f2616478b23
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
