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

commit 3e7f31b1cf175c3ebf62e638ca0e543ca311a913
Merge: 4b5c887 e7125f2
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Fri Jan 29 03:38:47 2010 +0100

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (1164 
commits)

Conflicts:
source/apps/hal/FrugalBuild

diff --cc source/apps/hal/FrugalBuild
index 47ebba9,fc66aad..edb6703
--- a/source/apps/hal/FrugalBuild
+++ b/source/apps/hal/FrugalBuild
@@@ -3,8 -3,8 +3,8 @@@
# Contributor: Christian Hamar alias krix <kr...@linuxforum.hu>

pkgname=hal
- pkgver=0.5.11
- pkgrel=10
+ pkgver=0.5.14
-pkgrel=4
++pkgrel=5
pkgdesc="Hardware Abstraction Layer"
url="http://www.freedesktop.org/wiki/Software/hal";
depends=('dbus-glib>=0.74' 'udev>=132' 'util-linux-ng>=2.15' 'glib2' 'libcap' 
'dbus>=1.2.12-4' \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to