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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-12-07 19:21:02 +0000 (Fri, 07 Dec 2007)
New Revision: 8164

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/series
Log:
fix patches offset and stuff


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 19:20:21 UTC (rev 8163)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2007-12-07 19:21:02 UTC (rev 8164)
@@ -40,7 +40,7 @@
  #endif
  
  #if 0 /*def HASXDMAUTH*/
-@@ -1357,7 +1357,7 @@
+@@ -1355,7 +1355,7 @@
   This string is subject to word splitting.
   </para><para>
   The default is something reasonable for the system on which &kdm; was built,
@@ -49,20 +49,20 @@
  
  Key: ServerArgsLocal
  Type: string
-@@ -1932,10 +1932,10 @@
+@@ -1930,10 +1930,10 @@
  
  Key: SessionsDirs
  Type: list
--Default: KDMDATA "/sessions"
+-Default: *KDMDATA "/sessions"
 +Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
  User: core
  User: greeter-c
--Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
+-Instance: */KDMCONF "/sessions," KDMDATA "/sessions"
 +Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
+ Update: upd_sessionsdirs
  Comment:
-  The directories containing session type definitions in .desktop format.
- Description:
-@@ -2001,7 +2001,7 @@
+  The directories containing session type definitions in .desktop format,
+@@ -2002,7 +2002,7 @@
  
  Key: UseSessReg
  Type: bool
@@ -71,7 +71,7 @@
  User: core
  Instance: #*/!
  Comment:
-@@ -2097,9 +2097,9 @@
+@@ -2096,9 +2096,9 @@
  
  Key: GreetString
  Type: string

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2007-12-07 19:20:21 UTC (rev 8163)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/08_genkdmconf.diff	2007-12-07 19:21:02 UTC (rev 8164)
@@ -2,7 +2,7 @@
 ===================================================================
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -531,7 +531,7 @@
+@@ -532,7 +532,7 @@
  "# right hand sides can match.\n"
  "#\n"
  "\n"
@@ -11,7 +11,7 @@
  "\n"
  "#\n"
  "# To hardwire a specific terminal to a specific host, you can\n"
-@@ -549,7 +549,7 @@
+@@ -550,7 +550,7 @@
  "# so this may not work in all environments.\n"
  "#\n"
  "\n"
@@ -20,7 +20,7 @@
  "\n"
  "#\n"
  "# If you would prefer to configure the set of hosts each terminal sees,\n"
-@@ -585,35 +585,25 @@
+@@ -586,35 +586,25 @@
  "#! /bin/sh\n"
  "# Xstartup - run as root before session starts\n"
  "\n"

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 19:20:21 UTC (rev 8163)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2007-12-07 19:21:02 UTC (rev 8164)
@@ -2,10 +2,10 @@
 ===================================================================
 --- a/kdm/kfrontend/CMakeLists.txt
 +++ b/kdm/kfrontend/CMakeLists.txt
-@@ -110,5 +110,5 @@
+@@ -111,5 +111,5 @@
  
  ## use 'GENKDMCONF_FLAGS=... make install' to override
  install(CODE "
--exec_program(${CMAKE_CURRENT_BINARY_DIR}/genkdmconf ARGS --in \$DESTDIR${CONFIG_INSTALL_DIR}/kdm --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics \$GENKDMCONF_FLAGS)
-+exec_program(${CMAKE_CURRENT_BINARY_DIR}/genkdmconf ARGS --in \$DESTDIR${CONFIG_INSTALL_DIR}/kdm --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics --no-old \$GENKDMCONF_FLAGS)
+-exec_program(${CMAKE_CURRENT_BINARY_DIR}/genkdmconf ARGS --in \$DESTDIR${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics \$GENKDMCONF_FLAGS)
++exec_program(${CMAKE_CURRENT_BINARY_DIR}/genkdmconf ARGS --in \$DESTDIR${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics --no-old \$GENKDMCONF_FLAGS)
  ")

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2007-12-07 19:20:21 UTC (rev 8163)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2007-12-07 19:21:02 UTC (rev 8164)
@@ -1,4 +1,7 @@
 06_kdehome_kde4.diff
+07_kdmrc_defaults.diff
+08_genkdmconf.diff
+09_genkdm_make.diff
 10_kdm_no_custom.diff
 11_kdm_X_path.diff
 12_be_better_at_honouring_user_kdm_theming.diff