Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=0e3ffbec0410a3d96e9a1eaf393a2c38080b7a5c

commit 0e3ffbec0410a3d96e9a1eaf393a2c38080b7a5c
Merge: f656b4b c3d49f1
Author: bouleetbil <[email protected]>
Date:   Fri Apr 22 23:43:14 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 8ee543f,6cab6bd..4020fb0
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@@ -4,15 -4,11 +4,15 @@@
USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"}
USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"}
USE_TCP=${USE_TCP:-"n"}
-USE_GUI=${USE_GUI:-"y"}
+if [ "$CARCH" == "arm" ]; then
+       USE_GUI=${USE_GUI:-"n"}
+else
+       USE_GUI=${USE_GUI:-"y"}
+fi

pkgname=systemd
- pkgver=24
- pkgrel=6
+ pkgver=25
-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')
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to