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

[Fathi Boudra]

Author: fabo
Date: 2008-04-28 22:10:46 +0000 (Mon, 28 Apr 2008)
New Revision: 10349

Modified:
   branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff
Log:
* Refresh patches.


Modified: branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff	2008-04-28 22:01:14 UTC (rev 10348)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/06_kdehome_kde4.diff	2008-04-28 22:10:46 UTC (rev 10349)
@@ -1,8 +1,6 @@
-Index: b/startkde.cmake
-===================================================================
 --- a/startkde.cmake
 +++ b/startkde.cmake
-@@ -55,7 +55,7 @@
+@@ -67,7 +67,7 @@
  # The user's personal KDE directory is usually ~/.kde, but this setting
  # may be overridden by setting KDEHOME.
  

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2008-04-28 22:01:14 UTC (rev 10348)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2008-04-28 22:10:46 UTC (rev 10349)
@@ -4,7 +4,7 @@
 +++ b/kdm/kfrontend/CMakeLists.txt
 @@ -111,5 +111,5 @@
  
- ## use 'GENKDMCONF_FLAGS=... make install' to override
+ ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
  install(CODE "
 -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 --no-old --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2008-04-28 22:01:14 UTC (rev 10348)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2008-04-28 22:10:46 UTC (rev 10349)
@@ -1,6 +1,6 @@
 --- a/kdm/kfrontend/kgreeter.cpp
 +++ b/kdm/kfrontend/kgreeter.cpp
-@@ -386,7 +386,6 @@
+@@ -387,7 +387,6 @@
  KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
  {
  	int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,7 +8,7 @@
  	                  !strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
  	for (int i = 0; i < sessionTypes.size(); i++)
  		if (sessionTypes[i].type == type) {
-@@ -415,7 +414,6 @@
+@@ -416,7 +415,6 @@
  				            dsk.readEntry( "Exec" ).toLatin1() );
  			}
  	putSession( "default", i18n("Default"), false, "default" );

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff	2008-04-28 22:01:14 UTC (rev 10348)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/11_kdm_X_path.diff	2008-04-28 22:10:46 UTC (rev 10349)
@@ -1,5 +1,3 @@
-Index: b/kdm/backend/dm.c
-===================================================================
 --- a/kdm/backend/dm.c
 +++ b/kdm/backend/dm.c
 @@ -39,6 +39,7 @@
@@ -27,8 +25,6 @@
  		exit( 1 );
  	case -1:
  		logError( "Forking X server for remote login failed: %m" );
-Index: b/kdm/backend/server.c
-===================================================================
 --- a/kdm/backend/server.c
 +++ b/kdm/backend/server.c
 @@ -41,6 +41,7 @@