rev 8167 - branches/kde4/packages/kdebase-workspace/debian/patches

[Armin Berres]

Author: trigger-guest
Date: 2007-12-07 23:42:03 +0000 (Fri, 07 Dec 2007)
New Revision: 8167

Modified:
   branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
fix the 07 patch. variable wasn't substituted because of missing *

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2007-12-07 20:08:57 UTC (rev 8166)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2007-12-07 23:42:03 UTC (rev 8167)
@@ -54,7 +54,7 @@
  Key: SessionsDirs
  Type: list
 -Default: *KDMDATA "/sessions"
-+Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
++Default: *"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
  User: core
  User: greeter-c
 -Instance: */KDMCONF "/sessions," KDMDATA "/sessions"

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2007-12-07 20:08:57 UTC (rev 8166)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2007-12-07 23:42:03 UTC (rev 8167)
@@ -1,5 +1,3 @@
-Index: b/kdm/kfrontend/genkdmconf.c
-===================================================================
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
 @@ -532,7 +532,7 @@
@@ -74,7 +72,7 @@
  
  static const char def_reset[] =
  "#! /bin/sh\n"
-@@ -629,12 +619,13 @@
+@@ -630,12 +620,13 @@
  "#devname=`echo $DISPLAY | cut -c1-8`\n"
  "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
  #else
@@ -93,7 +91,7 @@
  
  static const char def_session1[] =
  "#! /bin/sh\n"
-@@ -666,6 +657,7 @@
+@@ -667,6 +658,7 @@
  "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
  "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
  "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -101,7 +99,7 @@
  "    ;;\n"
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
-@@ -682,28 +674,8 @@
+@@ -683,28 +675,8 @@
  "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
  "    ;;\n"
  "esac\n"
@@ -132,7 +130,7 @@
  
  static const char def_background[] =
  "[Desktop0]\n"
-@@ -1032,29 +1004,6 @@
+@@ -1068,29 +1040,6 @@
  
  	if (maxTTY)
  		return;

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2007-12-07 20:08:57 UTC (rev 8166)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2007-12-07 23:42:03 UTC (rev 8167)
@@ -1,5 +1,3 @@
-Index: b/kdm/kfrontend/CMakeLists.txt
-===================================================================
 --- a/kdm/kfrontend/CMakeLists.txt
 +++ b/kdm/kfrontend/CMakeLists.txt
 @@ -111,5 +111,5 @@

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2007-12-07 20:08:57 UTC (rev 8166)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2007-12-07 23:42:03 UTC (rev 8167)
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -2660,7 +2660,7 @@
+@@ -2659,7 +2659,7 @@
  Type: string
  Default: ""
  User: greeter

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2007-12-07 20:08:57 UTC (rev 8166)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2007-12-07 23:42:03 UTC (rev 8167)
@@ -1,4 +1,5 @@
 06_kdehome_kde4.diff
+07_kdmrc_defaults.diff
 08_genkdmconf.diff
 09_genkdm_make.diff
 10_kdm_no_custom.diff