Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=ba7ab2b173b0f33e9c8fb4241791fb12bda4a1ef
commit ba7ab2b173b0f33e9c8fb4241791fb12bda4a1ef Merge: 716eae6 9e0a81f Author: bouleetbil <bouleet...@frogdev.info> Date: Sat Mar 5 19:29:41 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/games-extra/gcompris/FrugalBuild source/x11-extra/e16/FrugalBuild diff --cc source/games-extra/gcompris/FrugalBuild index be54020,74a55a2..0050e9e --- a/source/games-extra/gcompris/FrugalBuild +++ b/source/games-extra/gcompris/FrugalBuild @@@ -2,11 -2,11 +2,11 @@@ # Maintainer: crazy <cr...@frugalware.org> pkgname=gcompris - pkgver=9.5 + pkgver=9.6 -pkgrel=1 +pkgrel=2 pkgdesc="Educational application for children" depends=('pygtk>=2.14.1-2' 'gnet' 'python' 'gnucap' 'gstreamer' 'sdl_mixer' 'gnuchess' \ - 'pysqlite2' 'libxml2' 'sdl' 'gtk+2>=2.20.1' 'libxxf86vm>=1.0.2' 'libxdamage' 'sqlite3' \ + 'pysqlite2' 'libxml2>=2.7.8' 'sdl' 'gtk+2>=2.20.1' 'libxxf86vm>=1.0.2' 'libxdamage' 'sqlite3' \ 'tuxpaint' 'pyxml' 'librsvg') rodepends=('gst-plugins-base-alsa' 'gst-plugins-base-ogg' 'gst-plugins-base-oil') makedepends=('perl-xml-parser' 'intltool' 'texi2html' 'gettext' 'libgnomecanvas' 'subversion') # lol diff --cc source/x11-extra/e16/FrugalBuild index abbb9d4,6c72f7a..cc9487c --- a/source/x11-extra/e16/FrugalBuild +++ b/source/x11-extra/e16/FrugalBuild @@@ -3,11 -3,11 +3,11 @@@ # Maintainer: voroskoi <voros...@frugalware.org> pkgname=e16 - pkgver=1.0.2 + pkgver=1.0.7.003 -pkgrel=1 +pkgrel=2 pkgdesc="A fast, flexible, and very extensible Window Manager" pkgdesc_localized=('hu_HU Egy gyors, rugalmas, könnyen kiterjeszthetõ ablakkezelõ.') -depends=('imlib2>=1.4.3-2' 'libxinerama>=1.0.3' 'esd' 'libxft>=2.1.13-2' 'libxcomposite' 'libxdamage' 'libxrandr>=1.3.0' 'libxxf86vm>=1.0.2-1') +depends=('libxml2>=2.7.8' 'imlib2>=1.4.3-2' 'libxinerama>=1.0.3' 'esd' 'libxft>=2.1.13-2' 'libxcomposite' 'libxdamage' 'libxrandr>=1.3.0' 'libxxf86vm>=1.0.2-1') makedepends=('xbitmaps') groups=('x11-extra') _F_sourceforge_dirname="enlightenment"
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git