Merge lp:~ricotz/gdm/ubuntu into lp:~ubuntu-desktop/gdm/ubuntu

[Rico Tzschichholz]

update gdm to 3.1.2

[lp:~ricotz/gdm/ubuntu]

383. By Martin Pitt on 2011-09-14

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 on 2011-09-14

releasing version 3.0.4-0ubuntu10

385. By Steve Langasek on 2011-09-19

 for bug #615549 from maverick without explanation.

386. By Steve Langasek on 2011-09-19

clean up the completely illegible start rule for debian/gdm.upstart,
killing off the unnecessary parentheses

387. By Steve Langasek on 2011-09-19

whoops, we do need the outermost parentheses or else upstart can't parse the job

388. By Steve Langasek on 2011-09-20

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 on 2011-09-23

releasing version 3.0.4-0ubuntu11

390. By Rico Tzschichholz on 2011-10-06

* 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, libgdmsimplegreeter-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)]

This is obsolete now...

Unmerged revisions

390. By Rico Tzschichholz on 2011-10-06

* 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, libgdmsimplegreeter-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

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-23 21:29:00 +0000
+++ debian/changelog	2011-10-06 13:19:31 +0000
@@ -1,3 +1,19 @@
+gdm (3.2.0-0ubuntu1) oneiric; urgency=low
+
+  * 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, libgdmsimplegreeter-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
+
+ -- Rico Tzschichholz <[e-mail]>  Fri, 30 Sep 2011 13:05:49 +0200
+
 gdm (3.0.4-0ubuntu11) oneiric; urgency=low
 
   * don't start on graphics-device-added; reintroducing this reverted the fix
 
=== modified file 'debian/control'
--- debian/control	2011-07-14 05:26:11 +0000
+++ debian/control	2011-10-06 13:19:31 +0000
@@ -16,7 +16,7 @@
                intltool (>= 0.40.0),
                gnome-doc-utils,
                libdbus-glib-1-dev (>= 0.74),
-               libglib2.0-dev (>= 2.27.4),
+               libglib2.0-dev (>= 2.29.3),
                libgtk-3-dev (>= 2.91.1),
                libpango1.0-dev (>= 1.3.0),
                libgconf2-dev (>= 2.31.3),
@@ -26,8 +26,11 @@
                libupower-glib-dev (>= 0.9.0),
                libaccountsservice-dev (>= 0.6.12),
                gnome-settings-daemon-dev (>= 2.91.2),
+               libnss3-dev (>= 3.11.1),
                libpolkit-gobject-1-dev (>= 0.92),
                libpolkit-gtk-1-dev (>= 0.92),
+               libgirepository1.0-dev (>= 0.9.12),
+               gobject-introspection (>= 0.9.12-4~),
                libx11-dev,
                libxau-dev,
                libxrandr-dev,
@@ -59,7 +62,6 @@
          gnome-session-bin,
          kbd | console-tools,
          udev (>= 166-0ubuntu4)
-Pre-Depends: dpkg (>= 1.15.7.2)
 Recommends: xserver-xorg,
          metacity | x-window-manager,
          gnome-settings-daemon | xfconf
@@ -85,3 +87,97 @@
  .
  This package contains the next generation GDM, which was developed 
  using the technologies on which GNOME 3 is based.
