diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-03-23 07:56:22 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-03-23 07:56:22 +0000 |
| commit | d4f9a302e7d486af786835e8898f5e69eaa0bfd8 (patch) | |
| tree | 4d0b26ac8d3e89fcda81927a2ade5815a86e9414 | |
| parent | Stable for x86. See bug #122727 (diff) | |
| download | historical-d4f9a302e7d486af786835e8898f5e69eaa0bfd8.tar.gz historical-d4f9a302e7d486af786835e8898f5e69eaa0bfd8.tar.bz2 historical-d4f9a302e7d486af786835e8898f5e69eaa0bfd8.zip | |
(#118072) Don't choose twm over valid XSESSION setting when the session isn't in /etc/X11/Sessions/.
Package-Manager: portage-2.1_pre6-r3
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/Manifest | 22 | ||||
| -rw-r--r-- | x11-apps/xinit/files/chooser.sh | 5 |
3 files changed, 12 insertions, 21 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 4108519ce5eb..d74f7ae2315d 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.37 2006/03/09 13:58:54 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.38 2006/03/23 07:56:22 spyderous Exp $ + + 23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; files/chooser.sh: + (#118072) Don't choose twm over valid XSESSION setting when the session + isn't in /etc/X11/Sessions/. 09 Mar 2006; Aron Griffis <agriffis@gentoo.org> xinit-1.0.1.ebuild: Mark 1.0.1 ~ia64 diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 2cc1705cea59..b47da5b1a6ec 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -1,15 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 6cb078dde31c3252c927c74b4f537332 ChangeLog 5777 -RMD160 640f6e9b56a57e60f198854b62f315dcfd16ba80 ChangeLog 5777 -SHA256 6c030dc544ca97b8109d14bf967df34ff2c9a7ee4c8f38678362f7f97cca6bdf ChangeLog 5777 +MD5 2701ff7aea9c92f04fa40c456294a687 ChangeLog 5957 +RMD160 48a3b3e05e1553a918b20673a00570eff2c43f82 ChangeLog 5957 +SHA256 a7b73c17435762c05012515f4d121df20eb4d9edbf1e086210bb786a35c06293 ChangeLog 5957 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 files/Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 files/Xsession 2187 -MD5 2b07bc84cc3afab6b4de90b9e9c597c3 files/chooser.sh 1566 -RMD160 b312bd0706c006c74f2bf8a5b7df67d4d8fa5329 files/chooser.sh 1566 -SHA256 8a16398562f5ac3cb160f9106aa893e59dde829defc11e2610bb40cc7a906c66 files/chooser.sh 1566 +MD5 821912b0616c553a799e8404376e0158 files/chooser.sh 1506 +RMD160 164d582885f01a71bd5b6e6d824fcfcbedba2e9c files/chooser.sh 1506 +SHA256 e262a03579fd353020bac38213bfb9821875644b6f06228874f2c1d90d7a47a0 files/chooser.sh 1506 MD5 4686d293802146ed86fd4d03ca03e9fc files/digest-xinit-1.0.1 235 RMD160 099c9dd49163adfdd882a12c5cb037f7012c1623 files/digest-xinit-1.0.1 235 SHA256 1adfd3d0d09776c421b6ae50177983123e62cd2e675ac915e110c632cfdf97ab files/digest-xinit-1.0.1 235 @@ -37,10 +34,3 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata MD5 38f1a47a1e2b92e3d9c7eb75e582c72c xinit-1.0.1.ebuild 1215 RMD160 0edb37547d03f9e9b0bbd5aec77ad58078087910 xinit-1.0.1.ebuild 1215 SHA256 7cd3477453f51eb97141ae72be1c576e77328432add42673f5263ce6b7d085aa xinit-1.0.1.ebuild 1215 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFEEDSnJrHF4yAQTrARAl/9AJ0f6LkItVvxWde/3msCHfdcfzHQHACgsh59 -qXwH2q8CsduM+23fAHD52TM= -=wGQl ------END PGP SIGNATURE----- diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh index 1f6de165c136..b8ef45cf43d0 100644 --- a/x11-apps/xinit/files/chooser.sh +++ b/x11-apps/xinit/files/chooser.sh @@ -2,7 +2,7 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.2 2005/08/16 20:18:24 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.3 2006/03/23 07:56:22 spyderous Exp $ # If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf if [ -z "${XSESSION}" ] @@ -52,9 +52,6 @@ if [ -n "${XSESSION}" ]; then break fi done - - # If all else fail, run twm - GENTOO_EXEC="/usr/bin/twm" fi fi |