Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=d1e9126da1d3108864f317f5d7a88fd3cd35e0dc

commit d1e9126da1d3108864f317f5d7a88fd3cd35e0dc
Merge: 43a83d8 b17d2b9
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Wed Apr 6 11:03:33 2011 +0200

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

Conflicts:
source/base/systemd/FrugalBuild

diff --cc source/base/systemd/FrugalBuild
index 3c5ba71,45433a8..a185780
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@@ -7,8 -7,8 +7,8 @@@ USE_TCP=${USE_TCP:-"n"
USE_GUI=${USE_GUI:-"y"}

pkgname=systemd
- pkgver=20
- pkgrel=3
+ pkgver=23
-pkgrel=1
++pkgrel=2
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd";
depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 
'sysvinit-tools')
diff --cc source/lib-extra/libinfinity/FrugalBuild
index 2e8fe92,211481c..841c3ed
--- a/source/lib-extra/libinfinity/FrugalBuild
+++ b/source/lib-extra/libinfinity/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@

pkgname=libinfinity
pkgver=0.5.0
- pkgrel=1
+ pkgrel=2
pkgdesc="libinfinity is an implementation of the Infinote protocol written in 
GObject-based C"
url="http://gobby.0x539.de/trac/wiki/Infinote/Libinfinity";
-depends=('glib2' 'libgsasl>=1.6.0' 'libxml' 'gnutls')
+depends=('libxml2>=2.7.8' 'glib2' 'libgsasl>=1.6.0' 'libxml' 'gnutls')
makedepends=('avahi' 'gtk-doc' 'pkgconfig' 'gtk+2>=2.20.0-2')
groups=('lib-extra')
archs=('i686' 'x86_64')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to