]>
Commit | Line | Data |
---|---|---|
1 | diff -Nru kdebase-workspace-4.3.73svn1040395/doc/kdm/index.docbook kdebase-workspace-4.3.73svn1040395-new/doc/kdm/index.docbook | |
2 | --- kdebase-workspace-4.3.73svn1040395/doc/kdm/index.docbook 2009-10-26 10:14:41.000000000 +0100 | |
3 | +++ kdebase-workspace-4.3.73svn1040395-new/doc/kdm/index.docbook 2009-10-28 22:58:07.000000000 +0100 | |
4 | @@ -317,7 +317,7 @@ | |
5 | system, and that you simply want to change its behavior in some way.</para> | |
6 | ||
7 | <para>When &kdm; starts up, it reads its configuration from the folder | |
8 | -<filename class="directory">$<envar>KDEDIR</envar>/share/config/kdm/</filename> | |
9 | +<filename class="directory">/etc/X11/kdm/</filename> | |
10 | (this may | |
11 | be <filename class="directory">/etc/kde4/kdm/</filename> or something else | |
12 | on your system).</para> | |
13 | diff -Nru kdebase-workspace-4.3.73svn1040395/kcontrol/fonts/fonts.cpp kdebase-workspace-4.3.73svn1040395-new/kcontrol/fonts/fonts.cpp | |
14 | --- kdebase-workspace-4.3.73svn1040395/kcontrol/fonts/fonts.cpp 2009-10-02 16:53:57.000000000 +0200 | |
15 | +++ kdebase-workspace-4.3.73svn1040395-new/kcontrol/fonts/fonts.cpp 2009-10-28 22:58:08.000000000 +0100 | |
16 | @@ -638,7 +638,7 @@ | |
17 | "<p>The use of this option is generally discouraged. For selecting proper DPI" | |
18 | " value a better option is explicitly configuring it for the whole X server if" | |
19 | " possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> to" | |
20 | - " ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not render" | |
21 | + " ServerLocalArgs= in /etc/X11/kdm/kdmrc). When fonts do not render" | |
22 | " properly with real DPI value better fonts should be used or configuration" | |
23 | " of font hinting should be checked.</p>" ); | |
24 | comboForceDpi->setWhatsThis(whatsthis); | |
25 | --- kdebase-workspace-4.6.0/kdm/kcm/kdm-users.cpp~ 2011-01-19 23:05:22.000000000 +0100 | |
26 | +++ kdebase-workspace-4.6.0/kdm/kcm/kdm-users.cpp 2011-01-21 15:14:17.634951865 +0100 | |
27 | @@ -104,7 +104,7 @@ | |
28 | #endif | |
29 | ||
30 | m_userPixDir = config->group("X-*-Greeter").readEntry("FaceDir", | |
31 | - QString(KStandardDirs::installPath("data") + "kdm/faces" + '/')); | |
32 | + QString("/etc/X11/kdm/faces/")); | |
33 | ||
34 | if (!getpwnam("nobody")) | |
35 | KMessageBox::sorry(this, i18n( | |
36 | diff -Nru kdebase-workspace-4.3.73svn1040395/kdm/config.def kdebase-workspace-4.3.73svn1040395-new/kdm/config.def | |
37 | --- kdebase-workspace-4.3.73svn1040395/kdm/config.def 2009-10-26 10:14:48.000000000 +0100 | |
38 | +++ kdebase-workspace-4.3.73svn1040395-new/kdm/config.def 2009-10-28 22:58:08.000000000 +0100 | |
39 | @@ -29,7 +29,7 @@ | |
40 | #define RCVERMAJOR 2 | |
41 | #define RCVERMINOR 4 | |
42 | ||
43 | -#define KDMCONF KDE_CONFDIR "/kdm" | |
44 | +#define KDMCONF "/etc/X11/kdm" | |
45 | #define KDMDATA KDE_DATADIR "/kdm" | |
46 | ||
47 | #ifdef _AIX | |
48 | @@ -1099,7 +1099,7 @@ | |
49 | Key: Xaccess | |
50 | Type: string | |
51 | # differs from xdm | |
52 | -Default: *KDMCONF "/Xaccess" | |
53 | +Default: *"/etc/X11/kdm/Xaccess" | |
54 | User: config(Xaccess) | |
55 | Instance: #"" | |
56 | Update: mk_xaccess | |
57 | @@ -1161,7 +1161,7 @@ | |
58 | ||
59 | Key: Willing | |
60 | Type: string | |
61 | -Default: "" | |
62 | +Default: KDMCONF "/Xwilling" | |
63 | User: core | |
64 | # will be overwritten | |
65 | Instance: # | |
66 | @@ -1600,7 +1600,7 @@ | |
67 | ||
68 | Key: Startup | |
69 | Type: string | |
70 | -Default: "" | |
71 | +Default: KDMCONF "/Xsetup" | |
72 | User: core | |
73 | # will be overwritten | |
74 | Instance: #*/"" | |
75 | @@ -1618,7 +1618,7 @@ | |
76 | ||
77 | Key: Reset | |
78 | Type: string | |
79 | -Default: "" | |
80 | +Default: KDMCONF "Xreset" | |
81 | User: core | |
82 | # will be overwritten | |
83 | Instance: #*/"" | |
84 | @@ -1636,7 +1636,7 @@ | |
85 | ||
86 | Key: Session | |
87 | Type: string | |
88 | -Default: XBINDIR "/xterm -ls -T" | |
89 | +Default: KDMCONF "/Xsession" | |
90 | #Merge: xdm - incompatible! | |
91 | User: core | |
92 | # will be overwritten | |
93 | @@ -1753,10 +1753,10 @@ | |
94 | ||
95 | Key: AllowRootLogin | |
96 | Type: bool | |
97 | -Default: true | |
98 | +Default: false | |
99 | User: core | |
100 | User: greeter(showRoot) | |
101 | -Instance: */false | |
102 | +Instance: #*/true | |
103 | Merge: xdm | |
104 | Comment: | |
105 | Allow root logins? | |
106 | @@ -1766,11 +1766,11 @@ | |
107 | ||
108 | Key: AllowNullPasswd | |
109 | Type: bool | |
110 | -Default: true | |
111 | +Default: false | |
112 | User: core | |
113 | # sensible? | |
114 | -Instance: */false | |
115 | -Instance: :*/true | |
116 | +Instance: #*/true | |
117 | +Instance: #:*/true | |
118 | Merge: xdm | |
119 | Comment: | |
120 | Allow to log in, when user has set an empty password? | |
121 | @@ -1928,10 +1928,10 @@ | |
122 | ||
123 | Key: SessionsDirs | |
124 | Type: list | |
125 | -Default: *KDMDATA "/sessions" | |
126 | +Default: *"/usr/share/xsessions" | |
127 | User: core | |
128 | User: greeter-c | |
129 | -Instance: */KDMCONF "/sessions," KDMDATA "/sessions" | |
130 | +Instance: */"/etc/X11/sessions,/usr/share/xsessions" | |
131 | Update: upd_sessionsdirs | |
132 | Comment: | |
133 | The directories containing session type definitions in .desktop format, | |
134 | @@ -2275,7 +2275,7 @@ | |
135 | ||
136 | Key: MinShowUID | |
137 | Type: int | |
138 | -Default: 0 | |
139 | +Default: 1000 | |
140 | User: greeter(lowUserId) | |
141 | # will be overwritten | |
142 | Instance: #*/ | |
143 | @@ -2336,7 +2336,7 @@ | |
144 | ||
145 | Key: FaceDir | |
146 | Type: string | |
147 | -Default: *KDMDATA "/faces" | |
148 | +Default: *"/etc/X11/kdm/faces" | |
149 | User: greeter | |
150 | Instance: #*/"/usr/share/faces" | |
151 | Update: upd_facedir | |
152 | @@ -2419,7 +2419,7 @@ | |
153 | ||
154 | Key: BackgroundCfg | |
155 | Type: string | |
156 | -Default: *KDMCONF "/backgroundrc" | |
157 | +Default: *"/etc/X11/kdm/backgroundrc" | |
158 | User: greeter-c | |
159 | Instance: #*/"" | |
160 | Update: handleBgCfg | |
161 | diff -Nru kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/CMakeLists.txt kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/CMakeLists.txt | |
162 | --- kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/CMakeLists.txt 2009-10-02 16:54:04.000000000 +0200 | |
163 | +++ kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/CMakeLists.txt 2009-10-28 22:58:08.000000000 +0100 | |
164 | @@ -112,5 +112,5 @@ | |
165 | ||
166 | ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h) | |
167 | install(CODE " | |
168 | -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) | |
169 | +exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\${DESTDIR}/etc/X11/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) | |
170 | ") | |
171 | --- kdebase-workspace-4.5.0/kdm/kfrontend/genkdmconf.c.orig 2010-07-06 08:54:31.000000000 +0200 | |
172 | +++ kdebase-workspace-4.5.0/kdm/kfrontend/genkdmconf.c 2010-07-30 20:40:48.828680855 +0200 | |
173 | @@ -3254,7 +3254,7 @@ | |
174 | f = createFile("README", 0644); | |
175 | fprintf_(f, | |
176 | "This automatically generated configuration consists of the following files:\n"); | |
177 | - fprintf_(f, "- " KDMCONF "/kdmrc\n"); | |
178 | + fprintf( f, "- /etc/X11/kdm/kdmrc\n" ); | |
179 | for (fp = aflist; fp; fp = fp->next) | |
180 | fprintf_(f, "- %s\n", fp->str); | |
181 | if (use_destdir && !no_in_notice) | |
182 | --- kdebase-workspace-4.5.0/kdm/kfrontend/kdmctl.c.orig 2010-07-06 08:54:31.000000000 +0200 | |
183 | +++ kdebase-workspace-4.5.0/kdm/kfrontend/kdmctl.c 2010-07-30 20:42:26.855824153 +0200 | |
184 | @@ -150,7 +150,7 @@ | |
185 | { | |
186 | char *dpy = getenv("DISPLAY"); | |
187 | const char *ctl = getenv("DM_CONTROL"); | |
188 | - const char *cfg = KDE_CONFDIR "/kdm/kdmrc"; | |
189 | + const char *cfg = "/etc/X11/kdm/kdmrc"; | |
190 | char *ptr; | |
191 | int fd; | |
192 | ||
193 | diff -Nru kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/sessions/CMakeLists.txt kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/sessions/CMakeLists.txt | |
194 | --- kdebase-workspace-4.3.73svn1040395/kdm/kfrontend/sessions/CMakeLists.txt 2008-04-30 15:58:40.000000000 +0200 | |
195 | +++ kdebase-workspace-4.3.73svn1040395-new/kdm/kfrontend/sessions/CMakeLists.txt 2009-10-28 22:58:08.000000000 +0100 | |
196 | @@ -51,5 +51,5 @@ | |
197 | xfce.desktop | |
198 | xfce4.desktop | |
199 | ||
200 | - DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions | |
201 | + DESTINATION /etc/X11/sessions | |
202 | ) |