rev 10973 - branches/kde4/packages/kdelibs/debian/patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-06-11 15:26:21 +0000 (Wed, 11 Jun 2008)
New Revision: 10973

Added:
   branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
Modified:
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
and split out the additional /etc/kde4 addition in a seperate thing

Added: branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff	2008-06-11 15:26:21 UTC (rev 10973)
@@ -0,0 +1,15 @@
+Index: b/kdecore/kernel/kstandarddirs.cpp
+===================================================================
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
+@@ -1011,6 +1011,10 @@
+                         if ((local || testdir.exists()) && !candidates.contains(path))
+                             candidates.append(path);
+                     }
++                    // UGLY HACK - forward porting Chris CHeney's HACK - Rex Dieter
++                    if ( local && (!strcmp("config", type)))  // local is used as a "homedir marker"
++                        candidates.append("/etc/kde4/");
++                    //
+                     local = false;
+                 }
+ 	        else

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-06-11 15:25:29 UTC (rev 10972)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-06-11 15:26:21 UTC (rev 10973)
@@ -10,6 +10,7 @@
 19_findqt4_optional_x11_pthread.diff
 20_use_dejavu_as_default_font.diff
 21_kstandarddirs_prefer_kde4apps.diff
+22_hack_in_etc_kde4_in_kstandarddirs.diff
 #97_use_imported_targets_with_cmake26.diff
 98_link_interface_libraries.diff
 99_more_implicit_link_libs.diff