+
+Package: libgdmsimplegreeter1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME Display Manager
+ GDM provides the equivalent of a "login:" prompt for X displays: it 
+ asks for a login and starts X sessions.
+ .
+ It provides all the functionality of XDM, including XDMCP support for
+ managing remote displays, and extends it with the ability to start X 
+ servers on demand.
+ .
+ The greeter is written using the GNOME libraries and hence looks like a 
+ GNOME application - even to the extent of supporting themes! 
+ .
+ This package contains the next generation GDM, which was developed 
+ using the technologies on which GNOME 3 is based.
+
+Package: libgdmsimplegreeter-dev
+Section: libdevel
+Architecture: any
+Depends: libgdmsimplegreeter1 (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME Display Manager
+ GDM provides the equivalent of a "login:" prompt for X displays: it 
+ asks for a login and starts X sessions.
+ .
+ It provides all the functionality of XDM, including XDMCP support for
+ managing remote displays, and extends it with the ability to start X 
+ servers on demand.
+ .
+ The greeter is written using the GNOME libraries and hence looks like a 
+ GNOME application - even to the extent of supporting themes! 
+ .
+ This package contains the next generation GDM, which was developed 
+ using the technologies on which GNOME 3 is based.
+
+Package: libgdmgreeter1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME Display Manager
+ GDM provides the equivalent of a "login:" prompt for X displays: it 
+ asks for a login and starts X sessions.
+ .
+ It provides all the functionality of XDM, including XDMCP support for
+ managing remote displays, and extends it with the ability to start X 
+ servers on demand.
+ .
+ The greeter is written using the GNOME libraries and hence looks like a 
+ GNOME application - even to the extent of supporting themes! 
+ .
+ This package contains the next generation GDM, which was developed 
+ using the technologies on which GNOME 3 is based.
+
+Package: libgdmgreeter-dev
+Section: libdevel
+Architecture: any
+Depends: libgdmgreeter1 (= ${binary:Version}),
+         gir1.2-gdmgreeter-1.0 (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME Display Manager
+ GDM provides the equivalent of a "login:" prompt for X displays: it 
+ asks for a login and starts X sessions.
+ .
+ It provides all the functionality of XDM, including XDMCP support for
+ managing remote displays, and extends it with the ability to start X 
+ servers on demand.
+ .
+ The greeter is written using the GNOME libraries and hence looks like a 
+ GNOME application - even to the extent of supporting themes! 
+ .
+ This package contains the next generation GDM, which was developed 
+ using the technologies on which GNOME 3 is based.
+
+Package: gir1.2-gdmgreeter-1.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GObject introspection data for the GdmGreeter 1.0 library
+ This package contains introspection data for the Clutter scene
+ graph library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
+
+
 
=== modified file 'debian/control.in'
--- debian/control.in	2011-07-14 05:26:11 +0000
+++ debian/control.in	2011-10-06 13:19:31 +0000
@@ -11,7 +11,7 @@
                intltool (>= 0.40.0),
                gnome-doc-utils,
                libdbus-glib-1-dev (>= 0.74),
-               libglib2.0-dev (>= 2.27.4),
+               libglib2.0-dev (>= 2.29.3),
                libgtk-3-dev (>= 2.91.1),
                libpango1.0-dev (>= 1.3.0),
                libgconf2-dev (>= 2.31.3),
@@ -21,8 +21,11 @@
                libupower-glib-dev (>= 0.9.0),
                libaccountsservice-dev (>= 0.6.12),
                gnome-settings-daemon-dev (>= 2.91.2),
+               libnss3-dev (>= 3.11.1),
                libpolkit-gobject-1-dev (>= 0.92),
                libpolkit-gtk-1-dev (>= 0.92),
+               libgirepository1.0-dev (>= 0.9.12),
+               gobject-introspection (>= 0.9.12-4~),
                libx11-dev,
                libxau-dev,
                libxrandr-dev,
@@ -79,3 +82,97 @@
  .
  This package contains the next generation GDM, which was developed 
  using the technologies on which GNOME 3 is based.
+
+Package: libgdmsimplegreeter1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME Display Manager
+ GDM provides the equivalent of a "login:" prompt for X displays: it 
+ asks for a login and starts X sessions.
+ .
+ It provides all the functionality of XDM, including XDMCP support for
+ managing remote displays, and extends it with the ability to start X 
+ servers on demand.
+ .
+ The greeter is written using the GNOME libraries and hence looks like a 
+ GNOME application - even to the extent of supporting themes! 
+ .
+ This package contains the next generation GDM, which was developed 
+ using the technologies on which GNOME 3 is based.
+
+Package: libgdmsimplegreeter-dev
+Section: libdevel
+Architecture: any
+Depends: libgdmsimplegreeter1 (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME Display Manager
+ GDM provides the equivalent of a "login:" prompt for X displays: it 
+ asks for a login and starts X sessions.
+ .
+ It provides all the functionality of XDM, including XDMCP support for
+ managing remote displays, and extends it with the ability to start X 
+ servers on demand.
+ .
+ The greeter is written using the GNOME libraries and hence looks like a 
+ GNOME application - even to the extent of supporting themes! 
+ .
+ This package contains the next generation GDM, which was developed 
+ using the technologies on which GNOME 3 is based.
+
+Package: libgdmgreeter1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME Display Manager
+ GDM provides the equivalent of a "login:" prompt for X displays: it 
+ asks for a login and starts X sessions.
+ .
+ It provides all the functionality of XDM, including XDMCP support for
+ managing remote displays, and extends it with the ability to start X 
+ servers on demand.
+ .
+ The greeter is written using the GNOME libraries and hence looks like a 
+ GNOME application - even to the extent of supporting themes! 
+ .
+ This package contains the next generation GDM, which was developed 
+ using the technologies on which GNOME 3 is based.
+
+Package: libgdmgreeter-dev
+Section: libdevel
+Architecture: any
+Depends: libgdmgreeter1 (= ${binary:Version}),
+         gir1.2-gdmgreeter-1.0 (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME Display Manager
+ GDM provides the equivalent of a "login:" prompt for X displays: it 
+ asks for a login and starts X sessions.
+ .
+ It provides all the functionality of XDM, including XDMCP support for
+ managing remote displays, and extends it with the ability to start X 
+ servers on demand.
+ .
+ The greeter is written using the GNOME libraries and hence looks like a 
+ GNOME application - even to the extent of supporting themes! 
+ .
+ This package contains the next generation GDM, which was developed 
+ using the technologies on which GNOME 3 is based.
+
+Package: gir1.2-gdmgreeter-1.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: GObject introspection data for the GdmGreeter 1.0 library
+ This package contains introspection data for the Clutter scene
+ graph library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
+
+
 
=== added file 'debian/gdm-welcome.pam'
--- debian/gdm-welcome.pam	1970-01-01 00:00:00 +0000
+++ debian/gdm-welcome.pam	2011-10-06 13:19:31 +0000
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+@include common-auth
+account    required    pam_nologin.so
+@include common-account
+@include common-password
+session    required    pam_loginuid.so
+session    optional    pam_keyinit.so force revoke
+@include common-session
 
=== modified file 'debian/gdm.install'
--- debian/gdm.install	2011-07-06 08:11:17 +0000
+++ debian/gdm.install	2011-10-06 13:19:31 +0000
@@ -1,3 +1,12 @@
-data/mimeapps.list			usr/share/gdm/applications
-data/mime-dummy-handler.desktop		usr/share/gdm/applications
-
+debian/tmp/etc/
+debian/tmp/usr/bin/
+debian/tmp/usr/lib/gdm/gdm*
+debian/tmp/usr/sbin/
+debian/tmp/usr/share/gdm
+debian/tmp/usr/share/glib-2.0
+debian/tmp/usr/share/gnome
+debian/tmp/usr/share/gnome-session
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/omf
+debian/tmp/usr/share/pixmaps
 
=== added file 'debian/gir1.2-gdmgreeter-1.0.install'
--- debian/gir1.2-gdmgreeter-1.0.install	1970-01-01 00:00:00 +0000
+++ debian/gir1.2-gdmgreeter-1.0.install	2011-10-06 13:19:31 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0/GdmGreeter-1.0.typelib
 
=== added file 'debian/libgdmgreeter-dev.install'
--- debian/libgdmgreeter-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libgdmgreeter-dev.install	2011-10-06 13:19:31 +0000
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/gdm/greeter/
+debian/tmp/usr/lib/libgdmgreeter.so
+debian/tmp/usr/lib/pkgconfig/gdmgreeter.pc
+debian/tmp/usr/share/gir-1.0/GdmGreeter-1.0.gir
 
=== added file 'debian/libgdmgreeter1.install'
--- debian/libgdmgreeter1.install	1970-01-01 00:00:00 +0000
+++ debian/libgdmgreeter1.install	2011-10-06 13:19:31 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/libgdmgreeter.so.*
 
=== added file 'debian/libgdmsimplegreeter-dev.install'
--- debian/libgdmsimplegreeter-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libgdmsimplegreeter-dev.install	2011-10-06 13:19:31 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/gdm/simple-greeter/
+debian/tmp/usr/lib/libgdmsimplegreeter.so
+debian/tmp/usr/lib/pkgconfig/gdmsimplegreeter.pc
 
=== added file 'debian/libgdmsimplegreeter1.install'
--- debian/libgdmsimplegreeter1.install	1970-01-01 00:00:00 +0000
+++ debian/libgdmsimplegreeter1.install	2011-10-06 13:19:31 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libgdmsimplegreeter.so.*
+debian/tmp/usr/lib/gdm/simple-greeter/extensions/lib*.so
 
=== added file 'debian/patches/00git.diff'
--- debian/patches/00git.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/00git.diff	2011-10-06 13:19:31 +0000
@@ -0,0 +1,26 @@
+From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
+From: György Balló <[e-mail]>
+Date: Fri, 30 Sep 2011 21:48:40 +0000
+Subject: data: add back check for gnome-shell before running gdm-shell session
+
+Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
+
+This commit does a quick check to make sure gnome-shell is
+installed, and supports --gdm-mode. If either of those fail,
+then fall back to the old greeter.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660409
+---
+diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
+index 3d408c3..496cc10 100644
+--- a/data/gdm-shell.session.in
++++ b/data/gdm-shell.session.in
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
+ FallbackSession=gdm-fallback
+--
+cgit v0.9.0.2
 
=== removed file 'debian/patches/00git_use_new_power_interface.patch'
--- debian/patches/00git_use_new_power_interface.patch	2011-07-27 09:45:08 +0000
+++ debian/patches/00git_use_new_power_interface.patch	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-From d10d3d61ffc990e48348c87b6310c841a5c33cb6 Mon Sep 17 00:00:00 2001
-From: Rodrigo Moya <[e-mail]>
-Date: Wed, 27 Jul 2011 11:14:29 +0200
-Subject: [PATCH] greeter: Use the new power DBus interface in g-s-d
-
----
- gui/simple-greeter/gdm-greeter-panel.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
-index f3f192a..598aadf 100644
---- a/gui/simple-greeter/gdm-greeter-panel.c
-+++ b/gui/simple-greeter/gdm-greeter-panel.c
-@@ -57,9 +57,9 @@
- #define CK_MANAGER_PATH      "/org/freedesktop/ConsoleKit/Manager"
- #define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
- 
--#define GPM_DBUS_NAME      "org.gnome.PowerManager"
--#define GPM_DBUS_PATH      "/org/gnome/PowerManager"
--#define GPM_DBUS_INTERFACE "org.gnome.PowerManager"
-+#define GPM_DBUS_NAME      "org.gnome.SettingsDaemon"
-+#define GPM_DBUS_PATH      "/org/gnome/SettingsDaemon/Power"
-+#define GPM_DBUS_INTERFACE "org.gnome.SettingsDaemon.Power"
- 
- #define KEY_DISABLE_RESTART_BUTTONS "/apps/gdm/simple-greeter/disable_restart_buttons"
- #define KEY_NOTIFICATION_AREA_PADDING "/apps/notification_area_applet/prefs/padding"
--- 
-1.7.5.4
-
 
=== removed file 'debian/patches/00git_xsession-errors_symlink.patch'
--- debian/patches/00git_xsession-errors_symlink.patch	2011-06-24 07:39:21 +0000
+++ debian/patches/00git_xsession-errors_symlink.patch	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-From 178459c33a64170d9ebe83ebbaeabeb05574f169 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <[e-mail]>
-Date: Tue, 7 Jun 2011 20:02:46 +0200
-Subject: [PATCH] Allow .xsession-errors to be a symlink or FIFO
-
-Don't rename .xsession-errors to .xsession-errors.old if the file is not a
-regular file.  The later code will truncate the file to zero anyway, so even in
-that case the file won't grow indefinitely.
-
-This is handy when the home directory is on NFS and you want to avoid network
-contention when there are buggy programs which spam .xsession-errors.
-
-Also drop the second check that .xsession-errors is a regular file even if the
-opening succeeded. With that, we'd open a temporary .xsession-errors.XXXXXX
-even if ~/.xsession-errors was perfectly writable (such as being a symlink to
-/dev/null).
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=639527
-Bug-Ubuntu: https://launchpad.net/bugs/771661
----
- daemon/gdm-session-worker.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index b0a4aa7..d35755c 100644
---- a/daemon/gdm-session-worker.c
-+++ b/daemon/gdm-session-worker.c
-@@ -1618,15 +1618,15 @@ gdm_session_worker_watch_child (GdmSessionWorker *worker)
- }
- 
- static gboolean
--_fd_is_normal_file (int fd)
-+_is_loggable_file (const char* filename)
- {
-         struct stat file_info;
- 
--        if (fstat (fd, &file_info) < 0) {
-+        if (g_lstat (filename, &file_info) < 0) {
-                 return FALSE;
-         }
- 
--        return S_ISREG (file_info.st_mode);
-+        return S_ISREG (file_info.st_mode) && g_access (filename, R_OK | W_OK) == 0;
- }
- 
- static int
-@@ -1637,7 +1637,7 @@ _open_session_log (const char *dir)
- 
-         filename = g_build_filename (dir, GDM_SESSION_LOG_FILENAME, NULL);
- 
--        if (g_access (dir, R_OK | W_OK | X_OK) == 0 && g_access (filename, R_OK | W_OK) == 0) {
-+        if (g_access (dir, R_OK | W_OK | X_OK) == 0 && _is_loggable_file (filename)) {
-                 char *filename_old;
- 
-                 filename_old = g_strdup_printf ("%s.old", filename);
-@@ -1647,7 +1647,7 @@ _open_session_log (const char *dir)
- 
-         fd = g_open (filename, O_RDWR | O_APPEND | O_CREAT, 0600);
- 
--        if (fd < 0 || !_fd_is_normal_file (fd)) {
-+        if (fd < 0) {
-                 char *temp_name;
- 
-                 close (fd);
-@@ -1661,7 +1661,7 @@ _open_session_log (const char *dir)
-                         goto out;
-                 }
- 
--                g_warning ("session log '%s' is not a normal file, logging session to '%s' instead.\n", filename,
-+                g_warning ("session log '%s' is not appendable, logging session to '%s' instead.\n", filename,
-                            temp_name);
-                 g_free (filename);
-                 filename = temp_name;
--- 
-1.7.5.3
-
 
=== modified file 'debian/patches/01_language.patch'
--- debian/patches/01_language.patch	2011-06-07 12:29:35 +0000
+++ debian/patches/01_language.patch	2011-10-06 13:19:31 +0000
@@ -1,16 +1,16 @@
 GNOME #649413
 
-Index: gdm-3.0.0/daemon/gdm-session-direct.c
+Index: gdm-3.1.2/daemon/gdm-session-direct.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/gdm-session-direct.c	2011-04-29 01:19:33.240497348 +0200
-+++ gdm-3.0.0/daemon/gdm-session-direct.c	2011-04-29 01:19:39.568528281 +0200
-@@ -1970,9 +1970,6 @@ setup_session_environment (GdmSessionDir
-                                                      get_session_name (session));
- 
-         gdm_session_direct_set_environment_variable (session,
--                                                     "LANG",
--                                                     get_language_name (session));
--        gdm_session_direct_set_environment_variable (session,
-                                                      "GDM_LANG",
-                                                      get_language_name (session));
- 
+--- gdm-3.1.2.orig/daemon/gdm-session-direct.c
++++ gdm-3.1.2/daemon/gdm-session-direct.c
+@@ -2224,9 +2224,6 @@
+ 
+         if (locale != NULL && locale[0] != '\0') {
+                 gdm_session_direct_set_environment_variable (session,
+-                                                             "LANG",
+-                                                             locale);
+-                gdm_session_direct_set_environment_variable (session,
+                                                              "GDM_LANG",
+                                                              locale);
+         }
 
=== added file 'debian/patches/01git.diff'
--- debian/patches/01git.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/01git.diff	2011-10-06 13:19:31 +0000
@@ -0,0 +1,59 @@
+From 1d7f466e7bf4cbd1426ce4c3536360f0f9badc3b Mon Sep 17 00:00:00 2001
+From: Ray Strode <[e-mail]>
+Date: Mon, 26 Sep 2011 15:45:15 +0000
+Subject: daemon: fix the legacy auth compatibility layer
+
+In commit f91f017071ffa5f5999e6c2e2c0929e290482932 I
+introduced a translation layer that keeps compatibility
+for distros who build with --disable-split-authentication.
+
+The commit was somewhat faulty, though.  I made some last
+minute clean ups to the patch before committing that I didn't
+fully test.  Those cleanups resulted in the pam service name
+getting improperly translated and broke the compatibility layer
+the commit introduced.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658451
+---
+diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
+index 4803bc3..535fdbf 100644
+--- a/daemon/gdm-greeter-server.c
++++ b/daemon/gdm-greeter-server.c
+@@ -486,7 +486,7 @@ handle_begin_verification (GdmGreeterServer *greeter_server,
+         dbus_connection_send (connection, reply, NULL);
+         dbus_message_unref (reply);
+ 
+-        service_name = translate_outgoing_service_name (greeter_server, service_name);
++        service_name = translate_incoming_service_name (greeter_server, service_name);
+         g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION], 0, service_name);
+ 
+         return DBUS_HANDLER_RESULT_HANDLED;
+@@ -544,7 +544,7 @@ handle_begin_verification_for_user (GdmGreeterServer *greeter_server,
+         dbus_connection_send (connection, reply, NULL);
+         dbus_message_unref (reply);
+ 
+-        service_name = translate_outgoing_service_name (greeter_server, service_name);
++        service_name = translate_incoming_service_name (greeter_server, service_name);
+         g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION_FOR_USER], 0, service_name, text);
+ 
+         return DBUS_HANDLER_RESULT_HANDLED;
+@@ -575,7 +575,7 @@ handle_answer_query (GdmGreeterServer *greeter_server,
+         dbus_connection_send (connection, reply, NULL);
+         dbus_message_unref (reply);
+ 
+-        service_name = translate_outgoing_service_name (greeter_server, service_name);
++        service_name = translate_incoming_service_name (greeter_server, service_name);
+         g_signal_emit (greeter_server, signals [QUERY_ANSWER], 0, service_name, text);
+ 
+         return DBUS_HANDLER_RESULT_HANDLED;
+@@ -763,7 +763,7 @@ handle_start_session_when_ready (GdmGreeterServer *greeter_server,
+         dbus_connection_send (connection, reply, NULL);
+         dbus_message_unref (reply);
+ 
+-        service_name = (char *) translate_outgoing_service_name (greeter_server, service_name);
++        service_name = (char *) translate_incoming_service_name (greeter_server, service_name);
+         if (should_start_session) {
+                 g_signal_emit (greeter_server, signals [START_SESSION_WHEN_READY], 0, service_name);
+         } else {
+--
+cgit v0.9.0.2
 
=== modified file 'debian/patches/06_first_vt.patch'
--- debian/patches/06_first_vt.patch	2011-06-07 12:40:34 +0000
+++ debian/patches/06_first_vt.patch	2011-10-06 13:19:31 +0000
@@ -2,11 +2,11 @@
 Author: Martin Pitt <[e-mail]>
 Bug-Ubuntu: https://launchpad.net/bugs/396226
 
-Index: gdm-3.0.0/daemon/gdm-server.c
+Index: gdm-3.1.91/daemon/gdm-server.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/gdm-server.c	2011-05-30 17:35:34.155075631 +0200
-+++ gdm-3.0.0/daemon/gdm-server.c	2011-05-30 17:35:34.983075631 +0200
-@@ -640,6 +640,13 @@
+--- gdm-3.1.91.orig/daemon/gdm-server.c
++++ gdm-3.1.91/daemon/gdm-server.c
+@@ -643,6 +643,13 @@
          g_debug ("GdmServer: Starting X server process: %s", freeme);
          g_free (freeme);
  
@@ -20,7 +20,7 @@
          error = NULL;
          ret = g_spawn_async_with_pipes (NULL,
                                          argv,
-@@ -684,9 +691,14 @@
+@@ -725,9 +732,14 @@
  gdm_server_start (GdmServer *server)
  {
          gboolean res;
@@ -28,7 +28,7 @@
 +
 +        /* HACK: force initial server to go on vt7, since 1 to 6 usually get
 +         * gettys after gdm startup, which interfere with X */
-+	firstserver = access ("/var/run/gdm/firstserver.stamp", F_OK) < 0;
++        firstserver = access ("/var/run/gdm/firstserver.stamp", F_OK) < 0;
  
          /* fork X server process */
 -        res = gdm_server_spawn (server, NULL);
 
=== modified file 'debian/patches/07_libexec-paths.patch'
--- debian/patches/07_libexec-paths.patch	2011-06-07 11:08:16 +0000
+++ debian/patches/07_libexec-paths.patch	2011-10-06 13:19:31 +0000
@@ -1,38 +1,10 @@
 GNOME #645918
 
-Index: gdm-3.0.4/daemon/gdm-server.c
-===================================================================
---- gdm-3.0.4.orig/daemon/gdm-server.c	2011-05-31 23:59:46.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-server.c	2011-06-01 00:00:15.501219261 +0200
-@@ -134,7 +134,7 @@ _gdm_server_query_ck_for_display_device
-         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
- 
-         error = NULL;
--        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+        command = g_strdup_printf (CK_LIBEXECDIR "/ck-get-x11-display-device --display %s",
-                                    server->priv->display_name);
- 
-         g_debug ("GdmServer: Running helper %s", command);
-Index: gdm-3.0.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
-===================================================================
---- gdm-3.0.4.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-06-01 00:00:15.501219261 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Type=Application
- _Name=GNOME Settings Daemon
--TryExec=@LIBEXECDIR@/gnome-settings-daemon
--Exec=@LIBEXECDIR@/gnome-settings-daemon
-+TryExec=@GSD_LIBEXECDIR@/gnome-settings-daemon
-+Exec=@GSD_LIBEXECDIR@/gnome-settings-daemon
- OnlyShowIn=GNOME;
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-Autostart-Notify=true
-Index: gdm-3.0.4/gui/simple-chooser/gdm-chooser-session.c
-===================================================================
---- gdm-3.0.4.orig/gui/simple-chooser/gdm-chooser-session.c	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/gui/simple-chooser/gdm-chooser-session.c	2011-06-01 00:00:15.501219261 +0200
-@@ -131,7 +131,7 @@ start_settings_daemon (GdmChooserSession
+Index: gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c
+===================================================================
+--- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c
++++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c
+@@ -131,7 +131,7 @@
          ret = FALSE;
  
          error = NULL;
@@ -41,31 +13,20 @@
          if (error != NULL) {
                  g_warning ("Error starting settings daemon: %s", error->message);
                  g_error_free (error);
-Index: gdm-3.0.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
-===================================================================
---- gdm-3.0.4.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-03-07 18:40:37.000000000 +0100
-+++ gdm-3.0.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-06-01 00:00:15.501219261 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
- Type=Application
- _Name=PolicyKit Authentication Agent
--Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
-+Exec=@PK_GNOME_LIBEXECDIR@/polkit-gnome-authentication-agent-1
- OnlyShowIn=GNOME;
-Index: gdm-3.0.4/configure.ac
-===================================================================
---- gdm-3.0.4.orig/configure.ac	2011-05-31 23:59:43.000000000 +0200
-+++ gdm-3.0.4/configure.ac	2011-06-01 00:00:32.821303957 +0200
-@@ -52,6 +52,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
- FONTCONFIG_REQUIRED_VERSION=2.5.0
+Index: gdm-3.2.0/configure.ac
+===================================================================
+--- gdm-3.2.0.orig/configure.ac
++++ gdm-3.2.0/configure.ac
+@@ -69,6 +69,7 @@
  UPOWER_REQUIRED_VERSION=0.9.0
  ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
+ NSS_REQUIRED_VERSION=3.11.1
 +GSD_REQUIRED_VERSION=2.91.2
  
  EXTRA_COMPILE_WARNINGS(yes)
  
-@@ -170,6 +171,39 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
- AM_GCONF_SOURCE_2
+@@ -203,6 +204,39 @@
+ AC_SUBST(LIBGDMGREETER_GIR_INCLUDES)
  
  dnl ---------------------------------------------------------------------------
 +dnl - Paths for dependencies
@@ -104,11 +65,11 @@
  dnl - Configuration file stuff
  dnl ---------------------------------------------------------------------------
  
-Index: gdm-3.0.4/daemon/Makefile.am
+Index: gdm-3.2.0/daemon/Makefile.am
 ===================================================================
---- gdm-3.0.4.orig/daemon/Makefile.am	2011-05-31 16:28:03.000000000 +0200
-+++ gdm-3.0.4/daemon/Makefile.am	2011-06-01 00:00:15.501219261 +0200
-@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
+--- gdm-3.2.0.orig/daemon/Makefile.am
++++ gdm-3.2.0/daemon/Makefile.am
+@@ -12,6 +12,7 @@
  	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
  	-DLIBDIR=\"$(libdir)\"				\
  	-DLIBEXECDIR=\"$(libexecdir)\"			\
@@ -116,30 +77,29 @@
  	-DLOGDIR=\"$(logdir)\"				\
  	-DSBINDIR=\"$(sbindir)\"			\
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-Index: gdm-3.0.4/data/greeter-autostart/Makefile.am
-===================================================================
---- gdm-3.0.4.orig/data/greeter-autostart/Makefile.am	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/data/greeter-autostart/Makefile.am	2011-06-01 00:00:15.501219261 +0200
-@@ -5,6 +5,9 @@ edit = sed \
- 	-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \
- 	-e 's|@LIBDIR[@]|$(libdir)|g' \
- 	-e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \
-+	-e 's|@GSD_LIBEXECDIR[@]|$(GSD_LIBEXECDIR)|g' \
-+	-e 's|@PK_GNOME_LIBEXECDIR[@]|$(PK_GNOME_LIBEXECDIR)|g' \
-+	-e 's|@SESSION_LIBEXECDIR[@]|$(SESSION_LIBEXECDIR)|g' \
- 	-e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g'
- 
- %.desktop.in: %.desktop.in.in Makefile
-Index: gdm-3.0.4/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in
-===================================================================
---- gdm-3.0.4.orig/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in	2011-06-01 00:00:15.501219261 +0200
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=Application
- _Name=GNOME Session Acceleration Checker
--TryExec=@LIBEXECDIR@/gnome-session-check-accelerated
--Exec=@LIBEXECDIR@/gnome-session-check-accelerated
-+TryExec=@SESSION_LIBEXECDIR@/gnome-session-check-accelerated
-+Exec=@SESSION_LIBEXECDIR@/gnome-session-check-accelerated
- X-GNOME-Autostart-Phase=Application
+Index: gdm-3.2.0/daemon/gdm-server.c
+===================================================================
+--- gdm-3.2.0.orig/daemon/gdm-server.c
++++ gdm-3.2.0/daemon/gdm-server.c
+@@ -134,7 +134,7 @@
+         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
+ 
+         error = NULL;
+-        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
++        command = g_strdup_printf (CK_LIBEXECDIR "/ck-get-x11-display-device --display %s",
+                                    server->priv->display_name);
+ 
+         g_debug ("GdmServer: Running helper %s", command);
+Index: gdm-3.2.0/data/Makefile.am
+===================================================================
+--- gdm-3.2.0.orig/data/Makefile.am
++++ gdm-3.2.0/data/Makefile.am
+@@ -79,7 +79,7 @@
+ 		<$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
+ 
+ gdm-shell.session: $(srcdir)/gdm-shell.session.in
+-	sed	-e 's,[@]libexecdir[@],$(libexecdir),g' \
++	sed	-e 's,[@]libexecdir[@],$(SESSION_LIBEXECDIR),g' \
+ 		< $(srcdir)/gdm-shell.session.in > gdm-shell.session
+ 
+ localealiasdir = $(datadir)/gdm
 
=== modified file 'debian/patches/08_frequent-users_greeter.patch'
--- debian/patches/08_frequent-users_greeter.patch	2011-06-07 12:45:02 +0000
+++ debian/patches/08_frequent-users_greeter.patch	2011-10-06 13:19:31 +0000
@@ -1,8 +1,8 @@
-Index: gdm-3.0.0/daemon/gdm-session-worker.c
+Index: gdm-3.1.2/daemon/gdm-session-worker.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/gdm-session-worker.c	2011-04-04 16:37:16.000000000 +0200
-+++ gdm-3.0.0/daemon/gdm-session-worker.c	2011-04-28 19:31:39.810452155 +0200
-@@ -177,10 +177,13 @@ open_ck_session (GdmSessionWorker  *work
+--- gdm-3.1.2.orig/daemon/gdm-session-worker.c
++++ gdm-3.1.2/daemon/gdm-session-worker.c
+@@ -176,10 +176,13 @@
          const char     *display_name;
          const char     *display_device;
          const char     *display_hostname;
@@ -16,7 +16,7 @@
          if (worker->priv->x11_display_name != NULL) {
                  display_name = worker->priv->x11_display_name;
          } else {
-@@ -223,6 +226,7 @@ open_ck_session (GdmSessionWorker  *work
+@@ -222,6 +225,7 @@
          res = ck_connector_open_session_with_parameters (worker->priv->ckc,
                                                           &error,
                                                           "unix-user", &pwent->pw_uid,
 
=== modified file 'debian/patches/15_default_session.patch'
--- debian/patches/15_default_session.patch	2011-08-10 16:30:51 +0000
+++ debian/patches/15_default_session.patch	2011-10-06 13:19:31 +0000
@@ -4,11 +4,11 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=594733
 Bug-Ubuntu: https://launchpad.net/bugs/403291
 
-Index: gdm-3.0.4/configure.ac
+Index: gdm-3.1.2/configure.ac
 ===================================================================
---- gdm-3.0.4.orig/configure.ac	2011-08-10 18:29:07.705952647 +0200
-+++ gdm-3.0.4/configure.ac	2011-08-10 18:29:07.749952857 +0200
-@@ -121,6 +121,13 @@
+--- gdm-3.1.2.orig/configure.ac
++++ gdm-3.1.2/configure.ac
+@@ -146,6 +146,13 @@
  AC_SUBST(UPOWER_CFLAGS)
  AC_SUBST(UPOWER_LIBS)
  
@@ -22,10 +22,10 @@
  PKG_CHECK_MODULES(SIMPLE_GREETER,
          dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
          gtk+-3.0 >= $GTK_REQUIRED_VERSION
-Index: gdm-3.0.4/daemon/gdm-session-direct.c
+Index: gdm-3.1.2/daemon/gdm-session-direct.c
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-session-direct.c	2011-08-10 18:29:07.673952489 +0200
-+++ gdm-3.0.4/daemon/gdm-session-direct.c	2011-08-10 18:29:19.522011234 +0200
+--- gdm-3.1.2.orig/daemon/gdm-session-direct.c
++++ gdm-3.1.2/daemon/gdm-session-direct.c
 @@ -63,6 +63,10 @@
  #define GDM_SESSION_DBUS_INTERFACE    "org.gnome.DisplayManager.Session"
  #define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel"
@@ -37,7 +37,7 @@
  #ifndef GDM_SESSION_DEFAULT_PATH
  #define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin"
  #endif
-@@ -619,6 +623,26 @@
+@@ -681,6 +685,26 @@
          char         *name;
          GSequence    *sessions;
          GSequenceIter *session;
@@ -64,7 +64,7 @@
  
          if (session_direct->priv->fallback_session_name != NULL) {
                  /* verify that the cached version still exists */
-@@ -627,7 +651,7 @@
+@@ -689,7 +713,7 @@
                  }
          }
  
@@ -73,10 +73,10 @@
          if (get_session_command_for_name (name, NULL)) {
                  g_free (session_direct->priv->fallback_session_name);
                  session_direct->priv->fallback_session_name = name;
-Index: gdm-3.0.4/utils/Makefile.am
+Index: gdm-3.1.2/utils/Makefile.am
 ===================================================================
---- gdm-3.0.4.orig/utils/Makefile.am	2011-02-18 04:27:53.000000000 +0100
-+++ gdm-3.0.4/utils/Makefile.am	2011-08-10 18:29:07.753952884 +0200
+--- gdm-3.1.2.orig/utils/Makefile.am
++++ gdm-3.1.2/utils/Makefile.am
 @@ -6,11 +6,13 @@
  	-DLOCALSTATEDIR=\""$(localstatedir)"\" 		\
  	-DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\
@@ -118,10 +118,10 @@
  CLEANFILES = 			\
  	$(NULL)
  
-Index: gdm-3.0.4/utils/gdm-set-default-session.c
+Index: gdm-3.1.2/utils/gdm-set-default-session.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-3.0.4/utils/gdm-set-default-session.c	2011-08-10 18:29:07.753952884 +0200
+--- /dev/null
++++ gdm-3.1.2/utils/gdm-set-default-session.c
 @@ -0,0 +1,271 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
 
=== modified file 'debian/patches/16_xserver_path.patch'
--- debian/patches/16_xserver_path.patch	2011-06-07 12:33:03 +0000
+++ debian/patches/16_xserver_path.patch	2011-10-06 13:19:31 +0000
@@ -1,8 +1,8 @@
-Index: gdm-2.30.2/configure.ac
+Index: gdm-3.1.2/configure.ac
 ===================================================================
---- gdm-2.30.2.orig/configure.ac	2010-04-27 21:27:38.177532027 +0200
-+++ gdm-2.30.2/configure.ac	2010-04-27 21:29:03.733526716 +0200
-@@ -1129,7 +1129,10 @@ dnl ------------------------------------
+--- gdm-3.1.2.orig/configure.ac
++++ gdm-3.1.2/configure.ac
+@@ -1179,7 +1179,10 @@
  # and /usr/X11 since they often symlink to each other, and configure
  # should use the more stable location (the real directory) if possible.
  #
 
=== removed file 'debian/patches/29_grep_path.patch'
--- debian/patches/29_grep_path.patch	2011-06-07 13:31:05 +0000
+++ debian/patches/29_grep_path.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: gdm-3.0.0/data/Init.in
-===================================================================
---- gdm-3.0.0.orig/data/Init.in	2011-05-30 17:35:50.855075638 +0200
-+++ gdm-3.0.0/data/Init.in	2011-05-30 17:35:57.835075641 +0200
-@@ -50,7 +50,7 @@
-   UNAME=`gdmwhich uname`
-   PROCESSOR=`$UNAME -p`
-   if [ "x$PROCESSOR" = "xsparc" ]; then
--    if $XMODMAP | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null
-+    if $XMODMAP | grep mod4 | grep Alt > /dev/null 2>/dev/null
-     then
-       $XMODMAP -e "clear Mod1" \
-                -e "clear Mod4" \
 
=== modified file 'debian/patches/29_switch_user.patch'
--- debian/patches/29_switch_user.patch	2011-06-07 13:09:47 +0000
+++ debian/patches/29_switch_user.patch	2011-10-06 13:19:31 +0000
@@ -4,10 +4,10 @@
 Subject: [PATCH] Add SwitchToUser() method which automatically selects that user in the greeter or switches to an already open session
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=606923
 
-Index: gdm-3.0.4/daemon/gdm-display.c
+Index: gdm-3.1.2/daemon/gdm-display.c
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-display.c	2011-05-31 16:28:03.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-display.c	2011-06-07 15:08:15.501897278 +0200
+--- gdm-3.1.2.orig/daemon/gdm-display.c
++++ gdm-3.1.2/daemon/gdm-display.c
 @@ -60,6 +60,7 @@
          time_t                creation_time;
          GTimer               *slave_timer;
@@ -94,11 +94,11 @@
                                           PROP_STATUS,
                                           g_param_spec_int ("status",
                                                             "status",
-Index: gdm-3.0.4/daemon/gdm-greeter-server.c
+Index: gdm-3.1.2/daemon/gdm-greeter-server.c
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-greeter-server.c	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-greeter-server.c	2011-06-07 15:08:15.501897278 +0200
-@@ -281,6 +281,14 @@
+--- gdm-3.1.2.orig/daemon/gdm-greeter-server.c
++++ gdm-3.1.2/daemon/gdm-greeter-server.c
+@@ -344,6 +344,14 @@
  }
  
  void
@@ -113,7 +113,7 @@
  gdm_greeter_server_request_timed_login (GdmGreeterServer *greeter_server,
                                          const char       *username,
                                          int               delay)
-@@ -722,6 +730,9 @@
+@@ -848,6 +856,9 @@
                                 "    <signal name=\"DefaultSessionNameChanged\">\n"
                                 "      <arg name=\"session_name\" type=\"s\"/>\n"
                                 "    </signal>\n"
@@ -123,7 +123,7 @@
                                 "    <signal name=\"TimedLoginRequested\">\n"
                                 "      <arg name=\"username\" type=\"s\"/>\n"
                                 "      <arg name=\"delay\" type=\"i\"/>\n"
-@@ -1077,7 +1088,7 @@
+@@ -1208,7 +1219,7 @@
                                                                "display id",
                                                                NULL,
                                                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -132,11 +132,11 @@
                                           PROP_USER_NAME,
                                           g_param_spec_string ("user-name",
                                                                "user name",
-Index: gdm-3.0.4/daemon/gdm-greeter-server.h
+Index: gdm-3.1.2/daemon/gdm-greeter-server.h
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-greeter-server.h	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-greeter-server.h	2011-06-07 15:08:15.501897278 +0200
-@@ -92,6 +92,8 @@
+--- gdm-3.1.2.orig/daemon/gdm-greeter-server.h
++++ gdm-3.1.2/daemon/gdm-greeter-server.h
+@@ -107,6 +107,8 @@
  void                gdm_greeter_server_default_session_name_changed (GdmGreeterServer *greeter_server,
                                                                       const char       *text);
  
@@ -145,10 +145,10 @@
  void                gdm_greeter_server_request_timed_login   (GdmGreeterServer *greeter_server,
                                                                const char       *username,
                                                                int               delay);
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.c
+Index: gdm-3.1.2/daemon/gdm-local-display-factory.c
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.c	2011-05-31 16:52:04.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.c	2011-06-07 15:08:15.501897278 +0200
+--- gdm-3.1.2.orig/daemon/gdm-local-display-factory.c
++++ gdm-3.1.2/daemon/gdm-local-display-factory.c
 @@ -228,6 +228,121 @@
          return ret;
  }
@@ -271,10 +271,10 @@
  gboolean
  gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory,
                                                    const char             *parent_display_id,
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.h
+Index: gdm-3.1.2/daemon/gdm-local-display-factory.h
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.h	2011-02-18 04:27:53.000000000 +0100
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.h	2011-06-07 15:08:15.501897278 +0200
+--- gdm-3.1.2.orig/daemon/gdm-local-display-factory.h
++++ gdm-3.1.2/daemon/gdm-local-display-factory.h
 @@ -64,6 +64,10 @@
  gboolean                   gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *factory,
                                                                                 char                  **id,
@@ -286,10 +286,10 @@
  
  gboolean                   gdm_local_display_factory_create_product_display   (GdmLocalDisplayFactory *factory,
                                                                                 const char             *parent_display_id,
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.xml
+Index: gdm-3.1.2/daemon/gdm-local-display-factory.xml
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.xml	2011-02-18 04:27:53.000000000 +0100
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.xml	2011-06-07 15:08:15.501897278 +0200
+--- gdm-3.1.2.orig/daemon/gdm-local-display-factory.xml
++++ gdm-3.1.2/daemon/gdm-local-display-factory.xml
 @@ -9,5 +9,9 @@
      <method name="CreateTransientDisplay">
        <arg name="id" direction="out" type="o"/>
@@ -300,11 +300,11 @@
 +    </method>
    </interface>
  </node>
-Index: gdm-3.0.4/daemon/gdm-simple-slave.c
+Index: gdm-3.1.2/daemon/gdm-simple-slave.c
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-simple-slave.c	2011-06-07 15:08:10.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-simple-slave.c	2011-06-07 15:08:15.501897278 +0200
-@@ -92,10 +92,13 @@
+--- gdm-3.1.2.orig/daemon/gdm-simple-slave.c
++++ gdm-3.1.2/daemon/gdm-simple-slave.c
+@@ -94,10 +94,13 @@
          gboolean           use_logindevperm;
  #endif
          guint              plymouth_is_running : 1;
@@ -318,7 +318,7 @@
  };
  
  static void     gdm_simple_slave_class_init     (GdmSimpleSlaveClass *klass);
-@@ -617,6 +620,16 @@
+@@ -623,6 +626,16 @@
  }
  
  static void
@@ -333,9 +333,9 @@
 +
 +static void
  on_session_conversation_started (GdmSession     *session,
+                                  const char     *service_name,
                                   GdmSimpleSlave *slave)
- {
-@@ -633,6 +646,19 @@
+@@ -641,6 +654,19 @@
                  }
          }
  
@@ -355,7 +355,7 @@
          enabled = FALSE;
          gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay);
          if (! enabled) {
-@@ -1566,7 +1592,14 @@
+@@ -1647,7 +1673,14 @@
                                 const GValue *value,
                                 GParamSpec   *pspec)
  {
@@ -370,7 +370,7 @@
          default:
                  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                  break;
-@@ -1579,7 +1612,14 @@
+@@ -1660,7 +1693,14 @@
                                 GValue      *value,
                                 GParamSpec *pspec)
  {
@@ -385,7 +385,7 @@
          default:
                  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                  break;
-@@ -1616,6 +1656,14 @@
+@@ -1697,6 +1737,14 @@
  
          g_type_class_add_private (klass, sizeof (GdmSimpleSlavePrivate));
  
@@ -400,7 +400,7 @@
          dbus_g_object_type_install_info (GDM_TYPE_SIMPLE_SLAVE, &dbus_glib_gdm_simple_slave_object_info);
  }
  
-@@ -1651,12 +1699,13 @@
+@@ -1732,12 +1780,13 @@
  }
  
  GdmSlave *
@@ -415,10 +415,10 @@
                                 NULL);
  
          return GDM_SLAVE (object);
-Index: gdm-3.0.4/daemon/gdm-simple-slave.h
+Index: gdm-3.1.2/daemon/gdm-simple-slave.h
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-simple-slave.h	2011-03-29 06:09:16.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-simple-slave.h	2011-06-07 15:08:15.501897278 +0200
+--- gdm-3.1.2.orig/daemon/gdm-simple-slave.h
++++ gdm-3.1.2/daemon/gdm-simple-slave.h
 @@ -48,7 +48,8 @@
  } GdmSimpleSlaveClass;
  
@@ -429,10 +429,10 @@
  
  G_END_DECLS
  
-Index: gdm-3.0.4/daemon/simple-slave-main.c
+Index: gdm-3.1.2/daemon/simple-slave-main.c
 ===================================================================
---- gdm-3.0.4.orig/daemon/simple-slave-main.c	2011-03-29 06:09:16.000000000 +0200
-+++ gdm-3.0.4/daemon/simple-slave-main.c	2011-06-07 15:08:15.501897278 +0200
+--- gdm-3.1.2.orig/daemon/simple-slave-main.c
++++ gdm-3.1.2/daemon/simple-slave-main.c
 @@ -45,6 +45,7 @@
  #include "gdm-common.h"
  #include "gdm-simple-slave.h"
@@ -462,10 +462,10 @@
          if (slave == NULL) {
                  goto out;
          }
-Index: gdm-3.0.4/data/gdm.conf.in
+Index: gdm-3.1.2/data/gdm.conf.in
 ===================================================================
---- gdm-3.0.4.orig/data/gdm.conf.in	2011-03-07 18:40:37.000000000 +0100
-+++ gdm-3.0.4/data/gdm.conf.in	2011-06-07 15:08:49.411897294 +0200
+--- gdm-3.1.2.orig/data/gdm.conf.in
++++ gdm-3.1.2/data/gdm.conf.in
 @@ -66,6 +66,9 @@
      <allow send_destination="org.gnome.DisplayManager"
             send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
@@ -476,19 +476,19 @@
  
      <allow send_destination="org.gnome.DisplayManager"
             send_interface="org.gnome.DisplayManager.Manager"
-Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-client.c
+Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-client.c
 ===================================================================
---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-client.c	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-client.c	2011-06-07 15:08:15.511897278 +0200
-@@ -69,6 +69,7 @@
+--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-client.c
++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-client.c
+@@ -70,6 +70,7 @@
          SELECTED_USER_CHANGED,
          DEFAULT_LANGUAGE_NAME_CHANGED,
          DEFAULT_SESSION_NAME_CHANGED,
 +        SELECT_USER,
          TIMED_LOGIN_REQUESTED,
-         USER_AUTHORIZED,
+         SESSION_OPENED,
          LAST_SIGNAL
-@@ -183,6 +184,14 @@
+@@ -215,6 +216,14 @@
  }
  
  static void
@@ -503,7 +503,7 @@
  on_timed_login_requested (GdmGreeterClient *client,
                            DBusMessage      *message)
  {
-@@ -649,6 +658,8 @@
+@@ -761,6 +770,8 @@
                  on_default_language_name_changed (client, message);
          } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultSessionNameChanged")) {
                  on_default_session_name_changed (client, message);
@@ -511,8 +511,8 @@
 +                on_select_user (client, message);
          } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "TimedLoginRequested")) {
                  on_timed_login_requested (client, message);
-         } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "UserAuthorized")) {
-@@ -927,6 +938,17 @@
+         } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "SessionOpened")) {
+@@ -1060,6 +1071,17 @@
                                NULL,
                                NULL,
                                g_cclosure_marshal_VOID__STRING,
@@ -530,11 +530,11 @@
                                G_TYPE_NONE,
                                1, G_TYPE_STRING);
  
-Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-client.h
+Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-client.h
 ===================================================================
---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-client.h	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-client.h	2011-06-07 15:08:15.511897278 +0200
-@@ -65,6 +65,8 @@
+--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-client.h
++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-client.h
+@@ -74,6 +74,8 @@
                                                  const char        *session_name);
          void (* default_language_name_changed) (GdmGreeterClient  *client,
                                                  const char        *language_name);
@@ -543,21 +543,21 @@
          void (* timed_login_requested)   (GdmGreeterClient  *client,
                                            const char        *username,
                                            int                delay);
-Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-login-window.c
+Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-login-window.c
 ===================================================================
---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-login-window.c	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-login-window.c	2011-06-07 15:08:15.511897278 +0200
-@@ -131,6 +131,8 @@
- 
-         guint            login_button_handler_id;
+--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-login-window.c
++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -149,6 +149,8 @@
          guint            start_session_handler_id;
+ 
+         char            *service_name_of_session_ready_to_start;
 +
 +        char            *username;
  };
  
  enum {
-@@ -803,6 +805,24 @@
-         login_window->priv->timed_login_already_enabled = TRUE;
+@@ -1188,6 +1190,24 @@
+         return TRUE;
  }
  
 +
@@ -581,7 +581,7 @@
  void
  gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window,
                                                const char            *username,
-@@ -1019,6 +1039,10 @@
+@@ -1432,6 +1452,10 @@
  
          if (!login_window->priv->user_list_disabled) {
                  gtk_widget_show (login_window->priv->user_chooser);
@@ -591,25 +591,25 @@
 +                }
          }
  
-         if (login_window->priv->timed_login_username != NULL
-Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-login-window.h
+         enable_waiting_extensions (login_window);
+Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-login-window.h
 ===================================================================
---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-login-window.h	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-login-window.h	2011-06-07 15:08:15.511897278 +0200
-@@ -80,6 +80,8 @@
- void                gdm_greeter_login_window_set_default_session_name (GdmGreeterLoginWindow *login_window,
-                                                                        const char *text);
+--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-login-window.h
++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-login-window.h
+@@ -95,6 +95,8 @@
+ gboolean            gdm_greeter_login_window_service_unavailable (GdmGreeterLoginWindow *login_window,
+                                                                   const char *service_name);
  
 +void               gdm_greeter_login_window_select_user         (GdmGreeterLoginWindow *login_window,
 +                                                                 const char            *username);
  void               gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window,
                                                                   const char            *username,
                                                                   int                    delay);
-Index: gdm-3.0.4/gui/simple-greeter/gdm-greeter-session.c
+Index: gdm-3.1.2/gui/simple-greeter/gdm-greeter-session.c
 ===================================================================
---- gdm-3.0.4.orig/gui/simple-greeter/gdm-greeter-session.c	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/gui/simple-greeter/gdm-greeter-session.c	2011-06-07 15:08:15.511897278 +0200
-@@ -167,6 +167,15 @@
+--- gdm-3.1.2.orig/gui/simple-greeter/gdm-greeter-session.c
++++ gdm-3.1.2/gui/simple-greeter/gdm-greeter-session.c
+@@ -170,6 +170,15 @@
  }
  
  static void
