Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=0d67d5bddb9d5930c3b8ddae34b0632f22b4bcfe
commit 0d67d5bddb9d5930c3b8ddae34b0632f22b4bcfe Merge: c1c8b4e 4d45fc5 Author: bouleetbil <bouleet...@frogdev.info> Date: Mon Apr 4 12:46:49 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 08be4cf,8f5436c..342c279 --- 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=7 +pkgver=0.4.4 - pkgrel=5 ++pkgrel=6 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 6e4f26f,085a6b0..db0a407 --- 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=6 +pkgver=2.91.94 - pkgrel=2 ++pkgrel=3 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
