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

[Sune Vuorela]

Author: pusling-guest
Date: 2008-08-28 21:08:11 +0000 (Thu, 28 Aug 2008)
New Revision: 12004

Modified:
   branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
   branches/kde4/packages/kdelibs/debian/patches/16_debian_menu.diff
   branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
   branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
Log:
document some patches

Modified: branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2008-08-28 20:45:38 UTC (rev 12003)
+++ branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2008-08-28 21:08:11 UTC (rev 12004)
@@ -1,3 +1,8 @@
+both gnome and kde seems to claim the application.menu name in the XDG menu dir.
+We can't have that - or having kde and gnome conflicting would be bad bad bad, so both  parties divert
+from the name. The path is hardcoded though, so needs to be patched in.
+
+
 --- a/kded/kbuildsycoca.cpp
 +++ b/kded/kbuildsycoca.cpp
 @@ -307,7 +307,7 @@

Modified: branches/kde4/packages/kdelibs/debian/patches/16_debian_menu.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/16_debian_menu.diff	2008-08-28 20:45:38 UTC (rev 12003)
+++ branches/kde4/packages/kdelibs/debian/patches/16_debian_menu.diff	2008-08-28 21:08:11 UTC (rev 12004)
@@ -1,3 +1,7 @@
+Include the Debian menu. Else all would end up under lost & found.
+
+Patch by Sune Vuorela.
+
 --- a/kded/applications.menu
 +++ b/kded/applications.menu
 @@ -426,5 +426,12 @@

Modified: branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2008-08-28 20:45:38 UTC (rev 12003)
+++ branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2008-08-28 21:08:11 UTC (rev 12004)
@@ -1,3 +1,5 @@
+qt doesn't expose the x11 headers to the world, so no need to make it required.
+
 --- a/cmake/modules/FindQt4.cmake
 +++ b/cmake/modules/FindQt4.cmake
 @@ -1430,10 +1430,9 @@

Modified: 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	2008-08-28 20:45:38 UTC (rev 12003)
+++ branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff	2008-08-28 21:08:11 UTC (rev 12004)
@@ -1,3 +1,15 @@
+In the case of config files, we want a local sysadm dir added as well.
+
+The priorities is as follows:
+
+ - peoples homedir (.kde4)
+ - for config files, /etc/kde4/
+ - what's defined in KDEDIRS
+ - the default install path.
+
+With this patch, we can also install all config files into /usr/ as they just can get
+overridden by adding new files to /etc/kde4 by the sysadm.
+
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
 @@ -1010,6 +1010,10 @@