@@ -625,7 +625,7 @@
  on_timed_login_requested (GdmGreeterClient  *client,
                            const char        *text,
                            int                delay,
-@@ -580,6 +589,10 @@
+@@ -600,6 +609,10 @@
                            G_CALLBACK (on_default_session_name_changed),
                            session);
          g_signal_connect (session->priv->client,
 
=== modified file 'debian/patches/30_don_t_save_failsafe_session.patch'
--- debian/patches/30_don_t_save_failsafe_session.patch	2011-06-07 09:19:59 +0000
+++ debian/patches/30_don_t_save_failsafe_session.patch	2011-10-06 13:19:31 +0000
@@ -2,22 +2,22 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607703
 Bug-Ubuntu: https://launchpad.net/bugs/509182
 
-Index: gdm-3.0.0/daemon/gdm-session-direct.c
+Index: gdm-3.1.2/daemon/gdm-session-direct.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/gdm-session-direct.c	2011-06-07 11:15:40.317629201 +0200
-+++ gdm-3.0.0/daemon/gdm-session-direct.c	2011-06-07 11:17:21.647629249 +0200
-@@ -175,6 +175,32 @@
+--- gdm-3.1.2.orig/daemon/gdm-session-direct.c
++++ gdm-3.1.2/daemon/gdm-session-direct.c
+@@ -160,6 +160,32 @@
  }
  
  static void
