[Pkg-kde-commits] rev 628 - branches/kde-3.4.0/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-04 05:55:06 +0100 (Fri, 04 Mar 2005)
New Revision: 628

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff
Log:
Sourcing of shell scripts and global Xsession,
for the same low price!


Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff	2005-03-04 04:54:01 UTC (rev 627)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff	2005-03-04 04:55:06 UTC (rev 628)
@@ -1,6 +1,6 @@
---- kde.org/kdm/kfrontend/genkdmconf.c
+--- kde.orig/kdm/kfrontend/genkdmconf.c
 +++ kde.patched/kdm/kfrontend/genkdmconf.c
-@@ -492,7 +492,7 @@
+@@ -501,7 +501,7 @@
  "# right hand sides can match.\n"
  "#\n"
  "\n"
@@ -9,7 +9,7 @@
  "\n"
  "#\n"
  "# To hardwire a specific terminal to a specific host, you can\n"
-@@ -510,7 +510,7 @@
+@@ -519,7 +519,7 @@
  "# so this may not work in all environments.\n"
  "#\n"
  "\n"
@@ -18,7 +18,7 @@
  "\n"
  "#\n"
  "# If you'd prefer to configure the set of hosts each terminal sees,\n"
-@@ -546,34 +546,25 @@
+@@ -555,34 +555,25 @@
  "#! /bin/sh\n"
  "# Xstartup - run as root before session starts\n"
  "\n"
@@ -71,7 +71,7 @@
  
  static const char def_reset[] =
  "#! /bin/sh\n"
-@@ -589,74 +580,20 @@
+@@ -598,12 +589,13 @@
  "#devname=`echo $DISPLAY | cut -c1-8`\n"
  "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
  #else
@@ -90,43 +90,10 @@
  
  static const char def_session[] =
  "#! /bin/sh\n"
- "# Xsession - run as user\n"
- "\n"
--"# Note that the respective logout scripts are not sourced.\n"
--"case $SHELL in\n"
--"  */bash)\n"
--"    [ -z \"$BASH\" ] && exec $SHELL $0 \"$@\"\n"
--"    set +o posix\n"
--"    [ -f /etc/profile ] && . /etc/profile\n"
--"    if [ -f $HOME/.bash_profile ]; then\n"
--"      . $HOME/.bash_profile\n"
--"    elif [ -f $HOME/.bash_login ]; then\n"
--"      . $HOME/.bash_login\n"
--"    elif [ -f $HOME/.profile ]; then\n"
--"      . $HOME/.profile\n"
--"    fi\n"
--"    ;;\n"
--"  */zsh)\n"
--"    [ -z \"$ZSH_NAME\" ] && exec $SHELL $0 \"$@\"\n"
--"    emulate -R zsh\n"
--"    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
--"    zhome=${ZDOTDIR:-$HOME}\n"
--"    # zshenv is always sourced automatically.\n"
--"    [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
--"    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
--"    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
--"    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
--"    ;;\n"
--"  */csh|*/tcsh)\n"
--"    # [t]cshrc is always sourced automatically.\n"
--"    # Note that sourcing csh.login after .cshrc is non-standard.\n"
--"    eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
--"    ;;\n"
--"  *) # Plain sh, ksh, and anything we don't know.\n"
--"    [ -f /etc/profile ] && . /etc/profile\n"
--"    [ -f $HOME/.profile ] && . $HOME/.profile\n"
--"    ;;\n"
--"esac\n"
+@@ -644,28 +636,8 @@
+ "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
+ "    ;;\n"
+ "esac\n"
 -"\n"
 -"[ -f /etc/xprofile ] && . /etc/xprofile\n"
 -"[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"