Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=0597b2006646d9c4763ee8f8b7df32ac0140d939

commit 0597b2006646d9c4763ee8f8b7df32ac0140d939
Merge: 4032cc1 97428ad
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Wed May 11 20:45:18 2011 +0200

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

Conflicts:
source/gnome/eog/FrugalBuild

diff --cc source/gnome/eog/FrugalBuild
index 238cdf4,8b8a2e3..d6204f2
--- a/source/gnome/eog/FrugalBuild
+++ b/source/gnome/eog/FrugalBuild
@@@ -3,11 -3,11 +3,11 @@@
# Contributor: Christian Hamar alias krix <kr...@linuxforum.hu>

pkgname=eog
- pkgver=3.1.1
+ pkgver=3.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="An image viewing and cataloging program for GNOME"
depends=('libxml2>=2.7.8' 'libexif' 'rarian' 'desktop-file-utils' 'python>=2.7' 
\
-        'gnome-desktop>=3.0.1' 'lcms2' 'libart_lgpl' 'libpeas-gtk')
+        'gnome-desktop>=3.0.1' 'lcms' 'libart_lgpl' 'libpeas-gtk')
makedepends=('intltool' 'gnome-doc-utils>=0.16.0')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to