-+send_dbus_bool_signal (GdmSessionDirect *session,
++send_dbus_bool_signal (GdmSessionConversation *conversation,
 +                       const char *name,
 +                       const gboolean value)
 +{
 +        DBusMessage    *message;
 +        DBusMessageIter iter;
 +
-+        g_return_if_fail (session != NULL);
++        g_return_if_fail (conversation != NULL);
 +
 +        message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH,
 +                                           GDM_SESSION_DBUS_INTERFACE,
@@ -26,7 +26,7 @@
 +        dbus_message_iter_init_append (message, &iter);
 +        dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &value);
 +
-+        if (! send_dbus_message (session->priv->worker_connection, message)) {
++        if (! send_dbus_message (conversation, message)) {
 +                g_debug ("GdmSessionDirect: Could not send %s signal",
 +                         name ? name : "(null)");
 +        }
@@ -36,10 +36,10 @@
 +
 +
 +static void
- send_dbus_void_signal (GdmSessionDirect *session,
-                        const char       *name)
- {
-@@ -605,6 +631,61 @@
+ send_dbus_string_signal (GdmSessionConversation *conversation,
+                          const char *name,
+                          const char *text)
+@@ -667,6 +693,61 @@
          return res;
  }
  
@@ -101,7 +101,7 @@
  static const char *
  get_default_language_name (GdmSessionDirect *session)
  {
-@@ -1373,6 +1454,9 @@
+@@ -1439,6 +1520,9 @@
                                 "    <signal name=\"SetSessionName\">\n"
                                 "      <arg name=\"session_name\" type=\"s\"/>\n"
                                 "    </signal>\n"
@@ -111,7 +111,7 @@
                                 "    <signal name=\"StartProgram\">\n"
                                 "      <arg name=\"command\" type=\"s\"/>\n"
                                 "    </signal>\n"
-@@ -1949,6 +2033,32 @@
+@@ -2198,6 +2282,32 @@
          return get_default_session_name (session);
  }
  
@@ -144,20 +144,20 @@
  static char *
  get_session_command (GdmSessionDirect *session)
  {
-@@ -2211,6 +2321,9 @@
+@@ -2539,6 +2649,9 @@
  
-         send_dbus_string_signal (impl, "SetSessionName",
-                                  get_session_name (impl));
+                 send_dbus_string_signal (conversation, "SetSessionName",
+                                          get_session_name (impl));
 +
-+        send_dbus_bool_signal (impl, "SetIsFailsafe",
-+                                 get_is_session_failsafe(impl));
++                send_dbus_bool_signal (conversation, "SetIsFailsafe",
++                                         get_is_session_failsafe(impl));
+         }
  }
  
- static void
-Index: gdm-3.0.0/daemon/gdm-session-settings.c
+Index: gdm-3.1.2/daemon/gdm-session-settings.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/gdm-session-settings.c	2011-04-04 16:37:16.000000000 +0200
-+++ gdm-3.0.0/daemon/gdm-session-settings.c	2011-06-07 11:15:40.487629201 +0200
+--- gdm-3.1.2.orig/daemon/gdm-session-settings.c
++++ gdm-3.1.2/daemon/gdm-session-settings.c
 @@ -40,6 +40,7 @@
          ActUser *user;
          char *session_name;
@@ -260,10 +260,10 @@
  
          if (!act_user_is_loaded (user)) {
                  g_object_unref (user);
-Index: gdm-3.0.0/daemon/gdm-session-settings.h
+Index: gdm-3.1.2/daemon/gdm-session-settings.h
 ===================================================================
---- gdm-3.0.0.orig/daemon/gdm-session-settings.h	2011-04-04 16:37:16.000000000 +0200
-+++ gdm-3.0.0/daemon/gdm-session-settings.h	2011-06-07 11:15:40.497629201 +0200
+--- gdm-3.1.2.orig/daemon/gdm-session-settings.h
++++ gdm-3.1.2/daemon/gdm-session-settings.h
 @@ -60,10 +60,13 @@
  gboolean            gdm_session_settings_is_loaded          (GdmSessionSettings  *settings);
  char               *gdm_session_settings_get_language_name  (GdmSessionSettings *settings);
@@ -278,11 +278,11 @@
  
  G_END_DECLS
  #endif /* GDM_SESSION_SETTINGS_H */
-Index: gdm-3.0.0/daemon/gdm-session-worker.c
+Index: gdm-3.1.2/daemon/gdm-session-worker.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/gdm-session-worker.c	2011-04-04 16:37:16.000000000 +0200
-+++ gdm-3.0.0/daemon/gdm-session-worker.c	2011-06-07 11:15:40.497629201 +0200
-@@ -1899,6 +1899,14 @@
+--- gdm-3.1.2.orig/daemon/gdm-session-worker.c
++++ gdm-3.1.2/daemon/gdm-session-worker.c
+@@ -1912,6 +1912,14 @@
  }
  
  static void
@@ -297,7 +297,7 @@
  on_set_session_name (GdmSessionWorker *worker,
                       DBusMessage      *message)
  {
-@@ -1921,6 +1929,28 @@
+@@ -1934,6 +1942,28 @@
  }
  
  static void
@@ -326,7 +326,7 @@
  gdm_session_worker_set_language_name (GdmSessionWorker *worker,
                                        const char       *language_name)
  {
-@@ -2552,6 +2582,8 @@
+@@ -2592,6 +2622,8 @@
                  on_set_language_name (worker, message);
          } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetSessionName")) {
                  on_set_session_name (worker, message);
 
=== modified file 'debian/patches/42_no_ecryptfs_autologin.patch'
--- debian/patches/42_no_ecryptfs_autologin.patch	2011-06-07 10:27:02 +0000
+++ debian/patches/42_no_ecryptfs_autologin.patch	2011-10-06 13:19:31 +0000
@@ -2,11 +2,11 @@
 Author: Robert Ancell <[e-mail]>
 Bug: http://launchpad.net/bugs/284443
 
-Index: gdm-3.0.0/daemon/gdm-simple-slave.c
+Index: gdm-3.1.91/daemon/gdm-simple-slave.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/gdm-simple-slave.c	2011-06-07 12:25:54.047631144 +0200
-+++ gdm-3.0.0/daemon/gdm-simple-slave.c	2011-06-07 12:26:15.497631154 +0200
-@@ -629,6 +629,38 @@
+--- gdm-3.1.91.orig/daemon/gdm-simple-slave.c
++++ gdm-3.1.91/daemon/gdm-simple-slave.c
+@@ -620,6 +620,38 @@
          slave->priv->username = g_strdup (username);
  }
  
