rev 10960 - in branches/kde4/packages/kdebase-workspace/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-06-10 23:00:36 +0000 (Tue, 10 Jun 2008)
New Revision: 10960

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
+++ Changes by Sune Vuorela:
* kdm doesn't use kstandarddirs, so we need to do a bit specific patching
here.

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-06-10 22:57:06 UTC (rev 10959)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-06-10 23:00:36 UTC (rev 10960)
@@ -22,6 +22,11 @@
 
   * Update installed files.
 
+  +++ Changes by Sune Vuorela:
+
+  * kdm doesn't use kstandarddirs, so we need to do a bit specific patching
+    here.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Jun 2008 23:37:23 +0300
 
 kdebase-workspace (4:4.0.80-2) experimental; urgency=low

Added: branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff	2008-06-10 23:00:36 UTC (rev 10960)
@@ -0,0 +1,55 @@
+Index: b/kdm/config.def
+===================================================================
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -29,7 +29,7 @@
+ #define RCVERMAJOR 2
+ #define RCVERMINOR 4
+ 
+-#define KDMCONF KDE_CONFDIR "/kdm"
++#define KDMCONF "/etc/kde4/kdm"
+ #define KDMDATA KDE_DATADIR "/kdm"
+ 
+ #ifdef _AIX
+Index: b/kdm/kfrontend/kdmctl.c
+===================================================================
+--- a/kdm/kfrontend/kdmctl.c
++++ b/kdm/kfrontend/kdmctl.c
+@@ -150,7 +150,7 @@
+ {
+ 	char *dpy = getenv( "DISPLAY" );
+ 	const char *ctl = getenv( "DM_CONTROL" );
+-	const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
++	const char *cfg = KDMCONF "/kdmrc";
+ 	char *ptr;
+ 	int fd;
+ 
+Index: b/kdm/kfrontend/genkdmconf.c
+===================================================================
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
+@@ -2766,6 +2766,7 @@
+ 
+ 
+ static const char *oldkdes[] = {
++	"/etc/kde4",
+ 	KDE_CONFDIR,
+ 	"/opt/kde4/share/config",
+ 	"/usr/local/kde4/share/config",
+@@ -2774,6 +2775,7 @@
+ 	"/usr/local/kde/share/config",
+ 	"/usr/local/share/config",
+ 	"/usr/share/config",
++	"/etc/kde3",
+ 
+ 	"/opt/kde3/share/config",
+ 	"/usr/local/kde3/share/config",
+@@ -2817,7 +2819,7 @@
+ "    Note that you possibly need to use --no-old-kde to make this take effect.\n"
+ "  --old-kde /path/to/old/kde-config-dir\n"
+ "    Where to look for the kdmrc of a previously installed kdm.\n"
+-"    Default is to scan " KDE_CONFDIR " and\n"
++"    Default is to scan " "/etc/kde4" " and\n"
+ "    {/usr,/usr/local,{/opt,/usr/local}/{kde4,kde,kde3}}/share/config.\n"
+ "  --no-old\n"
+ "    Do not look at older xdm/kdm configurations, just create default config.\n"

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-06-10 22:57:06 UTC (rev 10959)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-06-10 23:00:36 UTC (rev 10960)
@@ -8,4 +8,5 @@
 14_correct_kde4home_for_kstartupconfig4.diff
 17_ksysguard_disable_procmon_when_unsupported.diff
 20_use_dejavu_as_default_font.diff
+21_kdm_doesnt_use_kstandarddirs.diff
 97_fix_target_link_libraries.diff