Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=c367f118f6125999846654f639cafb052f3fe251
commit c367f118f6125999846654f639cafb052f3fe251 Merge: 6fe9be6 2c78931 Author: bouleetbil <bouleet...@frogdev.info> Date: Wed Feb 16 21:25:00 2011 +0000 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/network/bind/FrugalBuild source/xapps-extra/sakura/FrugalBuild source/xfce4/ristretto/FrugalBuild source/xfce4/xfce4-cpugraph-plugin/FrugalBuild source/xfce4/xfce4-diskperf-plugin/FrugalBuild source/xfce4/xfce4-notes-plugin/FrugalBuild source/xfce4/xfce4-taskmanager/FrugalBuild source/xlib/libxklavier/FrugalBuild diff --cc source/xapps-extra/sakura/FrugalBuild index a33b06a,987ada4..83a4631 --- a/source/xapps-extra/sakura/FrugalBuild +++ b/source/xapps-extra/sakura/FrugalBuild @@@ -2,11 -2,11 +2,11 @@@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=sakura - pkgver=2.3.8 - pkgrel=2 + pkgver=2.4.0 + pkgrel=1 pkgdesc="Sakura is a terminal emulator based on GTK and VTE." url="http://pleyades.net/david/sakura.php"; -depends=('gtk+2>=2.20.0-2' 'libxau>=1.0.4' 'libxdmcp' 'vte>=0.24.0-2' 'libxft' 'libxdamage' 'libxml2' 'libice' 'ncurses') +depends=('gtk+2>=2.20.0-2' 'libxau>=1.0.4' 'libxdmcp' 'vte>=0.24.0-2' 'libxft' 'libxdamage' 'libxml2>=2.7.8' 'libice' 'ncurses') makedepends=('cmake') options=('scriptlet') groups=('xapps-extra') diff --cc source/xlib/libxklavier/FrugalBuild index 779d37d,473630b..ced2956 --- a/source/xlib/libxklavier/FrugalBuild +++ b/source/xlib/libxklavier/FrugalBuild @@@ -2,13 -2,15 +2,14 @@@ # Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu> pkgname=libxklavier -pkgver=5.0 -pkgrel=2 ++<<<<<<< HEAD +pkgver=5.1 +pkgrel=1 pkgdesc="Utility library to make XKB stuff easier" -_F_sourceforge_dirname="gswitchit" -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge +Finclude gnome url="http://gswitchit.sourceforge.net/"; makedepends=('gtk-doc') -depends=('libxkbfile>=1.0.5' 'libxml2' 'libxt>=1.0.5-2' 'iso-codes') +depends=('libxkbfile>=1.0.5' 'libxml2>=2.7.8' 'libxt>=1.0.5-2' 'iso-codes') groups=('xlib') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