@@ -44,8 +44,8 @@
 +
  static void
  on_session_conversation_started (GdmSession     *session,
-                                  GdmSimpleSlave *slave)
-@@ -661,7 +693,8 @@
+                                  const char     *service_name,
+@@ -654,7 +686,8 @@
  
          enabled = FALSE;
          gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay);
@@ -55,7 +55,7 @@
                  return;
          }
  
-@@ -1385,6 +1418,8 @@
+@@ -1483,6 +1516,8 @@
          if (res) {
                  gboolean enabled;
                  int      delay;
@@ -64,7 +64,7 @@
  
                  /* FIXME: handle wait-for-go */
  
-@@ -1393,7 +1428,8 @@
+@@ -1491,7 +1526,8 @@
                  delay = 0;
                  enabled = FALSE;
                  gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, NULL, &delay);
@@ -74,7 +74,7 @@
                          start_greeter (slave);
                          create_new_session (slave);
                  } else {
-@@ -1401,6 +1437,7 @@
+@@ -1499,6 +1535,7 @@
                          gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
                          reset_session (slave);
                  }
 
=== modified file 'debian/patches/45_time_display_on_greeter.patch'
--- debian/patches/45_time_display_on_greeter.patch	2011-06-06 05:27:36 +0000
+++ debian/patches/45_time_display_on_greeter.patch	2011-10-06 13:19:31 +0000
@@ -4,9 +4,10 @@
 Forwarded: yes
 Author: Gunnar Hjalmarsson <[e-mail]>
 
