Merge lp:~ricotz/gdm/ubuntu into lp:~ubuntu-desktop/gdm/ubuntu
- ubuntu
- Merge into ubuntu
Status: | Rejected |
---|---|
Rejected by: | Robert Ancell |
Proposed branch: | lp:~ricotz/gdm/ubuntu |
Merge into: | lp:~ubuntu-desktop/gdm/ubuntu |
Diff against target: |
2042 lines (+643/-463) 36 files modified
debian/changelog (+16/-0) debian/control (+98/-2) debian/control.in (+98/-1) debian/gdm-welcome.pam (+10/-0) debian/gdm.install (+12/-3) debian/gir1.2-gdmgreeter-1.0.install (+1/-0) debian/libgdmgreeter-dev.install (+4/-0) debian/libgdmgreeter1.install (+1/-0) debian/libgdmsimplegreeter-dev.install (+3/-0) debian/libgdmsimplegreeter1.install (+2/-0) debian/patches/00git.diff (+26/-0) debian/patches/00git_use_new_power_interface.patch (+0/-29) debian/patches/00git_xsession-errors_symlink.patch (+0/-76) debian/patches/01_language.patch (+13/-13) debian/patches/01git.diff (+59/-0) debian/patches/06_first_vt.patch (+6/-6) debian/patches/07_libexec-paths.patch (+43/-83) debian/patches/08_frequent-users_greeter.patch (+5/-5) debian/patches/15_default_session.patch (+15/-15) debian/patches/16_xserver_path.patch (+4/-4) debian/patches/29_grep_path.patch (+0/-13) debian/patches/29_switch_user.patch (+76/-76) debian/patches/30_don_t_save_failsafe_session.patch (+31/-31) debian/patches/42_no_ecryptfs_autologin.patch (+9/-9) debian/patches/45_time_display_on_greeter.patch (+4/-3) debian/patches/93_xdg_data_dirs.patch (+6/-6) debian/patches/series (+6/-7) debian/patches/ubuntu_dont_catch_sigsegv.patch (+16/-16) debian/patches/ubuntu_guest_session.patch (+21/-20) debian/patches/ubuntu_i18n_oneiric.patch (+4/-3) debian/patches/ubuntu_no_debug.patch (+4/-4) debian/patches/ubuntu_plymouth.patch (+32/-21) debian/patches/ubuntu_run_xsession.d.patch (+3/-3) debian/patches/ubuntu_upstart_event.patch (+6/-6) debian/patches/ubuntu_xresources_is_a_dir.patch (+4/-2) debian/rules (+5/-6) |
To merge this branch: | bzr merge lp:~ricotz/gdm/ubuntu |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+71662@code.launchpad.net |
Commit message
Description of the change
update gdm to 3.1.2
- 383. By Martin Pitt
-
debian/gdm.prerm: Stop asking for <dm>/daemon_name debconf question, it
does not exist for lightdm and is not really necessary. Fixes prerm error
and confusing debconf prompts when removing gdm. (LP: #804821) - 384. By Martin Pitt
-
releasing version 3.0.4-0ubuntu10
- 385. By Steve Langasek
-
for bug #615549 from maverick without explanation.
- 386. By Steve Langasek
-
clean up the completely illegible start rule for debian/gdm.upstart,
killing off the unnecessary parentheses - 387. By Steve Langasek
-
whoops, we do need the outermost parentheses or else upstart can't parse the job
- 388. By Steve Langasek
-
debian/gdm.upstart: when gdm is shut down by a runlevel call, emit an
upstart event that can be caught by plymouth so it can distinguish
between the DM shutting down for a runlevel change vs. other causes.
LP: #854329. - 389. By Steve Langasek
-
releasing version 3.0.4-0ubuntu11
- 390. By Rico Tzschichholz
-
* New upstream release
* debian/control.in:
- Add Build-dep on libgirepository1.0-dev (>= 0.9.12),
gobject-introspection (>= 0.9.12), libnss3-dev (>= 3.11.1)
- Add gir1.2-gdmgreeter- 1.0 libgdmgreeter1, libgdmgreeter-dev,
libgdmsimplegreeter1, libgdmsimplegre eter-dev packages
* debian/patches:
- Drop 00git_use_new_power_ interface. patch,
00git_xsession- errors_ symlink. patch and 29_grep_path.patch
which are upstream
- refreshed as needed
Robert Ancell (robert-ancell) wrote : | # |
Unmerged revisions
- 390. By Rico Tzschichholz
-
* New upstream release
* debian/control.in:
- Add Build-dep on libgirepository1.0-dev (>= 0.9.12),
gobject-introspection (>= 0.9.12), libnss3-dev (>= 3.11.1)
- Add gir1.2-gdmgreeter- 1.0 libgdmgreeter1, libgdmgreeter-dev,
libgdmsimplegreeter1, libgdmsimplegre eter-dev packages
* debian/patches:
- Drop 00git_use_new_power_ interface. patch,
00git_xsession- errors_ symlink. patch and 29_grep_path.patch
which are upstream
- refreshed as needed
Preview Diff
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2011-09-23 21:29:00 +0000 |
3 | +++ debian/changelog 2011-10-06 13:19:31 +0000 |
4 | @@ -1,3 +1,19 @@ |
5 | +gdm (3.2.0-0ubuntu1) oneiric; urgency=low |
6 | + |
7 | + * New upstream release |
8 | + * debian/control.in: |
9 | + - Add Build-dep on libgirepository1.0-dev (>= 0.9.12), |
10 | + gobject-introspection (>= 0.9.12), libnss3-dev (>= 3.11.1) |
11 | + - Add gir1.2-gdmgreeter-1.0 libgdmgreeter1, libgdmgreeter-dev, |
12 | + libgdmsimplegreeter1, libgdmsimplegreeter-dev packages |
13 | + * debian/patches: |
14 | + - Drop 00git_use_new_power_interface.patch, |
15 | + 00git_xsession-errors_symlink.patch and 29_grep_path.patch |
16 | + which are upstream |
17 | + - refreshed as needed |
18 | + |
19 | + -- Rico Tzschichholz <ricotz@ubuntu.com> Fri, 30 Sep 2011 13:05:49 +0200 |
20 | + |
21 | gdm (3.0.4-0ubuntu11) oneiric; urgency=low |
22 | |
23 | * don't start on graphics-device-added; reintroducing this reverted the fix |
24 | |
25 | === modified file 'debian/control' |
26 | --- debian/control 2011-07-14 05:26:11 +0000 |
27 | +++ debian/control 2011-10-06 13:19:31 +0000 |
28 | @@ -16,7 +16,7 @@ |
29 | intltool (>= 0.40.0), |
30 | gnome-doc-utils, |
31 | libdbus-glib-1-dev (>= 0.74), |
32 | - libglib2.0-dev (>= 2.27.4), |
33 | + libglib2.0-dev (>= 2.29.3), |
34 | libgtk-3-dev (>= 2.91.1), |
35 | libpango1.0-dev (>= 1.3.0), |
36 | libgconf2-dev (>= 2.31.3), |
37 | @@ -26,8 +26,11 @@ |
38 | libupower-glib-dev (>= 0.9.0), |
39 | libaccountsservice-dev (>= 0.6.12), |
40 | gnome-settings-daemon-dev (>= 2.91.2), |
41 | + libnss3-dev (>= 3.11.1), |
42 | libpolkit-gobject-1-dev (>= 0.92), |
43 | libpolkit-gtk-1-dev (>= 0.92), |
44 | + libgirepository1.0-dev (>= 0.9.12), |
45 | + gobject-introspection (>= 0.9.12-4~), |
46 | libx11-dev, |
47 | libxau-dev, |
48 | libxrandr-dev, |
49 | @@ -59,7 +62,6 @@ |
50 | gnome-session-bin, |
51 | kbd | console-tools, |
52 | udev (>= 166-0ubuntu4) |
53 | -Pre-Depends: dpkg (>= 1.15.7.2) |
54 | Recommends: xserver-xorg, |
55 | metacity | x-window-manager, |
56 | gnome-settings-daemon | xfconf |
57 | @@ -85,3 +87,97 @@ |
58 | . |
59 | This package contains the next generation GDM, which was developed |
60 | using the technologies on which GNOME 3 is based. |
61 | + |
62 | +Package: libgdmsimplegreeter1 |
63 | +Section: libs |
64 | +Architecture: any |
65 | +Depends: ${shlibs:Depends}, |
66 | + ${misc:Depends} |
67 | +Description: GNOME Display Manager |
68 | + GDM provides the equivalent of a "login:" prompt for X displays: it |
69 | + asks for a login and starts X sessions. |
70 | + . |
71 | + It provides all the functionality of XDM, including XDMCP support for |
72 | + managing remote displays, and extends it with the ability to start X |
73 | + servers on demand. |
74 | + . |
75 | + The greeter is written using the GNOME libraries and hence looks like a |
76 | + GNOME application - even to the extent of supporting themes! |
77 | + . |
78 | + This package contains the next generation GDM, which was developed |
79 | + using the technologies on which GNOME 3 is based. |
80 | + |
81 | +Package: libgdmsimplegreeter-dev |
82 | +Section: libdevel |
83 | +Architecture: any |
84 | +Depends: libgdmsimplegreeter1 (= ${binary:Version}), |
85 | + ${shlibs:Depends}, |
86 | + ${misc:Depends} |
87 | +Description: GNOME Display Manager |
88 | + GDM provides the equivalent of a "login:" prompt for X displays: it |
89 | + asks for a login and starts X sessions. |
90 | + . |
91 | + It provides all the functionality of XDM, including XDMCP support for |
92 | + managing remote displays, and extends it with the ability to start X |
93 | + servers on demand. |
94 | + . |
95 | + The greeter is written using the GNOME libraries and hence looks like a |
96 | + GNOME application - even to the extent of supporting themes! |
97 | + . |
98 | + This package contains the next generation GDM, which was developed |
99 | + using the technologies on which GNOME 3 is based. |
100 | + |
101 | +Package: libgdmgreeter1 |
102 | +Section: libs |
103 | +Architecture: any |
104 | +Depends: ${shlibs:Depends}, |
105 | + ${misc:Depends} |
106 | +Description: GNOME Display Manager |
107 | + GDM provides the equivalent of a "login:" prompt for X displays: it |
108 | + asks for a login and starts X sessions. |
109 | + . |
110 | + It provides all the functionality of XDM, including XDMCP support for |
111 | + managing remote displays, and extends it with the ability to start X |
112 | + servers on demand. |
113 | + . |
114 | + The greeter is written using the GNOME libraries and hence looks like a |
115 | + GNOME application - even to the extent of supporting themes! |
116 | + . |
117 | + This package contains the next generation GDM, which was developed |
118 | + using the technologies on which GNOME 3 is based. |
119 | + |
120 | +Package: libgdmgreeter-dev |
121 | +Section: libdevel |
122 | +Architecture: any |
123 | +Depends: libgdmgreeter1 (= ${binary:Version}), |
124 | + gir1.2-gdmgreeter-1.0 (= ${binary:Version}), |
125 | + ${shlibs:Depends}, |
126 | + ${misc:Depends} |
127 | +Description: GNOME Display Manager |
128 | + GDM provides the equivalent of a "login:" prompt for X displays: it |
129 | + asks for a login and starts X sessions. |
130 | + . |
131 | + It provides all the functionality of XDM, including XDMCP support for |
132 | + managing remote displays, and extends it with the ability to start X |
133 | + servers on demand. |
134 | + . |
135 | + The greeter is written using the GNOME libraries and hence looks like a |
136 | + GNOME application - even to the extent of supporting themes! |
137 | + . |
138 | + This package contains the next generation GDM, which was developed |
139 | + using the technologies on which GNOME 3 is based. |
140 | + |
141 | +Package: gir1.2-gdmgreeter-1.0 |
142 | +Section: libs |
143 | +Architecture: any |
144 | +Depends: ${gir:Depends}, |
145 | + ${shlibs:Depends}, |
146 | + ${misc:Depends} |
147 | +Description: GObject introspection data for the GdmGreeter 1.0 library |
148 | + This package contains introspection data for the Clutter scene |
149 | + graph library. |
150 | + . |
151 | + It can be used by packages using the GIRepository format to generate |
152 | + dynamic bindings. |
153 | + |
154 | + |
155 | |
156 | === modified file 'debian/control.in' |
157 | --- debian/control.in 2011-07-14 05:26:11 +0000 |
158 | +++ debian/control.in 2011-10-06 13:19:31 +0000 |
159 | @@ -11,7 +11,7 @@ |
160 | intltool (>= 0.40.0), |
161 | gnome-doc-utils, |
162 | libdbus-glib-1-dev (>= 0.74), |
163 | - libglib2.0-dev (>= 2.27.4), |
164 | + libglib2.0-dev (>= 2.29.3), |
165 | libgtk-3-dev (>= 2.91.1), |
166 | libpango1.0-dev (>= 1.3.0), |
167 | libgconf2-dev (>= 2.31.3), |
168 | @@ -21,8 +21,11 @@ |
169 | libupower-glib-dev (>= 0.9.0), |
170 | libaccountsservice-dev (>= 0.6.12), |
171 | gnome-settings-daemon-dev (>= 2.91.2), |
172 | + libnss3-dev (>= 3.11.1), |
173 | libpolkit-gobject-1-dev (>= 0.92), |
174 | libpolkit-gtk-1-dev (>= 0.92), |
175 | + libgirepository1.0-dev (>= 0.9.12), |
176 | + gobject-introspection (>= 0.9.12-4~), |
177 | libx11-dev, |
178 | libxau-dev, |
179 | libxrandr-dev, |
180 | @@ -79,3 +82,97 @@ |
181 | . |
182 | This package contains the next generation GDM, which was developed |
183 | using the technologies on which GNOME 3 is based. |
184 | + |
185 | +Package: libgdmsimplegreeter1 |
186 | +Section: libs |
187 | +Architecture: any |
188 | +Depends: ${shlibs:Depends}, |
189 | + ${misc:Depends} |
190 | +Description: GNOME Display Manager |
191 | + GDM provides the equivalent of a "login:" prompt for X displays: it |
192 | + asks for a login and starts X sessions. |
193 | + . |
194 | + It provides all the functionality of XDM, including XDMCP support for |
195 | + managing remote displays, and extends it with the ability to start X |
196 | + servers on demand. |
197 | + . |
198 | + The greeter is written using the GNOME libraries and hence looks like a |
199 | + GNOME application - even to the extent of supporting themes! |
200 | + . |
201 | + This package contains the next generation GDM, which was developed |
202 | + using the technologies on which GNOME 3 is based. |
203 | + |
204 | +Package: libgdmsimplegreeter-dev |
205 | +Section: libdevel |
206 | +Architecture: any |
207 | +Depends: libgdmsimplegreeter1 (= ${binary:Version}), |
208 | + ${shlibs:Depends}, |
209 | + ${misc:Depends} |
210 | +Description: GNOME Display Manager |
211 | + GDM provides the equivalent of a "login:" prompt for X displays: it |
212 | + asks for a login and starts X sessions. |
213 | + . |
214 | + It provides all the functionality of XDM, including XDMCP support for |
215 | + managing remote displays, and extends it with the ability to start X |
216 | + servers on demand. |
217 | + . |
218 | + The greeter is written using the GNOME libraries and hence looks like a |
219 | + GNOME application - even to the extent of supporting themes! |
220 | + . |
221 | + This package contains the next generation GDM, which was developed |
222 | + using the technologies on which GNOME 3 is based. |
223 | + |
224 | +Package: libgdmgreeter1 |
225 | +Section: libs |
226 | +Architecture: any |
227 | +Depends: ${shlibs:Depends}, |
228 | + ${misc:Depends} |
229 | +Description: GNOME Display Manager |
230 | + GDM provides the equivalent of a "login:" prompt for X displays: it |
231 | + asks for a login and starts X sessions. |
232 | + . |
233 | + It provides all the functionality of XDM, including XDMCP support for |
234 | + managing remote displays, and extends it with the ability to start X |
235 | + servers on demand. |
236 | + . |
237 | + The greeter is written using the GNOME libraries and hence looks like a |
238 | + GNOME application - even to the extent of supporting themes! |
239 | + . |
240 | + This package contains the next generation GDM, which was developed |
241 | + using the technologies on which GNOME 3 is based. |
242 | + |
243 | +Package: libgdmgreeter-dev |
244 | +Section: libdevel |
245 | +Architecture: any |
246 | +Depends: libgdmgreeter1 (= ${binary:Version}), |
247 | + gir1.2-gdmgreeter-1.0 (= ${binary:Version}), |
248 | + ${shlibs:Depends}, |
249 | + ${misc:Depends} |
250 | +Description: GNOME Display Manager |
251 | + GDM provides the equivalent of a "login:" prompt for X displays: it |
252 | + asks for a login and starts X sessions. |
253 | + . |
254 | + It provides all the functionality of XDM, including XDMCP support for |
255 | + managing remote displays, and extends it with the ability to start X |
256 | + servers on demand. |
257 | + . |
258 | + The greeter is written using the GNOME libraries and hence looks like a |
259 | + GNOME application - even to the extent of supporting themes! |
260 | + . |
261 | + This package contains the next generation GDM, which was developed |
262 | + using the technologies on which GNOME 3 is based. |
263 | + |
264 | +Package: gir1.2-gdmgreeter-1.0 |
265 | +Section: libs |
266 | +Architecture: any |
267 | +Depends: ${gir:Depends}, |
268 | + ${shlibs:Depends}, |
269 | + ${misc:Depends} |
270 | +Description: GObject introspection data for the GdmGreeter 1.0 library |
271 | + This package contains introspection data for the Clutter scene |
272 | + graph library. |
273 | + . |
274 | + It can be used by packages using the GIRepository format to generate |
275 | + dynamic bindings. |
276 | + |
277 | + |
278 | |
279 | === added file 'debian/gdm-welcome.pam' |
280 | --- debian/gdm-welcome.pam 1970-01-01 00:00:00 +0000 |
281 | +++ debian/gdm-welcome.pam 2011-10-06 13:19:31 +0000 |
282 | @@ -0,0 +1,10 @@ |
283 | +#%PAM-1.0 |
284 | +auth required pam_env.so |
285 | +auth required pam_permit.so |
286 | +@include common-auth |
287 | +account required pam_nologin.so |
288 | +@include common-account |
289 | +@include common-password |
290 | +session required pam_loginuid.so |
291 | +session optional pam_keyinit.so force revoke |
292 | +@include common-session |
293 | |
294 | === modified file 'debian/gdm.install' |
295 | --- debian/gdm.install 2011-07-06 08:11:17 +0000 |
296 | +++ debian/gdm.install 2011-10-06 13:19:31 +0000 |
297 | @@ -1,3 +1,12 @@ |
298 | -data/mimeapps.list usr/share/gdm/applications |
299 | -data/mime-dummy-handler.desktop usr/share/gdm/applications |
300 | - |
301 | +debian/tmp/etc/ |
302 | +debian/tmp/usr/bin/ |
303 | +debian/tmp/usr/lib/gdm/gdm* |
304 | +debian/tmp/usr/sbin/ |
305 | +debian/tmp/usr/share/gdm |
306 | +debian/tmp/usr/share/glib-2.0 |
307 | +debian/tmp/usr/share/gnome |
308 | +debian/tmp/usr/share/gnome-session |
309 | +debian/tmp/usr/share/icons |
310 | +debian/tmp/usr/share/locale |
311 | +debian/tmp/usr/share/omf |
312 | +debian/tmp/usr/share/pixmaps |
313 | |
314 | === added file 'debian/gir1.2-gdmgreeter-1.0.install' |
315 | --- debian/gir1.2-gdmgreeter-1.0.install 1970-01-01 00:00:00 +0000 |
316 | +++ debian/gir1.2-gdmgreeter-1.0.install 2011-10-06 13:19:31 +0000 |
317 | @@ -0,0 +1,1 @@ |
318 | +debian/tmp/usr/lib/girepository-1.0/GdmGreeter-1.0.typelib |
319 | |
320 | === added file 'debian/libgdmgreeter-dev.install' |
321 | --- debian/libgdmgreeter-dev.install 1970-01-01 00:00:00 +0000 |
322 | +++ debian/libgdmgreeter-dev.install 2011-10-06 13:19:31 +0000 |
323 | @@ -0,0 +1,4 @@ |
324 | +debian/tmp/usr/include/gdm/greeter/ |
325 | +debian/tmp/usr/lib/libgdmgreeter.so |
326 | +debian/tmp/usr/lib/pkgconfig/gdmgreeter.pc |
327 | +debian/tmp/usr/share/gir-1.0/GdmGreeter-1.0.gir |
328 | |
329 | === added file 'debian/libgdmgreeter1.install' |
330 | --- debian/libgdmgreeter1.install 1970-01-01 00:00:00 +0000 |
331 | +++ debian/libgdmgreeter1.install 2011-10-06 13:19:31 +0000 |
332 | @@ -0,0 +1,1 @@ |
333 | +debian/tmp/usr/lib/libgdmgreeter.so.* |
334 | |
335 | === added file 'debian/libgdmsimplegreeter-dev.install' |
336 | --- debian/libgdmsimplegreeter-dev.install 1970-01-01 00:00:00 +0000 |
337 | +++ debian/libgdmsimplegreeter-dev.install 2011-10-06 13:19:31 +0000 |
338 | @@ -0,0 +1,3 @@ |
339 | +debian/tmp/usr/include/gdm/simple-greeter/ |
340 | +debian/tmp/usr/lib/libgdmsimplegreeter.so |
341 | +debian/tmp/usr/lib/pkgconfig/gdmsimplegreeter.pc |
342 | |
343 | === added file 'debian/libgdmsimplegreeter1.install' |
344 | --- debian/libgdmsimplegreeter1.install 1970-01-01 00:00:00 +0000 |
345 | +++ debian/libgdmsimplegreeter1.install 2011-10-06 13:19:31 +0000 |
346 | @@ -0,0 +1,2 @@ |
347 | +debian/tmp/usr/lib/libgdmsimplegreeter.so.* |
348 | +debian/tmp/usr/lib/gdm/simple-greeter/extensions/lib*.so |
349 | |
350 | === added file 'debian/patches/00git.diff' |
351 | --- debian/patches/00git.diff 1970-01-01 00:00:00 +0000 |
352 | +++ debian/patches/00git.diff 2011-10-06 13:19:31 +0000 |
353 | @@ -0,0 +1,26 @@ |
354 | +From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001 |
355 | +From: György Balló <ballogy@freestart.hu> |
356 | +Date: Fri, 30 Sep 2011 21:48:40 +0000 |
357 | +Subject: data: add back check for gnome-shell before running gdm-shell session |
358 | + |
359 | +Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3 |
360 | + |
361 | +This commit does a quick check to make sure gnome-shell is |
362 | +installed, and supports --gdm-mode. If either of those fail, |
363 | +then fall back to the old greeter. |
364 | + |
365 | +https://bugzilla.gnome.org/show_bug.cgi?id=660409 |
366 | +--- |
367 | +diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in |
368 | +index 3d408c3..496cc10 100644 |
369 | +--- a/data/gdm-shell.session.in |
370 | ++++ b/data/gdm-shell.session.in |
371 | +@@ -1,5 +1,5 @@ |
372 | + [GNOME Session] |
373 | + Name=Display Manager |
374 | + RequiredComponents=gnome-shell;gnome-settings-daemon; |
375 | +-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated |
376 | ++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' |
377 | + FallbackSession=gdm-fallback |
378 | +-- |
379 | +cgit v0.9.0.2 |
380 | |
381 | === removed file 'debian/patches/00git_use_new_power_interface.patch' |
382 | --- debian/patches/00git_use_new_power_interface.patch 2011-07-27 09:45:08 +0000 |
383 | +++ debian/patches/00git_use_new_power_interface.patch 1970-01-01 00:00:00 +0000 |
384 | @@ -1,29 +0,0 @@ |
385 | -From d10d3d61ffc990e48348c87b6310c841a5c33cb6 Mon Sep 17 00:00:00 2001 |
386 | -From: Rodrigo Moya <rodrigo@gnome-db.org> |
387 | -Date: Wed, 27 Jul 2011 11:14:29 +0200 |
388 | -Subject: [PATCH] greeter: Use the new power DBus interface in g-s-d |
389 | - |
390 | ---- |
391 | - gui/simple-greeter/gdm-greeter-panel.c | 6 +++--- |
392 | - 1 files changed, 3 insertions(+), 3 deletions(-) |
393 | - |
394 | -diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c |
395 | -index f3f192a..598aadf 100644 |
396 | ---- a/gui/simple-greeter/gdm-greeter-panel.c |
397 | -+++ b/gui/simple-greeter/gdm-greeter-panel.c |
398 | -@@ -57,9 +57,9 @@ |
399 | - #define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager" |
400 | - #define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager" |
401 | - |
402 | --#define GPM_DBUS_NAME "org.gnome.PowerManager" |
403 | --#define GPM_DBUS_PATH "/org/gnome/PowerManager" |
404 | --#define GPM_DBUS_INTERFACE "org.gnome.PowerManager" |
405 | -+#define GPM_DBUS_NAME "org.gnome.SettingsDaemon" |
406 | -+#define GPM_DBUS_PATH "/org/gnome/SettingsDaemon/Power" |
407 | -+#define GPM_DBUS_INTERFACE "org.gnome.SettingsDaemon.Power" |
408 | - |
409 | - #define KEY_DISABLE_RESTART_BUTTONS "/apps/gdm/simple-greeter/disable_restart_buttons" |
410 | - #define KEY_NOTIFICATION_AREA_PADDING "/apps/notification_area_applet/prefs/padding" |
411 | --- |
412 | -1.7.5.4 |
413 | - |
414 | |
415 | === removed file 'debian/patches/00git_xsession-errors_symlink.patch' |
416 | --- debian/patches/00git_xsession-errors_symlink.patch 2011-06-24 07:39:21 +0000 |
417 | +++ debian/patches/00git_xsession-errors_symlink.patch 1970-01-01 00:00:00 +0000 |
418 | @@ -1,76 +0,0 @@ |
419 | -From 178459c33a64170d9ebe83ebbaeabeb05574f169 Mon Sep 17 00:00:00 2001 |
420 | -From: Martin Pitt <martin.pitt@ubuntu.com> |
421 | -Date: Tue, 7 Jun 2011 20:02:46 +0200 |
422 | -Subject: [PATCH] Allow .xsession-errors to be a symlink or FIFO |
423 | - |
424 | -Don't rename .xsession-errors to .xsession-errors.old if the file is not a |
425 | -regular file. The later code will truncate the file to zero anyway, so even in |
426 | -that case the file won't grow indefinitely. |
427 | - |
428 | -This is handy when the home directory is on NFS and you want to avoid network |
429 | -contention when there are buggy programs which spam .xsession-errors. |
430 | - |
431 | -Also drop the second check that .xsession-errors is a regular file even if the |
432 | -opening succeeded. With that, we'd open a temporary .xsession-errors.XXXXXX |
433 | -even if ~/.xsession-errors was perfectly writable (such as being a symlink to |
434 | -/dev/null). |
435 | - |
436 | -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=639527 |
437 | -Bug-Ubuntu: https://launchpad.net/bugs/771661 |
438 | ---- |
439 | - daemon/gdm-session-worker.c | 12 ++++++------ |
440 | - 1 files changed, 6 insertions(+), 6 deletions(-) |
441 | - |
442 | -diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c |
443 | -index b0a4aa7..d35755c 100644 |
444 | ---- a/daemon/gdm-session-worker.c |
445 | -+++ b/daemon/gdm-session-worker.c |
446 | -@@ -1618,15 +1618,15 @@ gdm_session_worker_watch_child (GdmSessionWorker *worker) |
447 | - } |
448 | - |
449 | - static gboolean |
450 | --_fd_is_normal_file (int fd) |
451 | -+_is_loggable_file (const char* filename) |
452 | - { |
453 | - struct stat file_info; |
454 | - |
455 | -- if (fstat (fd, &file_info) < 0) { |
456 | -+ if (g_lstat (filename, &file_info) < 0) { |
457 | - return FALSE; |
458 | - } |
459 | - |
460 | -- return S_ISREG (file_info.st_mode); |
461 | -+ return S_ISREG (file_info.st_mode) && g_access (filename, R_OK | W_OK) == 0; |
462 | - } |
463 | - |
464 | - static int |
465 | -@@ -1637,7 +1637,7 @@ _open_session_log (const char *dir) |
466 | - |
467 | - filename = g_build_filename (dir, GDM_SESSION_LOG_FILENAME, NULL); |
468 | - |
469 | -- if (g_access (dir, R_OK | W_OK | X_OK) == 0 && g_access (filename, R_OK | W_OK) == 0) { |
470 | -+ if (g_access (dir, R_OK | W_OK | X_OK) == 0 && _is_loggable_file (filename)) { |
471 | - char *filename_old; |
472 | - |
473 | - filename_old = g_strdup_printf ("%s.old", filename); |
474 | -@@ -1647,7 +1647,7 @@ _open_session_log (const char *dir) |
475 | - |
476 | - fd = g_open (filename, O_RDWR | O_APPEND | O_CREAT, 0600); |
477 | - |
478 | -- if (fd < 0 || !_fd_is_normal_file (fd)) { |
479 | -+ if (fd < 0) { |
480 | - char *temp_name; |
481 | - |
482 | - close (fd); |
483 | -@@ -1661,7 +1661,7 @@ _open_session_log (const char *dir) |
484 | - goto out; |
485 | - } |
486 | - |
487 | -- g_warning ("session log '%s' is not a normal file, logging session to '%s' instead.\n", filename, |
488 | -+ g_warning ("session log '%s' is not appendable, logging session to '%s' instead.\n", filename, |
489 | - temp_name); |
490 | - g_free (filename); |
491 | - filename = temp_name; |
492 | --- |
493 | -1.7.5.3 |
494 | - |
495 | |
496 | === modified file 'debian/patches/01_language.patch' |
497 | --- debian/patches/01_language.patch 2011-06-07 12:29:35 +0000 |
498 | +++ debian/patches/01_language.patch 2011-10-06 13:19:31 +0000 |
499 | @@ -1,16 +1,16 @@ |
500 | GNOME #649413 |
501 | |
502 | -Index: gdm-3.0.0/daemon/gdm-session-direct.c |
503 | +Index: gdm-3.1.2/daemon/gdm-session-direct.c |
504 | =================================================================== |
505 | ---- gdm-3.0.0.orig/daemon/gdm-session-direct.c 2011-04-29 01:19:33.240497348 +0200 |
506 | -+++ gdm-3.0.0/daemon/gdm-session-direct.c 2011-04-29 01:19:39.568528281 +0200 |
507 | -@@ -1970,9 +1970,6 @@ setup_session_environment (GdmSessionDir |
508 | - get_session_name (session)); |
509 | - |
510 | - gdm_session_direct_set_environment_variable (session, |
511 | -- "LANG", |
512 | -- get_language_name (session)); |
513 | -- gdm_session_direct_set_environment_variable (session, |
514 | - "GDM_LANG", |
515 | - get_language_name (session)); |
516 | - |
517 | +--- gdm-3.1.2.orig/daemon/gdm-session-direct.c |
518 | ++++ gdm-3.1.2/daemon/gdm-session-direct.c |
519 | +@@ -2224,9 +2224,6 @@ |
520 | + |
521 | + if (locale != NULL && locale[0] != '\0') { |
522 | + gdm_session_direct_set_environment_variable (session, |
523 | +- "LANG", |
524 | +- locale); |
525 | +- gdm_session_direct_set_environment_variable (session, |
526 | + "GDM_LANG", |
527 | + locale); |
528 | + } |
529 | |
530 | === added file 'debian/patches/01git.diff' |
531 | --- debian/patches/01git.diff 1970-01-01 00:00:00 +0000 |
532 | +++ debian/patches/01git.diff 2011-10-06 13:19:31 +0000 |
533 | @@ -0,0 +1,59 @@ |
534 | +From 1d7f466e7bf4cbd1426ce4c3536360f0f9badc3b Mon Sep 17 00:00:00 2001 |
535 | +From: Ray Strode <rstrode@redhat.com> |
536 | +Date: Mon, 26 Sep 2011 15:45:15 +0000 |
537 | +Subject: daemon: fix the legacy auth compatibility layer |
538 | + |
539 | +In commit f91f017071ffa5f5999e6c2e2c0929e290482932 I |
540 | +introduced a translation layer that keeps compatibility |
541 | +for distros who build with --disable-split-authentication. |
542 | + |
543 | +The commit was somewhat faulty, though. I made some last |
544 | +minute clean ups to the patch before committing that I didn't |
545 | +fully test. Those cleanups resulted in the pam service name |
546 | +getting improperly translated and broke the compatibility layer |
547 | +the commit introduced. |
548 | + |
549 | +https://bugzilla.gnome.org/show_bug.cgi?id=658451 |
550 | +--- |
551 | +diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c |
552 | +index 4803bc3..535fdbf 100644 |
553 | +--- a/daemon/gdm-greeter-server.c |
554 | ++++ b/daemon/gdm-greeter-server.c |
555 | +@@ -486,7 +486,7 @@ handle_begin_verification (GdmGreeterServer *greeter_server, |
556 | + dbus_connection_send (connection, reply, NULL); |
557 | + dbus_message_unref (reply); |
558 | + |
559 | +- service_name = translate_outgoing_service_name (greeter_server, service_name); |
560 | ++ service_name = translate_incoming_service_name (greeter_server, service_name); |
561 | + g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION], 0, service_name); |
562 | + |
563 | + return DBUS_HANDLER_RESULT_HANDLED; |
564 | +@@ -544,7 +544,7 @@ handle_begin_verification_for_user (GdmGreeterServer *greeter_server, |
565 | + dbus_connection_send (connection, reply, NULL); |
566 | + dbus_message_unref (reply); |
567 | + |
568 | +- service_name = translate_outgoing_service_name (greeter_server, service_name); |
569 | ++ service_name = translate_incoming_service_name (greeter_server, service_name); |
570 | + g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION_FOR_USER], 0, service_name, text); |
571 | + |
572 | + return DBUS_HANDLER_RESULT_HANDLED; |
573 | +@@ -575,7 +575,7 @@ handle_answer_query (GdmGreeterServer *greeter_server, |
574 | + dbus_connection_send (connection, reply, NULL); |
575 | + dbus_message_unref (reply); |
576 | + |
577 | +- service_name = translate_outgoing_service_name (greeter_server, service_name); |
578 | ++ service_name = translate_incoming_service_name (greeter_server, service_name); |
579 | + g_signal_emit (greeter_server, signals [QUERY_ANSWER], 0, service_name, text); |
580 | + |
581 | + return DBUS_HANDLER_RESULT_HANDLED; |
582 | +@@ -763,7 +763,7 @@ handle_start_session_when_ready (GdmGreeterServer *greeter_server, |
583 | + dbus_connection_send (connection, reply, NULL); |
584 | + dbus_message_unref (reply); |
585 | + |
586 | +- service_name = (char *) translate_outgoing_service_name (greeter_server, service_name); |
587 | ++ service_name = (char *) translate_incoming_service_name (greeter_server, service_name); |
588 | + if (should_start_session) { |
589 | + g_signal_emit (greeter_server, signals [START_SESSION_WHEN_READY], 0, service_name); |
590 | + } else { |
591 | +-- |
592 | +cgit v0.9.0.2 |
593 | |
594 | === modified file 'debian/patches/06_first_vt.patch' |
595 | --- debian/patches/06_first_vt.patch 2011-06-07 12:40:34 +0000 |
596 | +++ debian/patches/06_first_vt.patch 2011-10-06 13:19:31 +0000 |
597 | @@ -2,11 +2,11 @@ |
598 | Author: Martin Pitt <martin.pitt@ubuntu.com> |
599 | Bug-Ubuntu: https://launchpad.net/bugs/396226 |
600 | |
601 | -Index: gdm-3.0.0/daemon/gdm-server.c |
602 | +Index: gdm-3.1.91/daemon/gdm-server.c |
603 | =================================================================== |
604 | ---- gdm-3.0.0.orig/daemon/gdm-server.c 2011-05-30 17:35:34.155075631 +0200 |
605 | -+++ gdm-3.0.0/daemon/gdm-server.c 2011-05-30 17:35:34.983075631 +0200 |
606 | -@@ -640,6 +640,13 @@ |
607 | +--- gdm-3.1.91.orig/daemon/gdm-server.c |
608 | ++++ gdm-3.1.91/daemon/gdm-server.c |
609 | +@@ -643,6 +643,13 @@ |
610 | g_debug ("GdmServer: Starting X server process: %s", freeme); |
611 | g_free (freeme); |
612 | |
613 | @@ -20,7 +20,7 @@ |
614 | error = NULL; |
615 | ret = g_spawn_async_with_pipes (NULL, |
616 | argv, |
617 | -@@ -684,9 +691,14 @@ |
618 | +@@ -725,9 +732,14 @@ |
619 | gdm_server_start (GdmServer *server) |
620 | { |
621 | gboolean res; |
622 | @@ -28,7 +28,7 @@ |
623 | + |
624 | + /* HACK: force initial server to go on vt7, since 1 to 6 usually get |
625 | + * gettys after gdm startup, which interfere with X */ |
626 | -+ firstserver = access ("/var/run/gdm/firstserver.stamp", F_OK) < 0; |
627 | ++ firstserver = access ("/var/run/gdm/firstserver.stamp", F_OK) < 0; |
628 | |
629 | /* fork X server process */ |
630 | - res = gdm_server_spawn (server, NULL); |
631 | |
632 | === modified file 'debian/patches/07_libexec-paths.patch' |
633 | --- debian/patches/07_libexec-paths.patch 2011-06-07 11:08:16 +0000 |
634 | +++ debian/patches/07_libexec-paths.patch 2011-10-06 13:19:31 +0000 |
635 | @@ -1,38 +1,10 @@ |
636 | GNOME #645918 |
637 | |
638 | -Index: gdm-3.0.4/daemon/gdm-server.c |
639 | -=================================================================== |
640 | ---- gdm-3.0.4.orig/daemon/gdm-server.c 2011-05-31 23:59:46.000000000 +0200 |
641 | -+++ gdm-3.0.4/daemon/gdm-server.c 2011-06-01 00:00:15.501219261 +0200 |
642 | -@@ -134,7 +134,7 @@ _gdm_server_query_ck_for_display_device |
643 | - g_return_val_if_fail (GDM_IS_SERVER (server), NULL); |
644 | - |
645 | - error = NULL; |
646 | -- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", |
647 | -+ command = g_strdup_printf (CK_LIBEXECDIR "/ck-get-x11-display-device --display %s", |
648 | - server->priv->display_name); |
649 | - |
650 | - g_debug ("GdmServer: Running helper %s", command); |
651 | -Index: gdm-3.0.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in |
652 | -=================================================================== |
653 | ---- gdm-3.0.4.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-05-31 17:46:56.000000000 +0200 |
654 | -+++ gdm-3.0.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-06-01 00:00:15.501219261 +0200 |
655 | -@@ -1,8 +1,8 @@ |
656 | - [Desktop Entry] |
657 | - Type=Application |
658 | - _Name=GNOME Settings Daemon |
659 | --TryExec=@LIBEXECDIR@/gnome-settings-daemon |
660 | --Exec=@LIBEXECDIR@/gnome-settings-daemon |
661 | -+TryExec=@GSD_LIBEXECDIR@/gnome-settings-daemon |
662 | -+Exec=@GSD_LIBEXECDIR@/gnome-settings-daemon |
663 | - OnlyShowIn=GNOME; |
664 | - X-GNOME-Autostart-Phase=Initialization |
665 | - X-GNOME-Autostart-Notify=true |
666 | -Index: gdm-3.0.4/gui/simple-chooser/gdm-chooser-session.c |
667 | -=================================================================== |
668 | ---- gdm-3.0.4.orig/gui/simple-chooser/gdm-chooser-session.c 2011-05-31 17:46:56.000000000 +0200 |
669 | -+++ gdm-3.0.4/gui/simple-chooser/gdm-chooser-session.c 2011-06-01 00:00:15.501219261 +0200 |
670 | -@@ -131,7 +131,7 @@ start_settings_daemon (GdmChooserSession |
671 | +Index: gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c |
672 | +=================================================================== |
673 | +--- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c |
674 | ++++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c |
675 | +@@ -131,7 +131,7 @@ |
676 | ret = FALSE; |
677 | |
678 | error = NULL; |
679 | @@ -41,31 +13,20 @@ |
680 | if (error != NULL) { |
681 | g_warning ("Error starting settings daemon: %s", error->message); |
682 | g_error_free (error); |
683 | -Index: gdm-3.0.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in |
684 | -=================================================================== |
685 | ---- gdm-3.0.4.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-03-07 18:40:37.000000000 +0100 |
686 | -+++ gdm-3.0.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-06-01 00:00:15.501219261 +0200 |
687 | -@@ -1,5 +1,5 @@ |
688 | - [Desktop Entry] |
689 | - Type=Application |
690 | - _Name=PolicyKit Authentication Agent |
691 | --Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1 |
692 | -+Exec=@PK_GNOME_LIBEXECDIR@/polkit-gnome-authentication-agent-1 |
693 | - OnlyShowIn=GNOME; |
694 | -Index: gdm-3.0.4/configure.ac |
695 | -=================================================================== |
696 | ---- gdm-3.0.4.orig/configure.ac 2011-05-31 23:59:43.000000000 +0200 |
697 | -+++ gdm-3.0.4/configure.ac 2011-06-01 00:00:32.821303957 +0200 |
698 | -@@ -52,6 +52,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 |
699 | - FONTCONFIG_REQUIRED_VERSION=2.5.0 |
700 | +Index: gdm-3.2.0/configure.ac |
701 | +=================================================================== |
702 | +--- gdm-3.2.0.orig/configure.ac |
703 | ++++ gdm-3.2.0/configure.ac |
704 | +@@ -69,6 +69,7 @@ |
705 | UPOWER_REQUIRED_VERSION=0.9.0 |
706 | ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12 |
707 | + NSS_REQUIRED_VERSION=3.11.1 |
708 | +GSD_REQUIRED_VERSION=2.91.2 |
709 | |
710 | EXTRA_COMPILE_WARNINGS(yes) |
711 | |
712 | -@@ -170,6 +171,39 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2) |
713 | - AM_GCONF_SOURCE_2 |
714 | +@@ -203,6 +204,39 @@ |
715 | + AC_SUBST(LIBGDMGREETER_GIR_INCLUDES) |
716 | |
717 | dnl --------------------------------------------------------------------------- |
718 | +dnl - Paths for dependencies |
719 | @@ -104,11 +65,11 @@ |
720 | dnl - Configuration file stuff |
721 | dnl --------------------------------------------------------------------------- |
722 | |
723 | -Index: gdm-3.0.4/daemon/Makefile.am |
724 | +Index: gdm-3.2.0/daemon/Makefile.am |
725 | =================================================================== |
726 | ---- gdm-3.0.4.orig/daemon/Makefile.am 2011-05-31 16:28:03.000000000 +0200 |
727 | -+++ gdm-3.0.4/daemon/Makefile.am 2011-06-01 00:00:15.501219261 +0200 |
728 | -@@ -12,6 +12,7 @@ AM_CPPFLAGS = \ |
729 | +--- gdm-3.2.0.orig/daemon/Makefile.am |
730 | ++++ gdm-3.2.0/daemon/Makefile.am |
731 | +@@ -12,6 +12,7 @@ |
732 | -DGDMCONFDIR=\"$(gdmconfdir)\" \ |
733 | -DLIBDIR=\"$(libdir)\" \ |
734 | -DLIBEXECDIR=\"$(libexecdir)\" \ |
735 | @@ -116,30 +77,29 @@ |
736 | -DLOGDIR=\"$(logdir)\" \ |
737 | -DSBINDIR=\"$(sbindir)\" \ |
738 | -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ |
739 | -Index: gdm-3.0.4/data/greeter-autostart/Makefile.am |
740 | -=================================================================== |
741 | ---- gdm-3.0.4.orig/data/greeter-autostart/Makefile.am 2011-05-31 17:46:56.000000000 +0200 |
742 | -+++ gdm-3.0.4/data/greeter-autostart/Makefile.am 2011-06-01 00:00:15.501219261 +0200 |
743 | -@@ -5,6 +5,9 @@ edit = sed \ |
744 | - -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \ |
745 | - -e 's|@LIBDIR[@]|$(libdir)|g' \ |
746 | - -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \ |
747 | -+ -e 's|@GSD_LIBEXECDIR[@]|$(GSD_LIBEXECDIR)|g' \ |
748 | -+ -e 's|@PK_GNOME_LIBEXECDIR[@]|$(PK_GNOME_LIBEXECDIR)|g' \ |
749 | -+ -e 's|@SESSION_LIBEXECDIR[@]|$(SESSION_LIBEXECDIR)|g' \ |
750 | - -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' |
751 | - |
752 | - %.desktop.in: %.desktop.in.in Makefile |
753 | -Index: gdm-3.0.4/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in |
754 | -=================================================================== |
755 | ---- gdm-3.0.4.orig/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in 2011-05-31 17:46:56.000000000 +0200 |
756 | -+++ gdm-3.0.4/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in 2011-06-01 00:00:15.501219261 +0200 |
757 | -@@ -1,6 +1,6 @@ |
758 | - [Desktop Entry] |
759 | - Type=Application |
760 | - _Name=GNOME Session Acceleration Checker |
761 | --TryExec=@LIBEXECDIR@/gnome-session-check-accelerated |
762 | --Exec=@LIBEXECDIR@/gnome-session-check-accelerated |
763 | -+TryExec=@SESSION_LIBEXECDIR@/gnome-session-check-accelerated |
764 | -+Exec=@SESSION_LIBEXECDIR@/gnome-session-check-accelerated |
765 | - X-GNOME-Autostart-Phase=Application |
766 | +Index: gdm-3.2.0/daemon/gdm-server.c |
767 | +=================================================================== |
768 | +--- gdm-3.2.0.orig/daemon/gdm-server.c |
769 | ++++ gdm-3.2.0/daemon/gdm-server.c |
770 | +@@ -134,7 +134,7 @@ |
771 | + g_return_val_if_fail (GDM_IS_SERVER (server), NULL); |
772 | + |
773 | + error = NULL; |
774 | +- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", |
775 | ++ command = g_strdup_printf (CK_LIBEXECDIR "/ck-get-x11-display-device --display %s", |
776 | + server->priv->display_name); |
777 | + |
778 | + g_debug ("GdmServer: Running helper %s", command); |
779 | +Index: gdm-3.2.0/data/Makefile.am |
780 | +=================================================================== |
781 | +--- gdm-3.2.0.orig/data/Makefile.am |
782 | ++++ gdm-3.2.0/data/Makefile.am |
783 | +@@ -79,7 +79,7 @@ |
784 | + <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in |
785 | + |
786 | + gdm-shell.session: $(srcdir)/gdm-shell.session.in |
787 | +- sed -e 's,[@]libexecdir[@],$(libexecdir),g' \ |
788 | ++ sed -e 's,[@]libexecdir[@],$(SESSION_LIBEXECDIR),g' \ |
789 | + < $(srcdir)/gdm-shell.session.in > gdm-shell.session |
790 | + |
791 | + localealiasdir = $(datadir)/gdm |
792 | |
793 | === modified file 'debian/patches/08_frequent-users_greeter.patch' |
794 | --- debian/patches/08_frequent-users_greeter.patch 2011-06-07 12:45:02 +0000 |
795 | +++ debian/patches/08_frequent-users_greeter.patch 2011-10-06 13:19:31 +0000 |
796 | @@ -1,8 +1,8 @@ |
797 | -Index: gdm-3.0.0/daemon/gdm-session-worker.c |
798 | +Index: gdm-3.1.2/daemon/gdm-session-worker.c |
799 | =================================================================== |
800 | ---- gdm-3.0.0.orig/daemon/gdm-session-worker.c 2011-04-04 16:37:16.000000000 +0200 |
801 | -+++ gdm-3.0.0/daemon/gdm-session-worker.c 2011-04-28 19:31:39.810452155 +0200 |
802 | -@@ -177,10 +177,13 @@ open_ck_session (GdmSessionWorker *work |
803 | +--- gdm-3.1.2.orig/daemon/gdm-session-worker.c |
804 | ++++ gdm-3.1.2/daemon/gdm-session-worker.c |
805 | +@@ -176,10 +176,13 @@ |
806 | const char *display_name; |
807 | const char *display_device; |
808 | const char *display_hostname; |
809 | @@ -16,7 +16,7 @@ |
810 | if (worker->priv->x11_display_name != NULL) { |
811 | display_name = worker->priv->x11_display_name; |
812 | } else { |
813 | -@@ -223,6 +226,7 @@ open_ck_session (GdmSessionWorker *work |
814 | +@@ -222,6 +225,7 @@ |
815 | res = ck_connector_open_session_with_parameters (worker->priv->ckc, |
816 | &error, |
817 | "unix-user", &pwent->pw_uid, |
818 | |
819 | === modified file 'debian/patches/15_default_session.patch' |
820 | --- debian/patches/15_default_session.patch 2011-08-10 16:30:51 +0000 |
821 | +++ debian/patches/15_default_session.patch 2011-10-06 13:19:31 +0000 |
822 | @@ -4,11 +4,11 @@ |
823 | Bug: https://bugzilla.gnome.org/show_bug.cgi?id=594733 |
824 | Bug-Ubuntu: https://launchpad.net/bugs/403291 |
825 | |
826 | -Index: gdm-3.0.4/configure.ac |
827 | +Index: gdm-3.1.2/configure.ac |
828 | =================================================================== |
829 | ---- gdm-3.0.4.orig/configure.ac 2011-08-10 18:29:07.705952647 +0200 |
830 | -+++ gdm-3.0.4/configure.ac 2011-08-10 18:29:07.749952857 +0200 |
831 | -@@ -121,6 +121,13 @@ |
832 | +--- gdm-3.1.2.orig/configure.ac |
833 | ++++ gdm-3.1.2/configure.ac |
834 | +@@ -146,6 +146,13 @@ |
835 | AC_SUBST(UPOWER_CFLAGS) |
836 | AC_SUBST(UPOWER_LIBS) |
837 | |
838 | @@ -22,10 +22,10 @@ |
839 | PKG_CHECK_MODULES(SIMPLE_GREETER, |
840 | dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION |
841 | gtk+-3.0 >= $GTK_REQUIRED_VERSION |
842 | -Index: gdm-3.0.4/daemon/gdm-session-direct.c |
843 | +Index: gdm-3.1.2/daemon/gdm-session-direct.c |
844 | =================================================================== |
845 | ---- gdm-3.0.4.orig/daemon/gdm-session-direct.c 2011-08-10 18:29:07.673952489 +0200 |
846 | -+++ gdm-3.0.4/daemon/gdm-session-direct.c 2011-08-10 18:29:19.522011234 +0200 |
847 | +--- gdm-3.1.2.orig/daemon/gdm-session-direct.c |
848 | ++++ gdm-3.1.2/daemon/gdm-session-direct.c |
849 | @@ -63,6 +63,10 @@ |
850 | #define GDM_SESSION_DBUS_INTERFACE "org.gnome.DisplayManager.Session" |
851 | #define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel" |
852 | @@ -37,7 +37,7 @@ |
853 | #ifndef GDM_SESSION_DEFAULT_PATH |
854 | #define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin" |
855 | #endif |
856 | -@@ -619,6 +623,26 @@ |
857 | +@@ -681,6 +685,26 @@ |
858 | char *name; |
859 | GSequence *sessions; |
860 | GSequenceIter *session; |
861 | @@ -64,7 +64,7 @@ |
862 | |
863 | if (session_direct->priv->fallback_session_name != NULL) { |
864 | /* verify that the cached version still exists */ |
865 | -@@ -627,7 +651,7 @@ |
866 | +@@ -689,7 +713,7 @@ |
867 | } |
868 | } |
869 | |
870 | @@ -73,10 +73,10 @@ |
871 | if (get_session_command_for_name (name, NULL)) { |
872 | g_free (session_direct->priv->fallback_session_name); |
873 | session_direct->priv->fallback_session_name = name; |
874 | -Index: gdm-3.0.4/utils/Makefile.am |
875 | +Index: gdm-3.1.2/utils/Makefile.am |
876 | =================================================================== |
877 | ---- gdm-3.0.4.orig/utils/Makefile.am 2011-02-18 04:27:53.000000000 +0100 |
878 | -+++ gdm-3.0.4/utils/Makefile.am 2011-08-10 18:29:07.753952884 +0200 |
879 | +--- gdm-3.1.2.orig/utils/Makefile.am |
880 | ++++ gdm-3.1.2/utils/Makefile.am |
881 | @@ -6,11 +6,13 @@ |
882 | -DLOCALSTATEDIR=\""$(localstatedir)"\" \ |
883 | -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\ |
884 | @@ -118,10 +118,10 @@ |
885 | CLEANFILES = \ |
886 | $(NULL) |
887 | |
888 | -Index: gdm-3.0.4/utils/gdm-set-default-session.c |
889 | +Index: gdm-3.1.2/utils/gdm-set-default-session.c |
890 | =================================================================== |
891 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
892 | -+++ gdm-3.0.4/utils/gdm-set-default-session.c 2011-08-10 18:29:07.753952884 +0200 |
893 | +--- /dev/null |
894 | ++++ gdm-3.1.2/utils/gdm-set-default-session.c |
895 | @@ -0,0 +1,271 @@ |
896 | +#ifdef HAVE_CONFIG_H |
897 | +#include "config.h" |
898 | |
899 | === modified file 'debian/patches/16_xserver_path.patch' |
900 | --- debian/patches/16_xserver_path.patch 2011-06-07 12:33:03 +0000 |
901 | +++ debian/patches/16_xserver_path.patch 2011-10-06 13:19:31 +0000 |
902 | @@ -1,8 +1,8 @@ |
903 | -Index: gdm-2.30.2/configure.ac |
904 | +Index: gdm-3.1.2/configure.ac |
905 | =================================================================== |
906 | ---- gdm-2.30.2.orig/configure.ac 2010-04-27 21:27:38.177532027 +0200 |
907 | -+++ gdm-2.30.2/configure.ac 2010-04-27 21:29:03.733526716 +0200 |
908 | -@@ -1129,7 +1129,10 @@ dnl ------------------------------------ |
909 | +--- gdm-3.1.2.orig/configure.ac |
910 | ++++ gdm-3.1.2/configure.ac |
911 | +@@ -1179,7 +1179,10 @@ |
912 | # and /usr/X11 since they often symlink to each other, and configure |
913 | # should use the more stable location (the real directory) if possible. |
914 | # |
915 | |
916 | === removed file 'debian/patches/29_grep_path.patch' |
917 | --- debian/patches/29_grep_path.patch 2011-06-07 13:31:05 +0000 |
918 | +++ debian/patches/29_grep_path.patch 1970-01-01 00:00:00 +0000 |
919 | @@ -1,13 +0,0 @@ |
920 | -Index: gdm-3.0.0/data/Init.in |
921 | -=================================================================== |
922 | ---- gdm-3.0.0.orig/data/Init.in 2011-05-30 17:35:50.855075638 +0200 |
923 | -+++ gdm-3.0.0/data/Init.in 2011-05-30 17:35:57.835075641 +0200 |
924 | -@@ -50,7 +50,7 @@ |
925 | - UNAME=`gdmwhich uname` |
926 | - PROCESSOR=`$UNAME -p` |
927 | - if [ "x$PROCESSOR" = "xsparc" ]; then |
928 | -- if $XMODMAP | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null |
929 | -+ if $XMODMAP | grep mod4 | grep Alt > /dev/null 2>/dev/null |
930 | - then |
931 | - $XMODMAP -e "clear Mod1" \ |
932 | - -e "clear Mod4" \ |
933 | |
934 | === modified file 'debian/patches/29_switch_user.patch' |
935 | --- debian/patches/29_switch_user.patch 2011-06-07 13:09:47 +0000 |
936 | +++ debian/patches/29_switch_user.patch 2011-10-06 13:19:31 +0000 |
937 | @@ -4,10 +4,10 @@ |
938 | Subject: [PATCH] Add SwitchToUser() method which automatically selects that user in the greeter or switches to an already open session |
939 | Bug: https://bugzilla.gnome.org/show_bug.cgi?id=606923 |
940 | |
941 | -Index: gdm-3.0.4/daemon/gdm-display.c |
942 | +Index: gdm-3.1.2/daemon/gdm-display.c |
943 | =================================================================== |
944 | ---- gdm-3.0.4.orig/daemon/gdm-display.c 2011-05-31 16:28:03.000000000 +0200 |
945 | -+++ gdm-3.0.4/daemon/gdm-display.c 2011-06-07 15:08:15.501897278 +0200 |
946 | +--- gdm-3.1.2.orig/daemon/gdm-display.c |
947 | ++++ gdm-3.1.2/daemon/gdm-display.c |
948 | @@ -60,6 +60,7 @@ |
949 | time_t creation_time; |
950 | GTimer *slave_timer; |
951 | @@ -94,11 +94,11 @@ |
952 | PROP_STATUS, |
953 | g_param_spec_int ("status", |
954 | "status", |
955 | -Index: gdm-3.0.4/daemon/gdm-greeter-server.c |
956 | +Index: gdm-3.1.2/daemon/gdm-greeter-server.c |
957 | =================================================================== |
958 | ---- gdm-3.0.4.orig/daemon/gdm-greeter-server.c 2011-05-31 17:46:56.000000000 +0200 |
959 | -+++ gdm-3.0.4/daemon/gdm-greeter-server.c 2011-06-07 15:08:15.501897278 +0200 |
960 | -@@ -281,6 +281,14 @@ |
961 | +--- gdm-3.1.2.orig/daemon/gdm-greeter-server.c |
962 | ++++ gdm-3.1.2/daemon/gdm-greeter-server.c |
963 | +@@ -344,6 +344,14 @@ |
964 | } |
965 | |
966 | void |
967 | @@ -113,7 +113,7 @@ |
968 | gdm_greeter_server_request_timed_login (GdmGreeterServer *greeter_server, |
969 | const char *username, |
970 | int delay) |
971 | -@@ -722,6 +730,9 @@ |
972 | +@@ -848,6 +856,9 @@ |
973 | " <signal name=\"DefaultSessionNameChanged\">\n" |
974 | " <arg name=\"session_name\" type=\"s\"/>\n" |
975 | " </signal>\n" |
976 | @@ -123,7 +123,7 @@ |
977 | " <signal name=\"TimedLoginRequested\">\n" |
978 | " <arg name=\"username\" type=\"s\"/>\n" |
979 | " <arg name=\"delay\" type=\"i\"/>\n" |
980 | -@@ -1077,7 +1088,7 @@ |
981 | +@@ -1208,7 +1219,7 @@ |
982 | "display id", |
983 | NULL, |
984 | G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); |
985 | @@ -132,11 +132,11 @@ |
986 | PROP_USER_NAME, |
987 | g_param_spec_string ("user-name", |
988 | "user name", |
989 | -Index: gdm-3.0.4/daemon/gdm-greeter-server.h |
990 | +Index: gdm-3.1.2/daemon/gdm-greeter-server.h |
991 | =================================================================== |
992 | ---- gdm-3.0.4.orig/daemon/gdm-greeter-server.h 2011-05-31 17:46:56.000000000 +0200 |
993 | -+++ gdm-3.0.4/daemon/gdm-greeter-server.h 2011-06-07 15:08:15.501897278 +0200 |
994 | -@@ -92,6 +92,8 @@ |
995 | +--- gdm-3.1.2.orig/daemon/gdm-greeter-server.h |
996 | ++++ gdm-3.1.2/daemon/gdm-greeter-server.h |
997 | +@@ -107,6 +107,8 @@ |
998 | void gdm_greeter_server_default_session_name_changed (GdmGreeterServer *greeter_server, |
999 | const char *text); |
1000 | |
1001 | @@ -145,10 +145,10 @@ |
1002 | void gdm_greeter_server_request_timed_login (GdmGreeterServer *greeter_server, |
1003 | const char *username, |
1004 | int delay); |
1005 | -Index: gdm-3.0.4/daemon/gdm-local-display-factory.c |
1006 | +Index: gdm-3.1.2/daemon/gdm-local-display-factory.c |
1007 | =================================================================== |
1008 | ---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.c 2011-05-31 16:52:04.000000000 +0200 |
1009 | -+++ gdm-3.0.4/daemon/gdm-local-display-factory.c 2011-06-07 15:08:15.501897278 +0200 |
1010 | +--- gdm-3.1.2.orig/daemon/gdm-local-display-factory.c |
1011 | ++++ gdm-3.1.2/daemon/gdm-local-display-factory.c |
1012 | @@ -228,6 +228,121 @@ |
1013 | return ret; |
1014 | } |
1015 | @@ -271,10 +271,10 @@ |
1016 | gboolean |
1017 | gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory, |
1018 | const char *parent_display_id, |
1019 | -Index: gdm-3.0.4/daemon/gdm-local-display-factory.h |
1020 | +Index: gdm-3.1.2/daemon/gdm-local-display-factory.h |
1021 | =================================================================== |
1022 | ---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.h 2011-02-18 04:27:53.000000000 +0100 |
1023 | -+++ gdm-3.0.4/daemon/gdm-local-display-factory.h 2011-06-07 15:08:15.501897278 +0200 |
1024 | +--- gdm-3.1.2.orig/daemon/gdm-local-display-factory.h |
1025 | ++++ gdm-3.1.2/daemon/gdm-local-display-factory.h |
1026 | @@ -64,6 +64,10 @@ |
1027 | gboolean gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *factory, |
1028 | char **id, |
1029 | @@ -286,10 +286,10 @@ |
1030 | |
1031 | gboolean gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory, |
1032 | const char *parent_display_id, |
1033 | -Index: gdm-3.0.4/daemon/gdm-local-display-factory.xml |
1034 | +Index: gdm-3.1.2/daemon/gdm-local-display-factory.xml |
1035 | =================================================================== |
1036 | ---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.xml 2011-02-18 04:27:53.000000000 +0100 |
1037 | -+++ gdm-3.0.4/daemon/gdm-local-display-factory.xml 2011-06-07 15:08:15.501897278 +0200 |
1038 | +--- gdm-3.1.2.orig/daemon/gdm-local-display-factory.xml |
1039 | ++++ gdm-3.1.2/daemon/gdm-local-display-factory.xml |
1040 | @@ -9,5 +9,9 @@ |
1041 | <method name="CreateTransientDisplay"> |
1042 | <arg name="id" direction="out" type="o"/> |
1043 | @@ -300,11 +300,11 @@ |
1044 | + </method> |
1045 | </interface> |
1046 | </node> |
1047 | -Index: gdm-3.0.4/daemon/gdm-simple-slave.c |
1048 | +Index: gdm-3.1.2/daemon/gdm-simple-slave.c |
1049 | =================================================================== |
1050 | ---- gdm-3.0.4.orig/daemon/gdm-simple-slave.c 2011-06-07 15:08:10.000000000 +0200 |
1051 | -+++ gdm-3.0.4/daemon/gdm-simple-slave.c 2011-06-07 15:08:15.501897278 +0200 |
1052 | -@@ -92,10 +92,13 @@ |
1053 | +--- gdm-3.1.2.orig/daemon/gdm-simple-slave.c |
1054 | ++++ gdm-3.1.2/daemon/gdm-simple-slave.c |
1055 | +@@ -94,10 +94,13 @@ |
1056 | gboolean use_logindevperm; |
1057 | #endif |
1058 | guint plymouth_is_running : 1; |
1059 | @@ -318,7 +318,7 @@ |
1060 | }; |
1061 | |
1062 | static void gdm_simple_slave_class_init (GdmSimpleSlaveClass *klass); |
1063 | -@@ -617,6 +620,16 @@ |
1064 | +@@ -623,6 +626,16 @@ |
1065 | } |
1066 | |
1067 | static void |
1068 | @@ -333,9 +333,9 @@ |
1069 | + |
1070 | +static void |
1071 | on_session_conversation_started (GdmSession *session, |
1072 | + const char *service_name, |
1073 | GdmSimpleSlave *slave) |
1074 | - { |
1075 | -@@ -633,6 +646,19 @@ |
1076 | +@@ -641,6 +654,19 @@ |
1077 | } |
1078 | } |
1079 | |
1080 | @@ -355,7 +355,7 @@ |
1081 | enabled = FALSE; |
1082 | gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); |
1083 | if (! enabled) { |
1084 | -@@ -1566,7 +1592,14 @@ |
1085 | +@@ -1647,7 +1673,14 @@ |
1086 | const GValue *value, |
1087 | GParamSpec *pspec) |
1088 | { |
1089 | @@ -370,7 +370,7 @@ |
1090 | default: |
1091 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
1092 | break; |
1093 | -@@ -1579,7 +1612,14 @@ |
1094 | +@@ -1660,7 +1693,14 @@ |
1095 | GValue *value, |
1096 | GParamSpec *pspec) |
1097 | { |
1098 | @@ -385,7 +385,7 @@ |
1099 | default: |
1100 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
1101 | break; |
1102 | -@@ -1616,6 +1656,14 @@ |
1103 | +@@ -1697,6 +1737,14 @@ |
1104 | |
1105 | g_type_class_add_private (klass, sizeof (GdmSimpleSlavePrivate)); |
1106 | |
1107 | @@ -400,7 +400,7 @@ |
1108 | dbus_g_object_type_install_info (GDM_TYPE_SIMPLE_SLAVE, &dbus_glib_gdm_simple_slave_object_info); |
1109 | } |
1110 | |
1111 | -@@ -1651,12 +1699,13 @@ |
1112 | +@@ -1732,12 +1780,13 @@ |
1113 | } |
1114 | |
1115 | GdmSlave * |
1116 | @@ -415,10 +415,10 @@ |
1117 | NULL); |
1118 | |
1119 | return GDM_SLAVE (object); |
1120 | -Index: gdm-3.0.4/daemon/gdm-simple-slave.h |
1121 | +Index: gdm-3.1.2/daemon/gdm-simple-slave.h |
1122 | =================================================================== |
1123 | ---- gdm-3.0.4.orig/daemon/gdm-simple-slave.h 2011-03-29 06:09:16.000000000 +0200 |
1124 | -+++ gdm-3.0.4/daemon/gdm-simple-slave.h 2011-06-07 15:08:15.501897278 +0200 |
1125 | +--- gdm-3.1.2.orig/daemon/gdm-simple-slave.h |
1126 | ++++ gdm-3.1.2/daemon/gdm-simple-slave.h |
1127 | @@ -48,7 +48,8 @@ |
1128 | } GdmSimpleSlaveClass; |
1129 | |
1130 | @@ -429,10 +429,10 @@ |
1131 | |
1132 | G_END_DECLS |
1133 | |
1134 | -Index: gdm-3.0.4/daemon/simple-slave-main.c |
1135 | +Index: gdm-3.1.2/daemon/simple-slave-main.c |
1136 | =================================================================== |
1137 | ---- gdm-3.0.4.orig/daemon/simple-slave-main.c 2011-03-29 06:09:16.000000000 +0200 |
1138 | -+++ gdm-3.0.4/daemon/simple-slave-main.c 2011-06-07 15:08:15.501897278 +0200 |
1139 | +--- gdm-3.1.2.orig/daemon/simple-slave-main.c |
1140 | ++++ gdm-3.1.2/daemon/simple-slave-main.c |
1141 | @@ -45,6 +45,7 @@ |
1142 | #include "gdm-common.h" |
1143 | #include "gdm-simple-slave.h" |
1144 | @@ -462,10 +462,10 @@ |
1145 | if (slave == NULL) { |
1146 | goto out; |
1147 | } |
1148 | -Index: gdm-3.0.4/data/gdm.conf.in |
1149 | +Index: gdm-3.1.2/data/gdm.conf.in |
1150 | =================================================================== |
1151 | ---- gdm-3.0.4.orig/data/gdm.conf.in 2011-03-07 18:40:37.000000000 +0100 |
1152 | -+++ gdm-3.0.4/data/gdm.conf.in 2011-06-07 15:08:49.411897294 +0200 |
1153 | +--- gdm-3.1.2.orig/data/gdm.conf.in |
1154 | ++++ gdm-3.1.2/data/gdm.conf.in |
1155 | @@ -66,6 +66,9 @@ |
1156 | <allow send_destination="org.gnome.DisplayManager" |
1157 | send_interface="org.gnome.DisplayManager.LocalDisplayFactory" |
1158 | @@ -476,19 +476,19 @@ |
1159 | |
1160 | <allow send_destination="org.gnome.DisplayManager" |
1161 | send_interface="org.gnome.DisplayManager.Manager" |
1162 | -Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-client.c |
1163 | +Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-client.c |
1164 | =================================================================== |
1165 | ---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-client.c 2011-05-31 17:46:56.000000000 +0200 |
1166 | -+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-client.c 2011-06-07 15:08:15.511897278 +0200 |
1167 | -@@ -69,6 +69,7 @@ |
1168 | +--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-client.c |
1169 | ++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-client.c |
1170 | +@@ -70,6 +70,7 @@ |
1171 | SELECTED_USER_CHANGED, |
1172 | DEFAULT_LANGUAGE_NAME_CHANGED, |
1173 | DEFAULT_SESSION_NAME_CHANGED, |
1174 | + SELECT_USER, |
1175 | TIMED_LOGIN_REQUESTED, |
1176 | - USER_AUTHORIZED, |
1177 | + SESSION_OPENED, |
1178 | LAST_SIGNAL |
1179 | -@@ -183,6 +184,14 @@ |
1180 | +@@ -215,6 +216,14 @@ |
1181 | } |
1182 | |
1183 | static void |
1184 | @@ -503,7 +503,7 @@ |
1185 | on_timed_login_requested (GdmGreeterClient *client, |
1186 | DBusMessage *message) |
1187 | { |
1188 | -@@ -649,6 +658,8 @@ |
1189 | +@@ -761,6 +770,8 @@ |
1190 | on_default_language_name_changed (client, message); |
1191 | } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultSessionNameChanged")) { |
1192 | on_default_session_name_changed (client, message); |
1193 | @@ -511,8 +511,8 @@ |
1194 | + on_select_user (client, message); |
1195 | } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "TimedLoginRequested")) { |
1196 | on_timed_login_requested (client, message); |
1197 | - } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "UserAuthorized")) { |
1198 | -@@ -927,6 +938,17 @@ |
1199 | + } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "SessionOpened")) { |
1200 | +@@ -1060,6 +1071,17 @@ |
1201 | NULL, |
1202 | NULL, |
1203 | g_cclosure_marshal_VOID__STRING, |
1204 | @@ -530,11 +530,11 @@ |
1205 | G_TYPE_NONE, |
1206 | 1, G_TYPE_STRING); |
1207 | |
1208 | -Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-client.h |
1209 | +Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-client.h |
1210 | =================================================================== |
1211 | ---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-client.h 2011-05-31 17:46:56.000000000 +0200 |
1212 | -+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-client.h 2011-06-07 15:08:15.511897278 +0200 |
1213 | -@@ -65,6 +65,8 @@ |
1214 | +--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-client.h |
1215 | ++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-client.h |
1216 | +@@ -74,6 +74,8 @@ |
1217 | const char *session_name); |
1218 | void (* default_language_name_changed) (GdmGreeterClient *client, |
1219 | const char *language_name); |
1220 | @@ -543,21 +543,21 @@ |
1221 | void (* timed_login_requested) (GdmGreeterClient *client, |
1222 | const char *username, |
1223 | int delay); |
1224 | -Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-login-window.c |
1225 | +Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-login-window.c |
1226 | =================================================================== |
1227 | ---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-login-window.c 2011-05-31 17:46:56.000000000 +0200 |
1228 | -+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-login-window.c 2011-06-07 15:08:15.511897278 +0200 |
1229 | -@@ -131,6 +131,8 @@ |
1230 | - |
1231 | - guint login_button_handler_id; |
1232 | +--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-login-window.c |
1233 | ++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-login-window.c |
1234 | +@@ -149,6 +149,8 @@ |
1235 | guint start_session_handler_id; |
1236 | + |
1237 | + char *service_name_of_session_ready_to_start; |
1238 | + |
1239 | + char *username; |
1240 | }; |
1241 | |
1242 | enum { |
1243 | -@@ -803,6 +805,24 @@ |
1244 | - login_window->priv->timed_login_already_enabled = TRUE; |
1245 | +@@ -1188,6 +1190,24 @@ |
1246 | + return TRUE; |
1247 | } |
1248 | |
1249 | + |
1250 | @@ -581,7 +581,7 @@ |
1251 | void |
1252 | gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window, |
1253 | const char *username, |
1254 | -@@ -1019,6 +1039,10 @@ |
1255 | +@@ -1432,6 +1452,10 @@ |
1256 | |
1257 | if (!login_window->priv->user_list_disabled) { |
1258 | gtk_widget_show (login_window->priv->user_chooser); |
1259 | @@ -591,25 +591,25 @@ |
1260 | + } |
1261 | } |
1262 | |
1263 | - if (login_window->priv->timed_login_username != NULL |
1264 | -Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-login-window.h |
1265 | + enable_waiting_extensions (login_window); |
1266 | +Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-login-window.h |
1267 | =================================================================== |
1268 | ---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-login-window.h 2011-05-31 17:46:56.000000000 +0200 |
1269 | -+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-login-window.h 2011-06-07 15:08:15.511897278 +0200 |
1270 | -@@ -80,6 +80,8 @@ |
1271 | - void gdm_greeter_login_window_set_default_session_name (GdmGreeterLoginWindow *login_window, |
1272 | - const char *text); |
1273 | +--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-login-window.h |
1274 | ++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-login-window.h |
1275 | +@@ -95,6 +95,8 @@ |
1276 | + gboolean gdm_greeter_login_window_service_unavailable (GdmGreeterLoginWindow *login_window, |
1277 | + const char *service_name); |
1278 | |
1279 | +void gdm_greeter_login_window_select_user (GdmGreeterLoginWindow *login_window, |
1280 | + const char *username); |
1281 | void gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window, |
1282 | const char *username, |
1283 | int delay); |
1284 | -Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-session.c |
1285 | +Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-session.c |
1286 | =================================================================== |
1287 | ---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-session.c 2011-05-31 17:46:56.000000000 +0200 |
1288 | -+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-session.c 2011-06-07 15:08:15.511897278 +0200 |
1289 | -@@ -167,6 +167,15 @@ |
1290 | +--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-session.c |
1291 | ++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-session.c |
1292 | +@@ -170,6 +170,15 @@ |
1293 | } |
1294 | |
1295 | static void |
1296 | @@ -625,7 +625,7 @@ |
1297 | on_timed_login_requested (GdmGreeterClient *client, |
1298 | const char *text, |
1299 | int delay, |
1300 | -@@ -580,6 +589,10 @@ |
1301 | +@@ -600,6 +609,10 @@ |
1302 | G_CALLBACK (on_default_session_name_changed), |
1303 | session); |
1304 | g_signal_connect (session->priv->client, |
1305 | |
1306 | === modified file 'debian/patches/30_don_t_save_failsafe_session.patch' |
1307 | --- debian/patches/30_don_t_save_failsafe_session.patch 2011-06-07 09:19:59 +0000 |
1308 | +++ debian/patches/30_don_t_save_failsafe_session.patch 2011-10-06 13:19:31 +0000 |
1309 | @@ -2,22 +2,22 @@ |
1310 | Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607703 |
1311 | Bug-Ubuntu: https://launchpad.net/bugs/509182 |
1312 | |
1313 | -Index: gdm-3.0.0/daemon/gdm-session-direct.c |
1314 | +Index: gdm-3.1.2/daemon/gdm-session-direct.c |
1315 | =================================================================== |
1316 | ---- gdm-3.0.0.orig/daemon/gdm-session-direct.c 2011-06-07 11:15:40.317629201 +0200 |
1317 | -+++ gdm-3.0.0/daemon/gdm-session-direct.c 2011-06-07 11:17:21.647629249 +0200 |
1318 | -@@ -175,6 +175,32 @@ |
1319 | +--- gdm-3.1.2.orig/daemon/gdm-session-direct.c |
1320 | ++++ gdm-3.1.2/daemon/gdm-session-direct.c |
1321 | +@@ -160,6 +160,32 @@ |
1322 | } |
1323 | |
1324 | static void |
1325 | -+send_dbus_bool_signal (GdmSessionDirect *session, |
1326 | ++send_dbus_bool_signal (GdmSessionConversation *conversation, |
1327 | + const char *name, |
1328 | + const gboolean value) |
1329 | +{ |
1330 | + DBusMessage *message; |
1331 | + DBusMessageIter iter; |
1332 | + |
1333 | -+ g_return_if_fail (session != NULL); |
1334 | ++ g_return_if_fail (conversation != NULL); |
1335 | + |
1336 | + message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH, |
1337 | + GDM_SESSION_DBUS_INTERFACE, |
1338 | @@ -26,7 +26,7 @@ |
1339 | + dbus_message_iter_init_append (message, &iter); |
1340 | + dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &value); |
1341 | + |
1342 | -+ if (! send_dbus_message (session->priv->worker_connection, message)) { |
1343 | ++ if (! send_dbus_message (conversation, message)) { |
1344 | + g_debug ("GdmSessionDirect: Could not send %s signal", |
1345 | + name ? name : "(null)"); |
1346 | + } |
1347 | @@ -36,10 +36,10 @@ |
1348 | + |
1349 | + |
1350 | +static void |
1351 | - send_dbus_void_signal (GdmSessionDirect *session, |
1352 | - const char *name) |
1353 | - { |
1354 | -@@ -605,6 +631,61 @@ |
1355 | + send_dbus_string_signal (GdmSessionConversation *conversation, |
1356 | + const char *name, |
1357 | + const char *text) |
1358 | +@@ -667,6 +693,61 @@ |
1359 | return res; |
1360 | } |
1361 | |
1362 | @@ -101,7 +101,7 @@ |
1363 | static const char * |
1364 | get_default_language_name (GdmSessionDirect *session) |
1365 | { |
1366 | -@@ -1373,6 +1454,9 @@ |
1367 | +@@ -1439,6 +1520,9 @@ |
1368 | " <signal name=\"SetSessionName\">\n" |
1369 | " <arg name=\"session_name\" type=\"s\"/>\n" |
1370 | " </signal>\n" |
1371 | @@ -111,7 +111,7 @@ |
1372 | " <signal name=\"StartProgram\">\n" |
1373 | " <arg name=\"command\" type=\"s\"/>\n" |
1374 | " </signal>\n" |
1375 | -@@ -1949,6 +2033,32 @@ |
1376 | +@@ -2198,6 +2282,32 @@ |
1377 | return get_default_session_name (session); |
1378 | } |
1379 | |
1380 | @@ -144,20 +144,20 @@ |
1381 | static char * |
1382 | get_session_command (GdmSessionDirect *session) |
1383 | { |
1384 | -@@ -2211,6 +2321,9 @@ |
1385 | +@@ -2539,6 +2649,9 @@ |
1386 | |
1387 | - send_dbus_string_signal (impl, "SetSessionName", |
1388 | - get_session_name (impl)); |
1389 | + send_dbus_string_signal (conversation, "SetSessionName", |
1390 | + get_session_name (impl)); |
1391 | + |
1392 | -+ send_dbus_bool_signal (impl, "SetIsFailsafe", |
1393 | -+ get_is_session_failsafe(impl)); |
1394 | ++ send_dbus_bool_signal (conversation, "SetIsFailsafe", |
1395 | ++ get_is_session_failsafe(impl)); |
1396 | + } |
1397 | } |
1398 | |
1399 | - static void |
1400 | -Index: gdm-3.0.0/daemon/gdm-session-settings.c |
1401 | +Index: gdm-3.1.2/daemon/gdm-session-settings.c |
1402 | =================================================================== |
1403 | ---- gdm-3.0.0.orig/daemon/gdm-session-settings.c 2011-04-04 16:37:16.000000000 +0200 |
1404 | -+++ gdm-3.0.0/daemon/gdm-session-settings.c 2011-06-07 11:15:40.487629201 +0200 |
1405 | +--- gdm-3.1.2.orig/daemon/gdm-session-settings.c |
1406 | ++++ gdm-3.1.2/daemon/gdm-session-settings.c |
1407 | @@ -40,6 +40,7 @@ |
1408 | ActUser *user; |
1409 | char *session_name; |
1410 | @@ -260,10 +260,10 @@ |
1411 | |
1412 | if (!act_user_is_loaded (user)) { |
1413 | g_object_unref (user); |
1414 | -Index: gdm-3.0.0/daemon/gdm-session-settings.h |
1415 | +Index: gdm-3.1.2/daemon/gdm-session-settings.h |
1416 | =================================================================== |
1417 | ---- gdm-3.0.0.orig/daemon/gdm-session-settings.h 2011-04-04 16:37:16.000000000 +0200 |
1418 | -+++ gdm-3.0.0/daemon/gdm-session-settings.h 2011-06-07 11:15:40.497629201 +0200 |
1419 | +--- gdm-3.1.2.orig/daemon/gdm-session-settings.h |
1420 | ++++ gdm-3.1.2/daemon/gdm-session-settings.h |
1421 | @@ -60,10 +60,13 @@ |
1422 | gboolean gdm_session_settings_is_loaded (GdmSessionSettings *settings); |
1423 | char *gdm_session_settings_get_language_name (GdmSessionSettings *settings); |
1424 | @@ -278,11 +278,11 @@ |
1425 | |
1426 | G_END_DECLS |
1427 | #endif /* GDM_SESSION_SETTINGS_H */ |
1428 | -Index: gdm-3.0.0/daemon/gdm-session-worker.c |
1429 | +Index: gdm-3.1.2/daemon/gdm-session-worker.c |
1430 | =================================================================== |
1431 | ---- gdm-3.0.0.orig/daemon/gdm-session-worker.c 2011-04-04 16:37:16.000000000 +0200 |
1432 | -+++ gdm-3.0.0/daemon/gdm-session-worker.c 2011-06-07 11:15:40.497629201 +0200 |
1433 | -@@ -1899,6 +1899,14 @@ |
1434 | +--- gdm-3.1.2.orig/daemon/gdm-session-worker.c |
1435 | ++++ gdm-3.1.2/daemon/gdm-session-worker.c |
1436 | +@@ -1912,6 +1912,14 @@ |
1437 | } |
1438 | |
1439 | static void |
1440 | @@ -297,7 +297,7 @@ |
1441 | on_set_session_name (GdmSessionWorker *worker, |
1442 | DBusMessage *message) |
1443 | { |
1444 | -@@ -1921,6 +1929,28 @@ |
1445 | +@@ -1934,6 +1942,28 @@ |
1446 | } |
1447 | |
1448 | static void |
1449 | @@ -326,7 +326,7 @@ |
1450 | gdm_session_worker_set_language_name (GdmSessionWorker *worker, |
1451 | const char *language_name) |
1452 | { |
1453 | -@@ -2552,6 +2582,8 @@ |
1454 | +@@ -2592,6 +2622,8 @@ |
1455 | on_set_language_name (worker, message); |
1456 | } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetSessionName")) { |
1457 | on_set_session_name (worker, message); |
1458 | |
1459 | === modified file 'debian/patches/42_no_ecryptfs_autologin.patch' |
1460 | --- debian/patches/42_no_ecryptfs_autologin.patch 2011-06-07 10:27:02 +0000 |
1461 | +++ debian/patches/42_no_ecryptfs_autologin.patch 2011-10-06 13:19:31 +0000 |
1462 | @@ -2,11 +2,11 @@ |
1463 | Author: Robert Ancell <robert.ancell@canonical.com> |
1464 | Bug: http://launchpad.net/bugs/284443 |
1465 | |
1466 | -Index: gdm-3.0.0/daemon/gdm-simple-slave.c |
1467 | +Index: gdm-3.1.91/daemon/gdm-simple-slave.c |
1468 | =================================================================== |
1469 | ---- gdm-3.0.0.orig/daemon/gdm-simple-slave.c 2011-06-07 12:25:54.047631144 +0200 |
1470 | -+++ gdm-3.0.0/daemon/gdm-simple-slave.c 2011-06-07 12:26:15.497631154 +0200 |
1471 | -@@ -629,6 +629,38 @@ |
1472 | +--- gdm-3.1.91.orig/daemon/gdm-simple-slave.c |
1473 | ++++ gdm-3.1.91/daemon/gdm-simple-slave.c |
1474 | +@@ -620,6 +620,38 @@ |
1475 | slave->priv->username = g_strdup (username); |
1476 | } |
1477 | |
1478 | @@ -44,8 +44,8 @@ |
1479 | + |
1480 | static void |
1481 | on_session_conversation_started (GdmSession *session, |
1482 | - GdmSimpleSlave *slave) |
1483 | -@@ -661,7 +693,8 @@ |
1484 | + const char *service_name, |
1485 | +@@ -654,7 +686,8 @@ |
1486 | |
1487 | enabled = FALSE; |
1488 | gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); |
1489 | @@ -55,7 +55,7 @@ |
1490 | return; |
1491 | } |
1492 | |
1493 | -@@ -1385,6 +1418,8 @@ |
1494 | +@@ -1483,6 +1516,8 @@ |
1495 | if (res) { |
1496 | gboolean enabled; |
1497 | int delay; |
1498 | @@ -64,7 +64,7 @@ |
1499 | |
1500 | /* FIXME: handle wait-for-go */ |
1501 | |
1502 | -@@ -1393,7 +1428,8 @@ |
1503 | +@@ -1491,7 +1526,8 @@ |
1504 | delay = 0; |
1505 | enabled = FALSE; |
1506 | gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, NULL, &delay); |
1507 | @@ -74,7 +74,7 @@ |
1508 | start_greeter (slave); |
1509 | create_new_session (slave); |
1510 | } else { |
1511 | -@@ -1401,6 +1437,7 @@ |
1512 | +@@ -1499,6 +1535,7 @@ |
1513 | gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME); |
1514 | reset_session (slave); |
1515 | } |
1516 | |
1517 | === modified file 'debian/patches/45_time_display_on_greeter.patch' |
1518 | --- debian/patches/45_time_display_on_greeter.patch 2011-06-06 05:27:36 +0000 |
1519 | +++ debian/patches/45_time_display_on_greeter.patch 2011-10-06 13:19:31 +0000 |
1520 | @@ -4,9 +4,10 @@ |
1521 | Forwarded: yes |
1522 | Author: Gunnar Hjalmarsson <ubuntu@gunnar.cc> |
1523 | |
1524 | -diff -Nur -x '*.orig' -x '*~' gdm-3.0.0//gui/simple-greeter/gdm-clock-widget.c gdm-3.0.0.new//gui/simple-greeter/gdm-clock-widget.c |
1525 | ---- gdm-3.0.0//gui/simple-greeter/gdm-clock-widget.c 2011-04-04 16:37:16.000000000 +0200 |
1526 | -+++ gdm-3.0.0.new//gui/simple-greeter/gdm-clock-widget.c 2011-06-05 23:55:31.140297043 +0200 |
1527 | +Index: gdm-3.1.2/gui/simple-greeter/gdm-clock-widget.c |
1528 | +=================================================================== |
1529 | +--- gdm-3.1.2.orig/gui/simple-greeter/gdm-clock-widget.c |
1530 | ++++ gdm-3.1.2/gui/simple-greeter/gdm-clock-widget.c |
1531 | @@ -30,6 +30,7 @@ |
1532 | #include <errno.h> |
1533 | #include <dirent.h> |
1534 | |
1535 | === modified file 'debian/patches/93_xdg_data_dirs.patch' |
1536 | --- debian/patches/93_xdg_data_dirs.patch 2011-06-07 11:22:47 +0000 |
1537 | +++ debian/patches/93_xdg_data_dirs.patch 2011-10-06 13:19:31 +0000 |
1538 | @@ -1,12 +1,12 @@ |
1539 | -Index: gdm-3.0.4/daemon/gdm-welcome-session.c |
1540 | +Index: gdm-3.1.90/daemon/gdm-welcome-session.c |
1541 | =================================================================== |
1542 | ---- gdm-3.0.4.orig/daemon/gdm-welcome-session.c 2011-05-31 17:46:56.000000000 +0200 |
1543 | -+++ gdm-3.0.4/daemon/gdm-welcome-session.c 2011-06-07 13:21:09.771894316 +0200 |
1544 | -@@ -440,6 +440,7 @@ |
1545 | +--- gdm-3.1.90.orig/daemon/gdm-welcome-session.c |
1546 | ++++ gdm-3.1.90/daemon/gdm-welcome-session.c |
1547 | +@@ -322,6 +322,7 @@ |
1548 | g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); |
1549 | g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1")); |
1550 | g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm")); |
1551 | + g_hash_table_insert (hash, g_strdup ("XDG_DATA_DIRS"), g_strdup ("/usr/share/gdm:/usr/local/share:/usr/share")); |
1552 | |
1553 | - g_hash_table_foreach (hash, (GHFunc)listify_hash, env); |
1554 | - g_hash_table_destroy (hash); |
1555 | + return hash; |
1556 | + } |
1557 | |
1558 | === modified file 'debian/patches/series' |
1559 | --- debian/patches/series 2011-08-12 17:20:24 +0000 |
1560 | +++ debian/patches/series 2011-10-06 13:19:31 +0000 |
1561 | @@ -1,15 +1,14 @@ |
1562 | -00git_xsession-errors_symlink.patch |
1563 | -00git_use_new_power_interface.patch |
1564 | +00git.diff |
1565 | +01git.diff |
1566 | ubuntu_plymouth.patch |
1567 | 01_language.patch |
1568 | +07_libexec-paths.patch |
1569 | 06_first_vt.patch |
1570 | -07_libexec-paths.patch |
1571 | -08_frequent-users_greeter.patch |
1572 | +#08_frequent-users_greeter.patch |
1573 | 15_default_session.patch |
1574 | 16_xserver_path.patch |
1575 | -29_grep_path.patch |
1576 | 29_switch_user.patch |
1577 | -30_don_t_save_failsafe_session.patch |
1578 | +#30_don_t_save_failsafe_session.patch |
1579 | #33-multi-keyboard-layouts.patch |
1580 | 42_no_ecryptfs_autologin.patch |
1581 | 45_time_display_on_greeter.patch |
1582 | @@ -18,6 +17,6 @@ |
1583 | ubuntu_dont_catch_sigsegv.patch |
1584 | ubuntu_guest_session.patch |
1585 | ubuntu_upstart_event.patch |
1586 | -ubuntu_no_debug.patch |
1587 | +#ubuntu_no_debug.patch |
1588 | ubuntu_xresources_is_a_dir.patch |
1589 | ubuntu_i18n_oneiric.patch |
1590 | |
1591 | === modified file 'debian/patches/ubuntu_dont_catch_sigsegv.patch' |
1592 | --- debian/patches/ubuntu_dont_catch_sigsegv.patch 2011-06-07 13:01:31 +0000 |
1593 | +++ debian/patches/ubuntu_dont_catch_sigsegv.patch 2011-10-06 13:19:31 +0000 |
1594 | @@ -1,9 +1,9 @@ |
1595 | Description: Don't catch crashes so apport can do its job |
1596 | |
1597 | -Index: gdm-3.0.0/daemon/factory-slave-main.c |
1598 | +Index: gdm-3.1.2/daemon/factory-slave-main.c |
1599 | =================================================================== |
1600 | ---- gdm-3.0.0.orig/daemon/factory-slave-main.c 2010-10-01 13:54:28.000000000 +0200 |
1601 | -+++ gdm-3.0.0/daemon/factory-slave-main.c 2011-05-30 17:35:36.735075632 +0200 |
1602 | +--- gdm-3.1.2.orig/daemon/factory-slave-main.c |
1603 | ++++ gdm-3.1.2/daemon/factory-slave-main.c |
1604 | @@ -231,7 +231,7 @@ |
1605 | gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL); |
1606 | gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL); |
1607 | @@ -13,10 +13,10 @@ |
1608 | gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL); |
1609 | gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL); |
1610 | gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL); |
1611 | -Index: gdm-3.0.0/daemon/product-slave-main.c |
1612 | +Index: gdm-3.1.2/daemon/product-slave-main.c |
1613 | =================================================================== |
1614 | ---- gdm-3.0.0.orig/daemon/product-slave-main.c 2010-10-01 13:54:28.000000000 +0200 |
1615 | -+++ gdm-3.0.0/daemon/product-slave-main.c 2011-05-30 17:35:36.735075632 +0200 |
1616 | +--- gdm-3.1.2.orig/daemon/product-slave-main.c |
1617 | ++++ gdm-3.1.2/daemon/product-slave-main.c |
1618 | @@ -235,7 +235,7 @@ |
1619 | gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL); |
1620 | gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL); |
1621 | @@ -26,10 +26,10 @@ |
1622 | gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL); |
1623 | gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL); |
1624 | gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL); |
1625 | -Index: gdm-3.0.0/daemon/session-worker-main.c |
1626 | +Index: gdm-3.1.2/daemon/session-worker-main.c |
1627 | =================================================================== |
1628 | ---- gdm-3.0.0.orig/daemon/session-worker-main.c 2010-10-01 13:54:28.000000000 +0200 |
1629 | -+++ gdm-3.0.0/daemon/session-worker-main.c 2011-05-30 17:35:36.735075632 +0200 |
1630 | +--- gdm-3.1.2.orig/daemon/session-worker-main.c |
1631 | ++++ gdm-3.1.2/daemon/session-worker-main.c |
1632 | @@ -196,7 +196,7 @@ |
1633 | gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL); |
1634 | gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL); |
1635 | @@ -39,11 +39,11 @@ |
1636 | gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL); |
1637 | gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL); |
1638 | |
1639 | -Index: gdm-3.0.0/daemon/simple-slave-main.c |
1640 | +Index: gdm-3.1.2/daemon/simple-slave-main.c |
1641 | =================================================================== |
1642 | ---- gdm-3.0.0.orig/daemon/simple-slave-main.c 2010-10-01 13:54:28.000000000 +0200 |
1643 | -+++ gdm-3.0.0/daemon/simple-slave-main.c 2011-05-30 17:35:36.735075632 +0200 |
1644 | -@@ -243,7 +243,7 @@ |
1645 | +--- gdm-3.1.2.orig/daemon/simple-slave-main.c |
1646 | ++++ gdm-3.1.2/daemon/simple-slave-main.c |
1647 | +@@ -246,7 +246,7 @@ |
1648 | gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL); |
1649 | gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL); |
1650 | gdm_signal_handler_add (signal_handler, SIGHUP, signal_cb, NULL); |
1651 | @@ -52,10 +52,10 @@ |
1652 | gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL); |
1653 | gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL); |
1654 | gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL); |
1655 | -Index: gdm-3.0.0/daemon/xdmcp-chooser-slave-main.c |
1656 | +Index: gdm-3.1.2/daemon/xdmcp-chooser-slave-main.c |
1657 | =================================================================== |
1658 | ---- gdm-3.0.0.orig/daemon/xdmcp-chooser-slave-main.c 2010-10-01 13:54:28.000000000 +0200 |
1659 | -+++ gdm-3.0.0/daemon/xdmcp-chooser-slave-main.c 2011-05-30 17:35:36.735075632 +0200 |
1660 | +--- gdm-3.1.2.orig/daemon/xdmcp-chooser-slave-main.c |
1661 | ++++ gdm-3.1.2/daemon/xdmcp-chooser-slave-main.c |
1662 | @@ -237,7 +237,7 @@ |
1663 | gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL); |
1664 | gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL); |
1665 | |
1666 | === modified file 'debian/patches/ubuntu_guest_session.patch' |
1667 | --- debian/patches/ubuntu_guest_session.patch 2011-06-07 13:09:47 +0000 |
1668 | +++ debian/patches/ubuntu_guest_session.patch 2011-10-06 13:19:31 +0000 |
1669 | @@ -7,10 +7,10 @@ |
1670 | system) rules around it. |
1671 | Bug: https://wiki.ubuntu.com/DesktopTeam/Specs/Intrepid/GuestAccount |
1672 | |
1673 | -Index: gdm-3.0.4/daemon/gdm-local-display-factory.c |
1674 | +Index: gdm-3.2.0/daemon/gdm-local-display-factory.c |
1675 | =================================================================== |
1676 | ---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.c 2011-06-07 15:08:15.000000000 +0200 |
1677 | -+++ gdm-3.0.4/daemon/gdm-local-display-factory.c 2011-06-07 15:09:05.591897302 +0200 |
1678 | +--- gdm-3.2.0.orig/daemon/gdm-local-display-factory.c |
1679 | ++++ gdm-3.2.0/daemon/gdm-local-display-factory.c |
1680 | @@ -22,6 +22,8 @@ |
1681 | |
1682 | #include <stdlib.h> |
1683 | @@ -20,7 +20,7 @@ |
1684 | |
1685 | #include <glib.h> |
1686 | #include <glib/gi18n.h> |
1687 | -@@ -45,6 +47,8 @@ |
1688 | +@@ -44,6 +46,8 @@ |
1689 | #define GDM_LOCAL_DISPLAY_FACTORY_DBUS_PATH GDM_DBUS_PATH "/LocalDisplayFactory" |
1690 | #define GDM_MANAGER_DBUS_NAME "org.gnome.DisplayManager.LocalDisplayFactory" |
1691 | |
1692 | @@ -29,7 +29,7 @@ |
1693 | #define MAX_DISPLAY_FAILURES 5 |
1694 | |
1695 | struct GdmLocalDisplayFactoryPrivate |
1696 | -@@ -343,6 +347,270 @@ |
1697 | +@@ -342,6 +346,270 @@ |
1698 | return ret; |
1699 | } |
1700 | |
1701 | @@ -300,10 +300,10 @@ |
1702 | gboolean |
1703 | gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory, |
1704 | const char *parent_display_id, |
1705 | -Index: gdm-3.0.4/daemon/gdm-local-display-factory.h |
1706 | +Index: gdm-3.2.0/daemon/gdm-local-display-factory.h |
1707 | =================================================================== |
1708 | ---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.h 2011-06-07 15:08:15.000000000 +0200 |
1709 | -+++ gdm-3.0.4/daemon/gdm-local-display-factory.h 2011-06-07 15:09:05.591897302 +0200 |
1710 | +--- gdm-3.2.0.orig/daemon/gdm-local-display-factory.h |
1711 | ++++ gdm-3.2.0/daemon/gdm-local-display-factory.h |
1712 | @@ -69,6 +69,11 @@ |
1713 | char **id, |
1714 | GError **error); |
1715 | @@ -316,10 +316,10 @@ |
1716 | gboolean gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory, |
1717 | const char *parent_display_id, |
1718 | const char *relay_address, |
1719 | -Index: gdm-3.0.4/daemon/gdm-local-display-factory.xml |
1720 | +Index: gdm-3.2.0/daemon/gdm-local-display-factory.xml |
1721 | =================================================================== |
1722 | ---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.xml 2011-06-07 15:08:15.000000000 +0200 |
1723 | -+++ gdm-3.0.4/daemon/gdm-local-display-factory.xml 2011-06-07 15:09:05.591897302 +0200 |
1724 | +--- gdm-3.2.0.orig/daemon/gdm-local-display-factory.xml |
1725 | ++++ gdm-3.2.0/daemon/gdm-local-display-factory.xml |
1726 | @@ -13,5 +13,9 @@ |
1727 | <arg name="username" direction="in" type="s"/> |
1728 | <arg name="id" direction="out" type="o"/> |
1729 | @@ -330,17 +330,18 @@ |
1730 | + </method> |
1731 | </interface> |
1732 | </node> |
1733 | -Index: gdm-3.0.4/data/gdm.conf.in |
1734 | +Index: gdm-3.2.0/data/gdm.conf.in |
1735 | =================================================================== |
1736 | ---- gdm-3.0.4.orig/data/gdm.conf.in 2011-06-07 15:08:49.000000000 +0200 |
1737 | -+++ gdm-3.0.4/data/gdm.conf.in 2011-06-07 15:09:18.561897308 +0200 |
1738 | -@@ -69,6 +69,9 @@ |
1739 | - <allow send_destination="org.gnome.DisplayManager" |
1740 | - send_interface="org.gnome.DisplayManager.LocalDisplayFactory" |
1741 | +--- gdm-3.2.0.orig/data/gdm.conf.in |
1742 | ++++ gdm-3.2.0/data/gdm.conf.in |
1743 | +@@ -71,6 +71,10 @@ |
1744 | send_member="SwitchToUser"/> |
1745 | -+ <allow send_destination="org.gnome.DisplayManager" |
1746 | + |
1747 | + <allow send_destination="org.gnome.DisplayManager" |
1748 | + send_interface="org.gnome.DisplayManager.LocalDisplayFactory" |
1749 | + send_member="StartGuestSession"/> |
1750 | - |
1751 | - <allow send_destination="org.gnome.DisplayManager" |
1752 | ++ |
1753 | ++ <allow send_destination="org.gnome.DisplayManager" |
1754 | send_interface="org.gnome.DisplayManager.Manager" |
1755 | + send_member="GetDisplays"/> |
1756 | + |
1757 | |
1758 | === modified file 'debian/patches/ubuntu_i18n_oneiric.patch' |
1759 | --- debian/patches/ubuntu_i18n_oneiric.patch 2011-08-12 17:20:24 +0000 |
1760 | +++ debian/patches/ubuntu_i18n_oneiric.patch 2011-10-06 13:19:31 +0000 |
1761 | @@ -2,9 +2,10 @@ |
1762 | Forwarded: not-needed |
1763 | Author: Gunnar Hjalmarsson <ubuntu@gunnar.cc> |
1764 | |
1765 | -diff -Nur -x '*.orig' -x '*~' gdm-3.0.4//data/Xsession.in gdm-3.0.4.new//data/Xsession.in |
1766 | ---- gdm-3.0.4//data/Xsession.in 2011-08-09 14:58:58.000000000 +0200 |
1767 | -+++ gdm-3.0.4.new//data/Xsession.in 2011-08-09 14:59:12.639636230 +0200 |
1768 | +Index: gdm-3.1.2/data/Xsession.in |
1769 | +=================================================================== |
1770 | +--- gdm-3.1.2.orig/data/Xsession.in |
1771 | ++++ gdm-3.1.2/data/Xsession.in |
1772 | @@ -36,6 +36,24 @@ |
1773 | test -f /etc/xprofile && . /etc/xprofile |
1774 | test -f "$HOME/.xprofile" && . "$HOME/.xprofile" |
1775 | |
1776 | === modified file 'debian/patches/ubuntu_no_debug.patch' |
1777 | --- debian/patches/ubuntu_no_debug.patch 2011-06-07 13:13:05 +0000 |
1778 | +++ debian/patches/ubuntu_no_debug.patch 2011-10-06 13:19:31 +0000 |
1779 | @@ -1,9 +1,9 @@ |
1780 | Description: Turn off debugging by default. Logging to syslog will slow down loading. |
1781 | |
1782 | -Index: gdm-2.32.0/common/gdm-common.c |
1783 | +Index: gdm-3.1.90/common/gdm-common.c |
1784 | =================================================================== |
1785 | ---- gdm-2.32.0.orig/common/gdm-common.c 2010-09-15 20:58:10.000000000 +0200 |
1786 | -+++ gdm-2.32.0/common/gdm-common.c 2010-12-07 15:21:02.907502001 +0100 |
1787 | +--- gdm-3.1.90.orig/common/gdm-common.c |
1788 | ++++ gdm-3.1.90/common/gdm-common.c |
1789 | @@ -47,6 +47,7 @@ |
1790 | gboolean |
1791 | gdm_is_version_unstable (void) |
1792 | @@ -21,4 +21,4 @@ |
1793 | +#endif |
1794 | } |
1795 | |
1796 | - void |
1797 | + gboolean |
1798 | |
1799 | === modified file 'debian/patches/ubuntu_plymouth.patch' |
1800 | --- debian/patches/ubuntu_plymouth.patch 2011-07-13 15:34:20 +0000 |
1801 | +++ debian/patches/ubuntu_plymouth.patch 2011-10-06 13:19:31 +0000 |
1802 | @@ -7,9 +7,11 @@ |
1803 | This combined with starting the X server with -background none |
1804 | will give us a nice fade transition when g-s-d starts |
1805 | --- |
1806 | ---- a/daemon/gdm-simple-slave.c |
1807 | -+++ b/daemon/gdm-simple-slave.c |
1808 | -@@ -91,6 +91,7 @@ |
1809 | +Index: gdm-3.2.0/daemon/gdm-simple-slave.c |
1810 | +=================================================================== |
1811 | +--- gdm-3.2.0.orig/daemon/gdm-simple-slave.c |
1812 | ++++ gdm-3.2.0/daemon/gdm-simple-slave.c |
1813 | +@@ -93,6 +93,7 @@ |
1814 | #ifdef HAVE_LOGINDEVPERM |
1815 | gboolean use_logindevperm; |
1816 | #endif |
1817 | @@ -17,7 +19,7 @@ |
1818 | }; |
1819 | |
1820 | enum { |
1821 | -@@ -1098,6 +1099,91 @@ |
1822 | +@@ -1201,6 +1202,91 @@ |
1823 | slave->priv->start_session_when_ready = FALSE; |
1824 | } |
1825 | |
1826 | @@ -109,10 +111,10 @@ |
1827 | static void |
1828 | setup_server (GdmSimpleSlave *slave) |
1829 | { |
1830 | -@@ -1106,6 +1192,19 @@ |
1831 | +@@ -1212,6 +1298,20 @@ |
1832 | |
1833 | - /* Set the busy cursor */ |
1834 | - gdm_slave_set_busy_cursor (GDM_SLAVE (slave)); |
1835 | + /* Set the initial keyboard layout to something reasonable */ |
1836 | + gdm_slave_set_initial_keyboard_layout (GDM_SLAVE (slave)); |
1837 | + |
1838 | + /* The root window has a background that may be useful |
1839 | + * to cross fade or transition from when setting the |
1840 | @@ -126,10 +128,11 @@ |
1841 | + if (slave->priv->plymouth_is_running) { |
1842 | + plymouth_quit_with_transition (slave); |
1843 | + } |
1844 | ++ |
1845 | } |
1846 | |
1847 | static void |
1848 | -@@ -1305,6 +1404,10 @@ |
1849 | +@@ -1415,6 +1515,10 @@ |
1850 | g_debug ("GdmSimpleSlave: server exited with code %d\n", exit_code); |
1851 | |
1852 | gdm_slave_stopped (GDM_SLAVE (slave)); |
1853 | @@ -140,7 +143,7 @@ |
1854 | } |
1855 | |
1856 | static void |
1857 | -@@ -1317,6 +1420,10 @@ |
1858 | +@@ -1427,6 +1531,10 @@ |
1859 | g_strsignal (signal_number)); |
1860 | |
1861 | gdm_slave_stopped (GDM_SLAVE (slave)); |
1862 | @@ -151,7 +154,7 @@ |
1863 | } |
1864 | |
1865 | static gboolean |
1866 | -@@ -1361,7 +1468,21 @@ |
1867 | +@@ -1471,7 +1579,21 @@ |
1868 | G_CALLBACK (on_server_ready), |
1869 | slave); |
1870 | |
1871 | @@ -174,7 +177,7 @@ |
1872 | if (! res) { |
1873 | g_warning (_("Could not start the X " |
1874 | "server (your graphical environment) " |
1875 | -@@ -1371,6 +1492,9 @@ |
1876 | +@@ -1481,6 +1603,9 @@ |
1877 | "In the meantime this display will be " |
1878 | "disabled. Please restart GDM when " |
1879 | "the problem is corrected.")); |
1880 | @@ -184,8 +187,10 @@ |
1881 | exit (1); |
1882 | } |
1883 | |
1884 | ---- a/daemon/gdm-slave.c |
1885 | -+++ b/daemon/gdm-slave.c |
1886 | +Index: gdm-3.2.0/daemon/gdm-slave.c |
1887 | +=================================================================== |
1888 | +--- gdm-3.2.0.orig/daemon/gdm-slave.c |
1889 | ++++ gdm-3.2.0/daemon/gdm-slave.c |
1890 | @@ -43,6 +43,7 @@ |
1891 | #include <dbus/dbus-glib-lowlevel.h> |
1892 | |
1893 | @@ -194,7 +199,7 @@ |
1894 | #include <X11/cursorfont.h> /* for watch cursor */ |
1895 | #include <X11/extensions/Xrandr.h> |
1896 | #include <X11/Xatom.h> |
1897 | -@@ -434,6 +435,77 @@ |
1898 | +@@ -483,6 +484,77 @@ |
1899 | } |
1900 | } |
1901 | |
1902 | @@ -272,9 +277,11 @@ |
1903 | void |
1904 | gdm_slave_set_busy_cursor (GdmSlave *slave) |
1905 | { |
1906 | ---- a/daemon/gdm-slave.h |
1907 | -+++ b/daemon/gdm-slave.h |
1908 | -@@ -77,6 +77,7 @@ |
1909 | +Index: gdm-3.2.0/daemon/gdm-slave.h |
1910 | +=================================================================== |
1911 | +--- gdm-3.2.0.orig/daemon/gdm-slave.h |
1912 | ++++ gdm-3.2.0/daemon/gdm-slave.h |
1913 | +@@ -78,6 +78,7 @@ |
1914 | void gdm_slave_set_initial_cursor_position (GdmSlave *slave); |
1915 | |
1916 | void gdm_slave_set_busy_cursor (GdmSlave *slave); |
1917 | @@ -282,8 +289,10 @@ |
1918 | gboolean gdm_slave_run_script (GdmSlave *slave, |
1919 | const char *dir, |
1920 | const char *username); |
1921 | ---- a/daemon/gdm-server.c |
1922 | -+++ b/daemon/gdm-server.c |
1923 | +Index: gdm-3.2.0/daemon/gdm-server.c |
1924 | +=================================================================== |
1925 | +--- gdm-3.2.0.orig/daemon/gdm-server.c |
1926 | ++++ gdm-3.2.0/daemon/gdm-server.c |
1927 | @@ -34,6 +34,9 @@ |
1928 | #include <signal.h> |
1929 | #include <sys/resource.h> |
1930 | @@ -361,8 +370,10 @@ |
1931 | |
1932 | static void |
1933 | server_died (GdmServer *server) |
1934 | ---- a/daemon/gdm-server.h |
1935 | -+++ b/daemon/gdm-server.h |
1936 | +Index: gdm-3.2.0/daemon/gdm-server.h |
1937 | +=================================================================== |
1938 | +--- gdm-3.2.0.orig/daemon/gdm-server.h |
1939 | ++++ gdm-3.2.0/daemon/gdm-server.h |
1940 | @@ -56,6 +56,7 @@ |
1941 | GdmServer * gdm_server_new (const char *display_id, |
1942 | const char *auth_file); |
1943 | |
1944 | === modified file 'debian/patches/ubuntu_run_xsession.d.patch' |
1945 | --- debian/patches/ubuntu_run_xsession.d.patch 2011-06-07 13:00:08 +0000 |
1946 | +++ debian/patches/ubuntu_run_xsession.d.patch 2011-10-06 13:19:31 +0000 |
1947 | @@ -2,10 +2,10 @@ |
1948 | Author: Martin Pitt <martin.pitt@ubuntu.com> |
1949 | Origin: Ubuntu; /etc/X11/Xsession.d is a Debianism/Ubuntuism |
1950 | |
1951 | -Index: gdm-3.0.0/data/Xsession.in |
1952 | +Index: gdm-3.1.2/data/Xsession.in |
1953 | =================================================================== |
1954 | ---- gdm-3.0.0.orig/data/Xsession.in 2010-10-01 13:54:28.000000000 +0200 |
1955 | -+++ gdm-3.0.0/data/Xsession.in 2011-05-30 17:35:35.811075631 +0200 |
1956 | +--- gdm-3.1.2.orig/data/Xsession.in |
1957 | ++++ gdm-3.1.2/data/Xsession.in |
1958 | @@ -162,6 +162,19 @@ |
1959 | done |
1960 | fi |
1961 | |
1962 | === modified file 'debian/patches/ubuntu_upstart_event.patch' |
1963 | --- debian/patches/ubuntu_upstart_event.patch 2011-06-07 13:04:47 +0000 |
1964 | +++ debian/patches/ubuntu_upstart_event.patch 2011-10-06 13:19:31 +0000 |
1965 | @@ -1,9 +1,9 @@ |
1966 | Description: Emit Upstart events when starting the login session and desktop session |
1967 | |
1968 | -Index: gdm-3.0.0/data/Init.in |
1969 | +Index: gdm-3.1.2/data/Init.in |
1970 | =================================================================== |
1971 | ---- gdm-3.0.0.orig/data/Init.in 2010-10-01 13:54:28.000000000 +0200 |
1972 | -+++ gdm-3.0.0/data/Init.in 2011-05-30 17:35:40.919075634 +0200 |
1973 | +--- gdm-3.1.2.orig/data/Init.in |
1974 | ++++ gdm-3.1.2/data/Init.in |
1975 | @@ -6,6 +6,8 @@ |
1976 | PATH="@X_PATH@:$PATH" |
1977 | OLD_IFS=$IFS |
1978 | @@ -13,10 +13,10 @@ |
1979 | gdmwhich () { |
1980 | COMMAND="$1" |
1981 | OUTPUT= |
1982 | -Index: gdm-3.0.0/data/PreSession.in |
1983 | +Index: gdm-3.1.2/data/PreSession.in |
1984 | =================================================================== |
1985 | ---- gdm-3.0.0.orig/data/PreSession.in 2010-10-01 13:54:28.000000000 +0200 |
1986 | -+++ gdm-3.0.0/data/PreSession.in 2011-05-30 17:35:40.919075634 +0200 |
1987 | +--- gdm-3.1.2.orig/data/PreSession.in |
1988 | ++++ gdm-3.1.2/data/PreSession.in |
1989 | @@ -7,3 +7,5 @@ |
1990 | # Note that output goes into the .xsession-errors file for easy debugging |
1991 | # |
1992 | |
1993 | === modified file 'debian/patches/ubuntu_xresources_is_a_dir.patch' |
1994 | --- debian/patches/ubuntu_xresources_is_a_dir.patch 2011-07-13 15:33:24 +0000 |
1995 | +++ debian/patches/ubuntu_xresources_is_a_dir.patch 2011-10-06 13:19:31 +0000 |
1996 | @@ -1,8 +1,10 @@ |
1997 | Description: Properly loads files from Debian/Ubuntu /etc/X11/Xresources/ dir |
1998 | From: Loïc Minier <loic.minier@ubuntu.com> |
1999 | Date: Wed, 13 Jul 2011 17:32:31 +0200 |
2000 | ---- a/data/Xsession.in |
2001 | -+++ b/data/Xsession.in |
2002 | +Index: gdm-3.1.2/data/Xsession.in |
2003 | +=================================================================== |
2004 | +--- gdm-3.1.2.orig/data/Xsession.in |
2005 | ++++ gdm-3.1.2/data/Xsession.in |
2006 | @@ -99,6 +99,13 @@ |
2007 | |
2008 | if [ -f "$sysresources" ]; then |
2009 | |
2010 | === modified file 'debian/rules' |
2011 | --- debian/rules 2011-07-14 05:26:11 +0000 |
2012 | +++ debian/rules 2011-10-06 13:19:31 +0000 |
2013 | @@ -18,7 +18,7 @@ |
2014 | |
2015 | DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \ |
2016 | --enable-ipv6=yes \ |
2017 | - --with-at-spi-registryd-directory=/usr/lib/at-spi \ |
2018 | + --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ |
2019 | --with-default-path=/usr/local/bin:/usr/bin:/bin:/usr/games \ |
2020 | --with-lang-file=/etc/default/locale \ |
2021 | --with-incomplete-locales |
2022 | @@ -33,16 +33,15 @@ |
2023 | |
2024 | binary-post-install/gdm:: |
2025 | install -m644 debian/gdm-autologin.pam debian/gdm/etc/pam.d/gdm-autologin |
2026 | + install -m644 debian/gdm-welcome.pam debian/gdm/etc/pam.d/gdm-welcome |
2027 | install -m644 debian/gdm.pam debian/gdm/etc/pam.d/gdm |
2028 | install -D -m644 debian/xterm.desktop debian/gdm/usr/share/xsessions/xterm.desktop |
2029 | install -D -m644 debian/xsession.desktop debian/gdm/usr/share/xsessions/xsession.desktop |
2030 | - rm -r debian/gdm/var/gdm debian/gdm/var/run |
2031 | # move custom.conf to the examples |
2032 | mkdir -p debian/gdm/usr/share/doc/gdm/examples |
2033 | mv debian/gdm/etc/gdm/custom.conf debian/gdm/usr/share/doc/gdm/examples |
2034 | # we install onboard (debian/onboard.desktop), and do not have gok |
2035 | - install -m 644 debian/onboard.desktop debian/gdm/usr/share/gdm/autostart/LoginWindow/ |
2036 | - rm debian/gdm/usr/share/gdm/autostart/LoginWindow/gok.desktop |
2037 | + #install -m 644 debian/onboard.desktop debian/gdm/usr/share/gdm/autostart/LoginWindow/ |
2038 | + #rm debian/gdm/usr/share/gdm/autostart/LoginWindow/gok.desktop |
2039 | # we do not currently need a PK agent in the gdm session |
2040 | - rm debian/gdm/usr/share/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop |
2041 | - |
2042 | + #rm debian/gdm/usr/share/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop |
This is obsolete now...