Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=7a9c7f6ad0261e648fa0d33e2aa97a4584134be9
commit 7a9c7f6ad0261e648fa0d33e2aa97a4584134be9 Merge: e0d7468 1d460bf Author: bouleetbil <bouleet...@frogdev.info> Date: Thu Mar 31 20:36:06 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/apps/consolekit/FrugalBuild source/gnome/gdm/FrugalBuild diff --cc source/apps/consolekit/FrugalBuild index 503a01a,6536d4e..08be4cf --- a/source/apps/consolekit/FrugalBuild +++ b/source/apps/consolekit/FrugalBuild @@@ -3,15 -3,14 +3,15 @@@ pkgname=consolekit _F_archive_name="ConsoleKit" -pkgver=0.4.3 -pkgrel=6 +pkgver=0.4.4 - pkgrel=4 ++pkgrel=5 pkgdesc="Framework for defining and tracking users, login sessions and seats." url="http://www.freedesktop.org/wiki/Software/ConsoleKit"; -source=(http://www.freedesktop.org/software/ConsoleKit/dist/$_F_archive_name-$pkgver.tar.bz2 rc.xconsolekit \ - consolekit-0.4.0-polkit-automagic.patch) +source=(http://www.freedesktop.org/software/ConsoleKit/dist/$_F_archive_name-$pkgver.tar.bz2 \ + consolekit-0.4.0-polkit-automagic.patch \ + pam-foreground-compat.ck) up2date="Flasttar http://www.freedesktop.org/software/ConsoleKit/dist"; -depends=('dbus-glib' 'zlib' 'pam' 'polkit') +depends=('dbus-glib' 'zlib' 'pam' 'polkit>=0.101') groups=('apps') archs=('i686' 'x86_64' 'ppc') Fconfopts="$Fconfopts --enable-pam-module --with-pam-module-dir=/lib/security --with-systemdsystemunitdir=/lib/systemd/system" diff --cc source/gnome/gdm/FrugalBuild index 5a59747,d4c9276..6e4f26f --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@@ -2,8 -2,8 +2,8 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=gdm -pkgver=2.32.0 -pkgrel=5 +pkgver=2.91.94 - pkgrel=1 ++pkgrel=2 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/"; backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin) _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