-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
---- gdm-3.0.0//gui/simple-greeter/gdm-clock-widget.c	2011-04-04 16:37:16.000000000 +0200
-+++ gdm-3.0.0.new//gui/simple-greeter/gdm-clock-widget.c	2011-06-05 23:55:31.140297043 +0200
+Index: gdm-3.1.2/gui/simple-greeter/gdm-clock-widget.c
+===================================================================
+--- gdm-3.1.2.orig/gui/simple-greeter/gdm-clock-widget.c
++++ gdm-3.1.2/gui/simple-greeter/gdm-clock-widget.c
 @@ -30,6 +30,7 @@
  #include <errno.h>
  #include <dirent.h>
 
=== modified file 'debian/patches/93_xdg_data_dirs.patch'
--- debian/patches/93_xdg_data_dirs.patch	2011-06-07 11:22:47 +0000
+++ debian/patches/93_xdg_data_dirs.patch	2011-10-06 13:19:31 +0000
@@ -1,12 +1,12 @@
-Index: gdm-3.0.4/daemon/gdm-welcome-session.c
+Index: gdm-3.1.90/daemon/gdm-welcome-session.c
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-welcome-session.c	2011-05-31 17:46:56.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-welcome-session.c	2011-06-07 13:21:09.771894316 +0200
-@@ -440,6 +440,7 @@
+--- gdm-3.1.90.orig/daemon/gdm-welcome-session.c
++++ gdm-3.1.90/daemon/gdm-welcome-session.c
+@@ -322,6 +322,7 @@
          g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
          g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
          g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));
 +        g_hash_table_insert (hash, g_strdup ("XDG_DATA_DIRS"), g_strdup ("/usr/share/gdm:/usr/local/share:/usr/share"));
  
-         g_hash_table_foreach (hash, (GHFunc)listify_hash, env);
-         g_hash_table_destroy (hash);
+         return hash;
+ }
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-12 17:20:24 +0000
+++ debian/patches/series	2011-10-06 13:19:31 +0000
@@ -1,15 +1,14 @@
-00git_xsession-errors_symlink.patch
-00git_use_new_power_interface.patch
+00git.diff
+01git.diff
 ubuntu_plymouth.patch
 01_language.patch
