[sabayon] patch: session names..

[William Lachance <wrlach gmail com>]

Hi,

It seems like Sabayon on Ubuntu Breezy (Gnome 2.12) is complaining
about it not being able to find the session "gnome" when starting up
the prototype session editor (not surprising,  since there is no
command called 'gnome' for Xsession to run). Attached is a tentative
patch to fix this, tentative because I'm not sure why this started
happening and whether or not this problem is localized to Ubuntu
(Breezy). I certainly don't see a "gnome" command on my old Ubuntu
Hoary box at
work, which would lead credence to the theory that this is a bug that
went undiscovered until recently.. but I don't have any alternative
distros handy to confirm or disconfirm this hypothesis. It's also
possible that I'm making the appropriate session name a
per-distribution thing when it should be universal (and just needs to
be corrected). 

Any thoughts/comments?
-- 
William Lachance
wrlach gmail com
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/sabayon/configure.ac,v
retrieving revision 1.39
diff -u -r1.39 configure.ac
--- configure.ac	31 Aug 2005 21:29:20 -0000	1.39
+++ configure.ac	21 Sep 2005 01:05:28 -0000
@@ -2,7 +2,6 @@
         [http://bugzilla.gnome.org/enter_bug.cgi?product=sabayon])
 AC_CONFIG_SRCDIR(lib/userprofile.py)
 
-
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
@@ -88,7 +87,7 @@
 
 AC_ARG_WITH(distro,
             AC_HELP_STRING([--with-distro=DISTRO],
-                           [Specify the Linux distribution to target: One of redhat or debian]))
+                           [Specify the Linux distribution to target: One of redhat, debian, slackware, or gentoo]))
 
 if test "x$with_distro" = "x"; then
   AC_CHECK_FILE(/etc/redhat-release, with_distro="redhat")
@@ -106,21 +105,25 @@
   case $with_distro in
     redhat) 
       XSESSION="/etc/X11/xdm/Xsession"
+      SESSION_NAME="gnome"
       install_xinitrc_script="yes"
       XINITRC_SYSCONFDIR="X11/xinit/xinitrc.d"
       ;;
     debian) 
       XSESSION="/etc/gdm/Xsession"
+      SESSION_NAME="gnome-session"
       install_xinitrc_script="no"
       XINITRC_SYSCONFDIR=""
       ;;
     slackware)
       XSESSION="/etc/X11/gdm/Xsession"
+      SESSION_NAME="gnome"
       install_xinitrc_script="no"
       XINITRC_SYSCONFDIR=""
       ;;
     gentoo)
       XSESSION="/etc/X11/xdm/Xsession"
+      SESSION_NAME="gnome"
       install_xinitrc_script="no"
       XINITRC_SYSCONFDIR=""
       ;;
@@ -131,6 +134,7 @@
   esac
 fi
 AC_SUBST(XSESSION)
+AC_SUBST(SESSION_NAME)
 AC_SUBST(XINITRC_SYSCONFDIR)
 AM_CONDITIONAL(INSTALL_XINITRC_SCRIPT, test "x$install_xinitrc_script" = "xyes")
 
@@ -226,4 +230,4 @@
 po/Makefile.in
 ])
 
-AC_OUTPUT
+AC_OUTPUT
\ No newline at end of file
Index: lib/config.py.in
===================================================================
RCS file: /cvs/gnome/sabayon/lib/config.py.in,v
retrieving revision 1.41
diff -u -r1.41 config.py.in
--- lib/config.py.in	1 Aug 2005 11:22:44 -0000	1.41
+++ lib/config.py.in	21 Sep 2005 01:05:28 -0000
@@ -53,7 +53,7 @@
 SKEL_HOMEDIR  = "/etc/skel"
 
 XNEST_ARGV   = [ "/usr/X11R6/bin/Xnest", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
-SESSION_ARGV = [ "@XSESSION@", "gnome" ]
+SESSION_ARGV = [ "@XSESSION@", "@SESSION_NAME@" ]
 USERMOD_ARGV = [ "/usr/sbin/usermod" ]
 
 PANEL_KEY_BASE = "/apps/panel"
Index: lib/Makefile.am
===================================================================
RCS file: /cvs/gnome/sabayon/lib/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- lib/Makefile.am	14 Jun 2005 17:18:05 -0000	1.19
+++ lib/Makefile.am	21 Sep 2005 01:05:28 -0000
@@ -61,5 +61,6 @@
                 -e s!\ PACKAGE_NAME\@!$(PACKAGE_NAME)!		\
                 -e s!\ PACKAGE_VERSION\@!$(PACKAGE_VERSION)!	\
 		-e s!\ XSESSION\@!$(XSESSION)!			\
+		-e s!\SESSION_NAME\ !$(SESSION_NAME)!		\
 		-e s!\ PROTOTYPE_USER\@!$(PROTOTYPE_USER)!	\
                 < $< > $@