rev 7847 - in trunk/packages/kdebase/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-11-10 11:34:06 +0000 (Sat, 10 Nov 2007)
New Revision: 7847

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/kdm.README.Debian
   trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
   trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
Log:
* Remove /usr/bin/X11 to the KDM's default session path.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2007-11-10 11:21:08 UTC (rev 7846)
+++ trunk/packages/kdebase/debian/changelog	2007-11-10 11:34:06 UTC (rev 7847)
@@ -1,3 +1,11 @@
+kdebase (4:3.5.8.dfsg.1-2) UNRELEASED; urgency=low
+
+  +++ Changes by Fathi Boudra:
+
+  * Remove /usr/bin/X11 to the KDM's default session path. (Closes: 441392)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 10 Nov 2007 11:53:23 +0100
+
 kdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/packages/kdebase/debian/kdm.README.Debian
===================================================================
--- trunk/packages/kdebase/debian/kdm.README.Debian	2007-11-10 11:21:08 UTC (rev 7846)
+++ trunk/packages/kdebase/debian/kdm.README.Debian	2007-11-10 11:34:06 UTC (rev 7847)
@@ -50,7 +50,7 @@
 automatically at boot.)  If one does not wish to run a local X server, the
 following line should be commented out of /etc/X11/xdm/Xservers:
 
-:0 local /usr/bin/X11/X vt7 -deferglyphs 16
+:0 local /usr/bin/X vt7 -deferglyphs 16
 
 Several configuration files are shipped with the xdm package; they reside
 in the /etc/X11/xdm/ directory.  Extensive documentation about the xdm

Modified: trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2007-11-10 11:21:08 UTC (rev 7846)
+++ trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2007-11-10 11:34:06 UTC (rev 7847)
@@ -26,13 +26,13 @@
  #if defined(BSD) || defined(__linux__)
 -# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games"
 -# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR
-+# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
-+# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/games"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
  #else
 -# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games:/usr/ucb"
 -# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR ":/etc:/usr/ucb"
-+# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games:/usr/ucb"
-+# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/etc:/usr/ucb"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/games:/usr/ucb"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/etc:/usr/ucb"
  #endif
  
  #if 0 /*def HASXDMAUTH*/

Modified: trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/11_genkdmconf.diff	2007-11-10 11:21:08 UTC (rev 7846)
+++ trunk/packages/kdebase/debian/patches/11_genkdmconf.diff	2007-11-10 11:34:06 UTC (rev 7847)
@@ -30,7 +30,7 @@
 -"# 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"
++"\n"
  "\n"
 -#ifdef _AIX
 -"# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"