+07_libexec-paths.patch
 06_first_vt.patch
-07_libexec-paths.patch
-08_frequent-users_greeter.patch
+#08_frequent-users_greeter.patch
 15_default_session.patch
 16_xserver_path.patch
-29_grep_path.patch
 29_switch_user.patch
-30_don_t_save_failsafe_session.patch
+#30_don_t_save_failsafe_session.patch
 #33-multi-keyboard-layouts.patch
 42_no_ecryptfs_autologin.patch
 45_time_display_on_greeter.patch
@@ -18,6 +17,6 @@
 ubuntu_dont_catch_sigsegv.patch
 ubuntu_guest_session.patch
 ubuntu_upstart_event.patch
-ubuntu_no_debug.patch
+#ubuntu_no_debug.patch
 ubuntu_xresources_is_a_dir.patch
 ubuntu_i18n_oneiric.patch
 
=== modified file 'debian/patches/ubuntu_dont_catch_sigsegv.patch'
--- debian/patches/ubuntu_dont_catch_sigsegv.patch	2011-06-07 13:01:31 +0000
+++ debian/patches/ubuntu_dont_catch_sigsegv.patch	2011-10-06 13:19:31 +0000
@@ -1,9 +1,9 @@
 Description: Don't catch crashes so apport can do its job
 
-Index: gdm-3.0.0/daemon/factory-slave-main.c
+Index: gdm-3.1.2/daemon/factory-slave-main.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/factory-slave-main.c	2010-10-01 13:54:28.000000000 +0200
-+++ gdm-3.0.0/daemon/factory-slave-main.c	2011-05-30 17:35:36.735075632 +0200
+--- gdm-3.1.2.orig/daemon/factory-slave-main.c
++++ gdm-3.1.2/daemon/factory-slave-main.c
 @@ -231,7 +231,7 @@
          gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL);
@@ -13,10 +13,10 @@
          gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL);
-Index: gdm-3.0.0/daemon/product-slave-main.c
+Index: gdm-3.1.2/daemon/product-slave-main.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/product-slave-main.c	2010-10-01 13:54:28.000000000 +0200
-+++ gdm-3.0.0/daemon/product-slave-main.c	2011-05-30 17:35:36.735075632 +0200
+--- gdm-3.1.2.orig/daemon/product-slave-main.c
++++ gdm-3.1.2/daemon/product-slave-main.c
 @@ -235,7 +235,7 @@
          gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL);
@@ -26,10 +26,10 @@
          gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL);
-Index: gdm-3.0.0/daemon/session-worker-main.c
+Index: gdm-3.1.2/daemon/session-worker-main.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/session-worker-main.c	2010-10-01 13:54:28.000000000 +0200
-+++ gdm-3.0.0/daemon/session-worker-main.c	2011-05-30 17:35:36.735075632 +0200
+--- gdm-3.1.2.orig/daemon/session-worker-main.c
++++ gdm-3.1.2/daemon/session-worker-main.c
 @@ -196,7 +196,7 @@
          gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL);
@@ -39,11 +39,11 @@
          gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL);
  
-Index: gdm-3.0.0/daemon/simple-slave-main.c
+Index: gdm-3.1.2/daemon/simple-slave-main.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/simple-slave-main.c	2010-10-01 13:54:28.000000000 +0200
-+++ gdm-3.0.0/daemon/simple-slave-main.c	2011-05-30 17:35:36.735075632 +0200
-@@ -243,7 +243,7 @@
+--- gdm-3.1.2.orig/daemon/simple-slave-main.c
++++ gdm-3.1.2/daemon/simple-slave-main.c
+@@ -246,7 +246,7 @@
          gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGHUP, signal_cb, NULL);
@@ -52,10 +52,10 @@
          gdm_signal_handler_add (signal_handler, SIGABRT, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL);
-Index: gdm-3.0.0/daemon/xdmcp-chooser-slave-main.c
+Index: gdm-3.1.2/daemon/xdmcp-chooser-slave-main.c
 ===================================================================
---- gdm-3.0.0.orig/daemon/xdmcp-chooser-slave-main.c	2010-10-01 13:54:28.000000000 +0200
-+++ gdm-3.0.0/daemon/xdmcp-chooser-slave-main.c	2011-05-30 17:35:36.735075632 +0200
+--- gdm-3.1.2.orig/daemon/xdmcp-chooser-slave-main.c
++++ gdm-3.1.2/daemon/xdmcp-chooser-slave-main.c
 @@ -237,7 +237,7 @@
          gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL);
          gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL);
 
=== modified file 'debian/patches/ubuntu_guest_session.patch'
--- debian/patches/ubuntu_guest_session.patch	2011-06-07 13:09:47 +0000
+++ debian/patches/ubuntu_guest_session.patch	2011-10-06 13:19:31 +0000
@@ -7,10 +7,10 @@
  system) rules around it.
 Bug: https://wiki.ubuntu.com/DesktopTeam/Specs/Intrepid/GuestAccount
 
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.c
+Index: gdm-3.2.0/daemon/gdm-local-display-factory.c
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.c	2011-06-07 15:08:15.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.c	2011-06-07 15:09:05.591897302 +0200
+--- gdm-3.2.0.orig/daemon/gdm-local-display-factory.c
++++ gdm-3.2.0/daemon/gdm-local-display-factory.c
 @@ -22,6 +22,8 @@
  
  #include <stdlib.h>
@@ -20,7 +20,7 @@
  
  #include <glib.h>
  #include <glib/gi18n.h>
-@@ -45,6 +47,8 @@
+@@ -44,6 +46,8 @@
  #define GDM_LOCAL_DISPLAY_FACTORY_DBUS_PATH GDM_DBUS_PATH "/LocalDisplayFactory"
  #define GDM_MANAGER_DBUS_NAME               "org.gnome.DisplayManager.LocalDisplayFactory"
  
@@ -29,7 +29,7 @@
  #define MAX_DISPLAY_FAILURES 5
  
  struct GdmLocalDisplayFactoryPrivate
-@@ -343,6 +347,270 @@
+@@ -342,6 +346,270 @@
          return ret;
  }
  
@@ -300,10 +300,10 @@
  gboolean
  gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory,
                                                    const char             *parent_display_id,
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.h
+Index: gdm-3.2.0/daemon/gdm-local-display-factory.h
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.h	2011-06-07 15:08:15.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.h	2011-06-07 15:09:05.591897302 +0200
+--- gdm-3.2.0.orig/daemon/gdm-local-display-factory.h
++++ gdm-3.2.0/daemon/gdm-local-display-factory.h
 @@ -69,6 +69,11 @@
                                                                       char                  **id,
                                                                       GError                **error);
@@ -316,10 +316,10 @@
  gboolean                   gdm_local_display_factory_create_product_display   (GdmLocalDisplayFactory *factory,
                                                                                 const char             *parent_display_id,
                                                                                 const char             *relay_address,
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.xml
+Index: gdm-3.2.0/daemon/gdm-local-display-factory.xml
 ===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.xml	2011-06-07 15:08:15.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.xml	2011-06-07 15:09:05.591897302 +0200
+--- gdm-3.2.0.orig/daemon/gdm-local-display-factory.xml
++++ gdm-3.2.0/daemon/gdm-local-display-factory.xml
 @@ -13,5 +13,9 @@
        <arg name="username" direction="in" type="s"/>    
        <arg name="id" direction="out" type="o"/>
@@ -330,17 +330,18 @@
 +    </method>
    </interface>
  </node>
-Index: gdm-3.0.4/data/gdm.conf.in
+Index: gdm-3.2.0/data/gdm.conf.in
 ===================================================================
---- gdm-3.0.4.orig/data/gdm.conf.in	2011-06-07 15:08:49.000000000 +0200
-+++ gdm-3.0.4/data/gdm.conf.in	2011-06-07 15:09:18.561897308 +0200
-@@ -69,6 +69,9 @@
-     <allow send_destination="org.gnome.DisplayManager"
-            send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
+--- gdm-3.2.0.orig/data/gdm.conf.in
++++ gdm-3.2.0/data/gdm.conf.in
+@@ -71,6 +71,10 @@
             send_member="SwitchToUser"/>
-+    <allow send_destination="org.gnome.DisplayManager"
+ 
+     <allow send_destination="org.gnome.DisplayManager"
 +           send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
 +           send_member="StartGuestSession"/>
- 
-     <allow send_destination="org.gnome.DisplayManager"
++
++    <allow send_destination="org.gnome.DisplayManager"
             send_interface="org.gnome.DisplayManager.Manager"
+            send_member="GetDisplays"/>
+ 
 
=== modified file 'debian/patches/ubuntu_i18n_oneiric.patch'
--- debian/patches/ubuntu_i18n_oneiric.patch	2011-08-12 17:20:24 +0000
+++ debian/patches/ubuntu_i18n_oneiric.patch	2011-10-06 13:19:31 +0000
@@ -2,9 +2,10 @@
 Forwarded: not-needed
 Author: Gunnar Hjalmarsson <[e-mail]>
 
-diff -Nur -x '*.orig' -x '*~' gdm-3.0.4//data/Xsession.in gdm-3.0.4.new//data/Xsession.in
---- gdm-3.0.4//data/Xsession.in	2011-08-09 14:58:58.000000000 +0200
-+++ gdm-3.0.4.new//data/Xsession.in	2011-08-09 14:59:12.639636230 +0200
+Index: gdm-3.1.2/data/Xsession.in
+===================================================================
+--- gdm-3.1.2.orig/data/Xsession.in
++++ gdm-3.1.2/data/Xsession.in
 @@ -36,6 +36,24 @@
  test -f /etc/xprofile && . /etc/xprofile
  test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
 
=== modified file 'debian/patches/ubuntu_no_debug.patch'
--- debian/patches/ubuntu_no_debug.patch	2011-06-07 13:13:05 +0000
+++ debian/patches/ubuntu_no_debug.patch	2011-10-06 13:19:31 +0000
@@ -1,9 +1,9 @@
 Description: Turn off debugging by default. Logging to syslog will slow down loading.
 
-Index: gdm-2.32.0/common/gdm-common.c
+Index: gdm-3.1.90/common/gdm-common.c
 ===================================================================
---- gdm-2.32.0.orig/common/gdm-common.c	2010-09-15 20:58:10.000000000 +0200
-+++ gdm-2.32.0/common/gdm-common.c	2010-12-07 15:21:02.907502001 +0100
+--- gdm-3.1.90.orig/common/gdm-common.c
++++ gdm-3.1.90/common/gdm-common.c
 @@ -47,6 +47,7 @@
  gboolean
  gdm_is_version_unstable (void)
@@ -21,4 +21,4 @@
 +#endif
  }
  
- void
+ gboolean
 
