File kdebase3-etc_X11_xdm_to_usr.patch of Package kdebase3
diff -Naru kdebase-3.5.10_orig/doc/faq/notrelated.docbook kdebase-3.5.10/doc/faq/notrelated.docbook
--- kdebase-3.5.10_orig/doc/faq/notrelated.docbook 2005-09-10 17:25:25.000000000 +0900
+++ kdebase-3.5.10/doc/faq/notrelated.docbook 2020-10-18 08:42:08.665489767 +0900
@@ -46,7 +46,7 @@
the depth you want. Alternatively, if you are using
<application>xdm</application>/&kdm;, you
need to edit
-<filename>/etc/X11/xdm/Xservers</filename> (may vary) and enter
+<filename>/usr/etc/X11/xdm/Xservers</filename> (may vary) and enter
<userinput>:0 local /usr/X11R6/bin/X -bpp 16</userinput> for 16 bit color
depth.</para>
<para>You can also edit the <filename>XF86Config</filename> file and add a line
diff -Naru kdebase-3.5.10_orig/doc/kcontrol/kdm/index.docbook kdebase-3.5.10/doc/kcontrol/kdm/index.docbook
--- kdebase-3.5.10_orig/doc/kcontrol/kdm/index.docbook 2006-01-20 02:01:29.000000000 +0900
+++ kdebase-3.5.10/doc/kcontrol/kdm/index.docbook 2020-10-18 08:43:05.108937770 +0900
@@ -318,7 +318,7 @@
window.</para>
<para> For more information on this subject, look at <filename
-class="directory">/etc/X11/xdm/Xsession</filename> to find your
+class="directory">/usr/etc/X11/xdm/Xsession</filename> to find your
<application>xdm</application> setup files. Also review the <ulink
url="man:xdm">xdm man pages</ulink>, especially under the SESSION
PROGRAM section.</para>
diff -Naru kdebase-3.5.10_orig/doc/userguide/kde-for-admins.docbook kdebase-3.5.10/doc/userguide/kde-for-admins.docbook
--- kdebase-3.5.10_orig/doc/userguide/kde-for-admins.docbook 2006-07-22 17:15:40.000000000 +0900
+++ kdebase-3.5.10/doc/userguide/kde-for-admins.docbook 2020-10-18 08:41:46.209710548 +0900
@@ -786,7 +786,7 @@
<para>Always runs as <systemitem class="username">root</systemitem>! Uses
<filename>$<envar>KDEDIR</envar>/share/config/kdmrc</filename> and
-<filename>/etc/X11/xdm/Xservers</filename>. The latter contains entries
+<filename>/usr/etc/X11/xdm/Xservers</filename>. The latter contains entries
like:</para>
<programlisting>
@@ -799,16 +799,16 @@
[X-*-Core] section in <filename>kdmrc</filename>
</member>
<member>
-Setup - <filename>/etc/X11/xdm/Xsetup</filename>
+Setup - <filename>/usr/etc/X11/xdm/Xsetup</filename>
</member>
<member>
User enters username & password
</member>
<member>
-Startup - <filename>/etc/X11/xdm/Xstartup</filename> - prepare as root
+Startup - <filename>/usr/etc/X11/xdm/Xstartup</filename> - prepare as root
</member>
<member>
-Session - <filename>/etc/X11/xdm/Xsession</filename> - starts session as user
+Session - <filename>/usr/etc/X11/xdm/Xsession</filename> - starts session as user
</member>
<member>
= For a KDE session: <command>kde</command> or <command>startkde</command>
@@ -817,7 +817,7 @@
= If present <filename>~/.xsession</filename> or <filename>~/.xinitrc</filename>
</member>
<member>
-Reset - <filename>/etc/X11/xdm/Xreset</filename> - after session finished
+Reset - <filename>/usr/etc/X11/xdm/Xreset</filename> - after session finished
</member>
</simplelist>
diff -Naru kdebase-3.5.10_orig/kdm/config.def kdebase-3.5.10/kdm/config.def
--- kdebase-3.5.10_orig/kdm/config.def 2020-10-18 08:34:08.394224457 +0900
+++ kdebase-3.5.10/kdm/config.def 2020-10-18 08:38:58.139352343 +0900
@@ -1118,7 +1118,7 @@
Key: Xaccess
Type: string
# differs from xdm
-Default: *"/etc/X11/xdm/Xaccess"
+Default: *"/usr/etc/X11/xdm/Xaccess"
User: config(Xaccess)
Instance: #
Update: reset_sec_0_1
@@ -1179,7 +1179,7 @@
Key: Willing
Type: string
-Default: "/etc/X11/xdm/Xwilling"
+Default: "/usr/etc/X11/xdm/Xwilling"
User: core
# will be overwritten
Instance: #
@@ -1594,7 +1594,7 @@
Key: Setup
Type: string
-Default: "/etc/X11/xdm/Xsetup"
+Default: "/usr/etc/X11/xdm/Xsetup"
User: core
# will be overwritten
Instance: #*/""
@@ -1614,7 +1614,7 @@
Key: Startup
Type: string
-Default: "/etc/X11/xdm/Xstartup"
+Default: "/usr/etc/X11/xdm/Xstartup"
User: core
# will be overwritten
Instance: #*/""
@@ -1631,7 +1631,7 @@
Key: Reset
Type: string
-Default: "/etc/X11/xdm/Xreset"
+Default: "/usr/etc/X11/xdm/Xreset"
User: core
# will be overwritten
Instance: #*/""
@@ -1648,7 +1648,7 @@
Key: Session
Type: string
-Default: "/etc/X11/xdm/Xsession"
+Default: "/usr/etc/X11/xdm/Xsession"
#Merge: xdm - incompatible!
User: core
# will be overwritten
@@ -1957,7 +1957,7 @@
Key: SessionsDirs
Type: list
-Default: "/etc/X11/sessions," KDMDATA "/sessions,/usr/share/xsessions"
+Default: "/usr/etc/X11/sessions," KDMDATA "/sessions,/usr/share/xsessions"
User: core
User: greeter-c
Instance: #*/""
diff -Naru kdebase-3.5.10_orig/kdm/kfrontend/genkdmconf.c kdebase-3.5.10/kdm/kfrontend/genkdmconf.c
--- kdebase-3.5.10_orig/kdm/kfrontend/genkdmconf.c 2020-10-18 08:34:08.394224457 +0900
+++ kdebase-3.5.10/kdm/kfrontend/genkdmconf.c 2020-10-18 08:41:00.270166874 +0900
@@ -2620,7 +2620,7 @@
};
static const char *oldxdms[] = {
- "/etc/X11/xdm",
+ "/usr/etc/X11/xdm",
XLIBDIR "/xdm",
};
@@ -2655,7 +2655,7 @@
" Default is " KDMCONF ".\n"
" --old-xdm /path/to/old/xdm-dir\n"
" Where to look for the config files of an xdm/older kdm.\n"
-" Default is to scan /etc/X11/kdm, $XLIBDIR/kdm, /etc/X11/xdm,\n"
+" Default is to scan /etc/X11/kdm, $XLIBDIR/kdm, /usr/etc/X11/xdm,\n"
" $XLIBDIR/xdm; there in turn look for kdm-config and xdm-config.\n"
" 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"
