rev 3637 - trunk/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-04-22 16:46:47 +0000 (Sat, 22 Apr 2006)
New Revision: 3637

Modified:
   trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
Log:
This looks messier than it is; basically, just remove the line which
adds /usr/bin/X11 to the path of /etc/kde3/kdm/Xstartup.


Modified: trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/11_genkdmconf.diff	2006-04-22 16:45:51 UTC (rev 3636)
+++ trunk/packages/kdebase/debian/patches/11_genkdmconf.diff	2006-04-22 16:46:47 UTC (rev 3637)
@@ -1,6 +1,6 @@
 --- kde.orig/kdm/kfrontend/genkdmconf.c
 +++ kde.patched/kdm/kfrontend/genkdmconf.c
-@@ -501,7 +501,7 @@
+@@ -531,7 +531,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"
-@@ -519,7 +519,7 @@
+@@ -549,7 +549,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"
-@@ -555,35 +555,25 @@
+@@ -585,35 +585,23 @@
  "#! /bin/sh\n"
  "# Xstartup - run as root before session starts\n"
  "\n"
@@ -30,7 +30,16 @@
 -"# This is not required if you use PAM with the pam_console module.\n"
 -"#\n"
 -"#chown $USER /dev/console\n"
-+"PATH=\"$PATH:/usr/bin/X11\"\n"
++"if [ -e /etc/nologin ]; then\n"
++"  # always display the nologin message, if possible\n"
++"  if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
++"    xmessage -file /etc/nologin -geometry 640x480\n"
++"  fi\n"
++"  if [ \"$(id -u)\" != \"0\" ] && \\\n"
++"     ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
++"    exit 1\n"
++"  fi\n"
++"fi\n"
  "\n"
 -#ifdef _AIX
 -"# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
@@ -52,17 +61,6 @@
 -#endif /* _AIX */
 -" $USER\n"
 -"\n# NOTE: The session is aborted if the last command returns non-zero.\n";
-+"if [ -e /etc/nologin ]; then\n"
-+"  # always display the nologin message, if possible\n"
-+"  if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
-+"    xmessage -file /etc/nologin -geometry 640x480\n"
-+"  fi\n"
-+"  if [ \"$(id -u)\" != \"0\" ] && \\\n"
-+"     ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
-+"    exit 1\n"
-+"  fi\n"
-+"fi\n"
-+"\n"
 +"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n"
 +"   which sessreg > /dev/null 2>&1; then\n"
 +"      exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
@@ -72,7 +70,7 @@
  
  static const char def_reset[] =
  "#! /bin/sh\n"
-@@ -599,12 +589,13 @@
+@@ -629,12 +617,13 @@
  "#devname=`echo $DISPLAY | cut -c1-8`\n"
  "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
  #else
@@ -89,9 +87,9 @@
  #endif /* _AIX */
 -" $USER\n";
  
- static const char def_session[] =
+ static const char def_session1[] =
  "#! /bin/sh\n"
-@@ -636,6 +627,7 @@
+@@ -666,6 +655,7 @@
  "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
  "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
  "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -99,7 +97,7 @@
  "    ;;\n"
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
-@@ -647,28 +639,8 @@
+@@ -682,28 +672,8 @@
  "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
  "    ;;\n"
  "esac\n"
@@ -130,7 +128,7 @@
  
  static const char def_background[] =
  "[Desktop0]\n"
-@@ -943,29 +915,6 @@
+@@ -978,29 +948,6 @@
  
  	if (maxTTY)
  		return;