=== modified file 'debian/patches/ubuntu_plymouth.patch'
--- debian/patches/ubuntu_plymouth.patch	2011-07-13 15:34:20 +0000
+++ debian/patches/ubuntu_plymouth.patch	2011-10-06 13:19:31 +0000
@@ -7,9 +7,11 @@
 This combined with starting the X server with -background none
 will give us a nice fade transition when g-s-d starts
 ---
---- a/daemon/gdm-simple-slave.c
-+++ b/daemon/gdm-simple-slave.c
-@@ -91,6 +91,7 @@
+Index: gdm-3.2.0/daemon/gdm-simple-slave.c
+===================================================================
+--- gdm-3.2.0.orig/daemon/gdm-simple-slave.c
++++ gdm-3.2.0/daemon/gdm-simple-slave.c
+@@ -93,6 +93,7 @@
  #ifdef  HAVE_LOGINDEVPERM
          gboolean           use_logindevperm;
  #endif
@@ -17,7 +19,7 @@
  };
  
  enum {
-@@ -1098,6 +1099,91 @@
+@@ -1201,6 +1202,91 @@
          slave->priv->start_session_when_ready = FALSE;
  }
  
@@ -109,10 +111,10 @@
  static void
  setup_server (GdmSimpleSlave *slave)
  {
-@@ -1106,6 +1192,19 @@
+@@ -1212,6 +1298,20 @@
  
-         /* Set the busy cursor */
-         gdm_slave_set_busy_cursor (GDM_SLAVE (slave));
+         /* Set the initial keyboard layout to something reasonable */
+         gdm_slave_set_initial_keyboard_layout (GDM_SLAVE (slave));
 +
 +        /* The root window has a background that may be useful
 +         * to cross fade or transition from when setting the
@@ -126,10 +128,11 @@
 +        if (slave->priv->plymouth_is_running) {
 +                plymouth_quit_with_transition (slave);
 +        }
++
  }
  
  static void
-@@ -1305,6 +1404,10 @@
+@@ -1415,6 +1515,10 @@
          g_debug ("GdmSimpleSlave: server exited with code %d\n", exit_code);
  
          gdm_slave_stopped (GDM_SLAVE (slave));
@@ -140,7 +143,7 @@
  }
  
  static void
-@@ -1317,6 +1420,10 @@
+@@ -1427,6 +1531,10 @@
                   g_strsignal (signal_number));
  
          gdm_slave_stopped (GDM_SLAVE (slave));
@@ -151,7 +154,7 @@
  }
  
  static gboolean
-@@ -1361,7 +1468,21 @@
+@@ -1471,7 +1579,21 @@
                                    G_CALLBACK (on_server_ready),
                                    slave);
  
@@ -174,7 +177,7 @@
                  if (! res) {
                          g_warning (_("Could not start the X "
                                       "server (your graphical environment) "
-@@ -1371,6 +1492,9 @@
+@@ -1481,6 +1603,9 @@
                                       "In the meantime this display will be "
                                       "disabled.  Please restart GDM when "
                                       "the problem is corrected."));
@@ -184,8 +187,10 @@
                          exit (1);
                  }
  
---- a/daemon/gdm-slave.c
-+++ b/daemon/gdm-slave.c
+Index: gdm-3.2.0/daemon/gdm-slave.c
+===================================================================
+--- gdm-3.2.0.orig/daemon/gdm-slave.c
++++ gdm-3.2.0/daemon/gdm-slave.c
 @@ -43,6 +43,7 @@
  #include <dbus/dbus-glib-lowlevel.h>
  
@@ -194,7 +199,7 @@
  #include <X11/cursorfont.h> /* for watch cursor */
  #include <X11/extensions/Xrandr.h>
  #include <X11/Xatom.h>
-@@ -434,6 +435,77 @@
+@@ -483,6 +484,77 @@
          }
  }
  
@@ -272,9 +277,11 @@
  void
  gdm_slave_set_busy_cursor (GdmSlave *slave)
  {
---- a/daemon/gdm-slave.h
-+++ b/daemon/gdm-slave.h
-@@ -77,6 +77,7 @@
+Index: gdm-3.2.0/daemon/gdm-slave.h
+===================================================================
+--- gdm-3.2.0.orig/daemon/gdm-slave.h
++++ gdm-3.2.0/daemon/gdm-slave.h
+@@ -78,6 +78,7 @@
  void                gdm_slave_set_initial_cursor_position (GdmSlave *slave);
  
  void                gdm_slave_set_busy_cursor        (GdmSlave   *slave);
@@ -282,8 +289,10 @@
  gboolean            gdm_slave_run_script             (GdmSlave   *slave,
                                                        const char *dir,
                                                        const char *username);
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
+Index: gdm-3.2.0/daemon/gdm-server.c
+===================================================================
+--- gdm-3.2.0.orig/daemon/gdm-server.c
++++ gdm-3.2.0/daemon/gdm-server.c
 @@ -34,6 +34,9 @@
  #include <signal.h>
  #include <sys/resource.h>
@@ -361,8 +370,10 @@
  
  static void
  server_died (GdmServer *server)
---- a/daemon/gdm-server.h
-+++ b/daemon/gdm-server.h
+Index: gdm-3.2.0/daemon/gdm-server.h
+===================================================================
+--- gdm-3.2.0.orig/daemon/gdm-server.h
++++ gdm-3.2.0/daemon/gdm-server.h
 @@ -56,6 +56,7 @@
  GdmServer *         gdm_server_new       (const char *display_id,
                                            const char *auth_file);
 
=== modified file 'debian/patches/ubuntu_run_xsession.d.patch'
--- debian/patches/ubuntu_run_xsession.d.patch	2011-06-07 13:00:08 +0000
+++ debian/patches/ubuntu_run_xsession.d.patch	2011-10-06 13:19:31 +0000
@@ -2,10 +2,10 @@
 Author: Martin Pitt <[e-mail]>
 Origin: Ubuntu; /etc/X11/Xsession.d is a Debianism/Ubuntuism
 
-Index: gdm-3.0.0/data/Xsession.in
+Index: gdm-3.1.2/data/Xsession.in
 ===================================================================
---- gdm-3.0.0.orig/data/Xsession.in	2010-10-01 13:54:28.000000000 +0200
-+++ gdm-3.0.0/data/Xsession.in	2011-05-30 17:35:35.811075631 +0200
+--- gdm-3.1.2.orig/data/Xsession.in
++++ gdm-3.1.2/data/Xsession.in
 @@ -162,6 +162,19 @@
      done
  fi
 
=== modified file 'debian/patches/ubuntu_upstart_event.patch'
--- debian/patches/ubuntu_upstart_event.patch	2011-06-07 13:04:47 +0000
+++ debian/patches/ubuntu_upstart_event.patch	2011-10-06 13:19:31 +0000
@@ -1,9 +1,9 @@
 Description: Emit Upstart events when starting the login session and desktop session
 
-Index: gdm-3.0.0/data/Init.in
+Index: gdm-3.1.2/data/Init.in
 ===================================================================
---- gdm-3.0.0.orig/data/Init.in	2010-10-01 13:54:28.000000000 +0200
-+++ gdm-3.0.0/data/Init.in	2011-05-30 17:35:40.919075634 +0200
+--- gdm-3.1.2.orig/data/Init.in
++++ gdm-3.1.2/data/Init.in
 @@ -6,6 +6,8 @@
  PATH="@X_PATH@:$PATH"
  OLD_IFS=$IFS
@@ -13,10 +13,10 @@
  gdmwhich () {
    COMMAND="$1"
    OUTPUT=
-Index: gdm-3.0.0/data/PreSession.in
+Index: gdm-3.1.2/data/PreSession.in
 ===================================================================
---- gdm-3.0.0.orig/data/PreSession.in	2010-10-01 13:54:28.000000000 +0200
-+++ gdm-3.0.0/data/PreSession.in	2011-05-30 17:35:40.919075634 +0200
+--- gdm-3.1.2.orig/data/PreSession.in
++++ gdm-3.1.2/data/PreSession.in
 @@ -7,3 +7,5 @@
  # Note that output goes into the .xsession-errors file for easy debugging
  #
 
=== modified file 'debian/patches/ubuntu_xresources_is_a_dir.patch'
--- debian/patches/ubuntu_xresources_is_a_dir.patch	2011-07-13 15:33:24 +0000
+++ debian/patches/ubuntu_xresources_is_a_dir.patch	2011-10-06 13:19:31 +0000
@@ -1,8 +1,10 @@
 Description: Properly loads files from Debian/Ubuntu /etc/X11/Xresources/ dir
 From: Loïc Minier <[e-mail]>
 Date: Wed, 13 Jul 2011 17:32:31 +0200
---- a/data/Xsession.in
-+++ b/data/Xsession.in
+Index: gdm-3.1.2/data/Xsession.in
+===================================================================
+--- gdm-3.1.2.orig/data/Xsession.in
++++ gdm-3.1.2/data/Xsession.in
 @@ -99,6 +99,13 @@
  
  if [ -f "$sysresources" ]; then
 
=== modified file 'debian/rules'
--- debian/rules	2011-07-14 05:26:11 +0000
+++ debian/rules	2011-10-06 13:19:31 +0000
@@ -18,7 +18,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
 		--enable-ipv6=yes \
-		--with-at-spi-registryd-directory=/usr/lib/at-spi \
+		--with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
 		--with-default-path=/usr/local/bin:/usr/bin:/bin:/usr/games \
 		--with-lang-file=/etc/default/locale \
 		--with-incomplete-locales
@@ -33,16 +33,15 @@
 
 binary-post-install/gdm::
 	install -m644 debian/gdm-autologin.pam debian/gdm/etc/pam.d/gdm-autologin
+	install -m644 debian/gdm-welcome.pam debian/gdm/etc/pam.d/gdm-welcome
 	install -m644 debian/gdm.pam debian/gdm/etc/pam.d/gdm
 	install -D -m644 debian/xterm.desktop debian/gdm/usr/share/xsessions/xterm.desktop
 	install -D -m644 debian/xsession.desktop debian/gdm/usr/share/xsessions/xsession.desktop
-	rm -r debian/gdm/var/gdm debian/gdm/var/run
 	# move custom.conf to the examples
 	mkdir -p debian/gdm/usr/share/doc/gdm/examples
 	mv debian/gdm/etc/gdm/custom.conf debian/gdm/usr/share/doc/gdm/examples
 	# we install onboard (debian/onboard.desktop), and do not have gok
-	install -m 644 debian/onboard.desktop debian/gdm/usr/share/gdm/autostart/LoginWindow/
-	rm debian/gdm/usr/share/gdm/autostart/LoginWindow/gok.desktop
+	#install -m 644 debian/onboard.desktop debian/gdm/usr/share/gdm/autostart/LoginWindow/
+	#rm debian/gdm/usr/share/gdm/autostart/LoginWindow/gok.desktop
 	# we do not currently need a PK agent in the gdm session
-	rm debian/gdm/usr/share/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
-
+	#rm debian/gdm/usr/share/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop