summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-10-28 16:02:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-10-28 16:02:50 +0000
commitb421b0e8e644cafd13f8c697c66ed483d8828e96 (patch)
tree5f17a18d97660c49f7a5ccec128a32782ad511c6 /sys-auth/consolekit
parenttidy (diff)
downloadgentoo-2-b421b0e8e644cafd13f8c697c66ed483d8828e96.tar.gz
gentoo-2-b421b0e8e644cafd13f8c697c66ed483d8828e96.tar.bz2
gentoo-2-b421b0e8e644cafd13f8c697c66ed483d8828e96.zip
Fix typo in 90-consolekit, see ChangeLog for details
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth/consolekit')
-rw-r--r--sys-auth/consolekit/ChangeLog8
-rw-r--r--sys-auth/consolekit/consolekit-0.4.2-r4.ebuild (renamed from sys-auth/consolekit/consolekit-0.4.2-r3.ebuild)4
-rw-r--r--sys-auth/consolekit/files/90-consolekit-3 (renamed from sys-auth/consolekit/files/90-consolekit-2)2
3 files changed, 10 insertions, 4 deletions
diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index c792b757c198..0c1cb92ec749 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-auth/consolekit
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.79 2010/10/27 19:10:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.80 2010/10/28 16:02:49 ssuominen Exp $
+
+*consolekit-0.4.2-r4 (28 Oct 2010)
+
+ 28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +consolekit-0.4.2-r4.ebuild, +files/90-consolekit-3:
+ Change variable "STARTUP" to "command" wrt #343033 by Matthew Turnbull.
27 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
consolekit-0.4.2-r3.ebuild:
diff --git a/sys-auth/consolekit/consolekit-0.4.2-r3.ebuild b/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild
index 8254b73c0033..86ca001a997b 100644
--- a/sys-auth/consolekit/consolekit-0.4.2-r3.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.2-r3.ebuild,v 1.2 2010/10/27 19:10:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.2-r4.ebuild,v 1.1 2010/10/28 16:02:49 ssuominen Exp $
EAPI=3
inherit autotools eutils linux-info multilib pam
@@ -78,7 +78,7 @@ src_install() {
keepdir /var/log/ConsoleKit
exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/90-consolekit-2 90-consolekit || die
+ newexe "${FILESDIR}"/90-consolekit-3 90-consolekit || die
exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
doexe "${FILESDIR}"/pam-foreground-compat.ck || die
diff --git a/sys-auth/consolekit/files/90-consolekit-2 b/sys-auth/consolekit/files/90-consolekit-3
index f0082a7f6445..358fc24f1a72 100644
--- a/sys-auth/consolekit/files/90-consolekit-2
+++ b/sys-auth/consolekit/files/90-consolekit-3
@@ -28,5 +28,5 @@ is_on_console() {
# calls if we have $GDMSESSION
if [ -z "$GDMSESSION" ] && [ -x "$CK_LAUNCH_SESSION" ] && \
( [ -z "$XDG_SESSION_COOKIE" ] || is_on_console ) ; then
- STARTUP="$CK_LAUNCH_SESSION $STARTUP"
+ command="$CK_LAUNCH_SESSION $command"
fi