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

commit 4032cc1ad4a01fcb92187b2022ddcc8e87e7b852
Merge: 17a8cd0 391c32a
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Tue May 10 23:28:04 2011 +0200

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

Conflicts:
source/gnome/eog/FrugalBuild
source/xfce4/xfce4-session/FrugalBuild

diff --cc source/gnome/eog/FrugalBuild
index b94bef9,2967f77..238cdf4
--- 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.0.1
+ pkgver=3.1.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-2' 'lcms' 'libart_lgpl' 'libpeas-gtk')
+        'gnome-desktop>=3.0.1' 'lcms2' 'libart_lgpl' 'libpeas-gtk')
makedepends=('intltool' 'gnome-doc-utils>=0.16.0')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/xfce4/xfce4-session/FrugalBuild
index 2ee1ca4,a72eb40..de5772b
--- a/source/xfce4/xfce4-session/FrugalBuild
+++ b/source/xfce4/xfce4-session/FrugalBuild
@@@ -3,7 -3,7 +3,7 @@@

pkgname=xfce4-session
pkgver=4.8.1
--pkgrel=2
++pkgrel=3
pkgdesc="A session manager for Xfce4."
url="http://www.xfce.org/";
depends=('libsm>=1.1.0' 'libxfce4ui>=4.8.0' 'libxfce4util>=4.8.1' 
'xfce4-panel>=4.8.0' \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to