Merge lp:~jamesodhunt/ubuntu/natty/gdm/single-user-mode-fix into lp:ubuntu/natty/gdm

[James Hunt]

The "if this doesn't work, just shoot me now" push:

* debian/gdm.upstart: gdm will now restart as expected if a user
  runs "telinit 2" from single-user mode (LP: #436936).

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2011-03-10 14:39:08 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/%gconf-tree.xml'
--- debian/%gconf-tree.xml	1970-01-01 00:00:00 +0000
+++ debian/%gconf-tree.xml	2011-03-10 14:39:08 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<gconf>
+	<dir name="desktop">
+		<dir name="gnome">
+			<dir name="interface">
+				<entry name="icon_theme" mtime="1255598514" type="string">
+					<stringvalue>LoginIcons</stringvalue>
+				</entry>
+			</dir>
+		</dir>
+	</dir>
+	<dir name="apps">
+		<dir name="gnome-power-manager">
+			<dir name="ui">
+				<entry name="icon_policy" mtime="1255598662" type="string">
+					<stringvalue>never</stringvalue>
+				</entry>
+			</dir>
+		</dir>
+	</dir>
+</gconf>

=== added file 'debian/60xdg_path-on-session'
--- debian/60xdg_path-on-session	1970-01-01 00:00:00 +0000
+++ debian/60xdg_path-on-session	2011-03-10 14:39:08 +0000
@@ -0,0 +1,22 @@
+# This file is sourced by Xsession(5), not executed.
+# Add additionnal xdg paths depending on selected desktop session
+
+DEFAULT_XDG_CONFIG_DIRS='/etc/xdg'
+DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
+if [ -n "$GDMSESSION" ]; then
+  # readd default if was empty
+  if [ -z "$XDG_CONFIG_DIRS" ]; then
+    XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"
+  fi
+  XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$GDMSESSION":"$XDG_CONFIG_DIRS"
+  export XDG_CONFIG_DIRS
+  # gnome is already added if gnome-session installed
+  if [ "$GDMSESSION" != "gnome" ]; then
+     if [ -z "$XDG_DATA_DIRS" ]; then
+       XDG_DATA_DIRS="$DEFAULT_XDG_DATA_DIRS"
+     fi
+     XDG_DATA_DIRS=/usr/share/"$GDMSESSION":"$XDG_DATA_DIRS"
+     export XDG_DATA_DIRS
+  fi
+fi
+

=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2011-03-10 14:39:08 +0000
@@ -0,0 +1,1492 @@
+gdm (2.32.0-0ubuntu10) UNRELEASED; urgency=low
+
+  [ Martin Pitt ]
+  * Add 41_passwordless_login_crash.patch: Fix crash when hitting the login
+    button while doing passwordless login. (LP: #724205)
+
+  [ James Hunt ]
+  * debian/gdm.upstart: gdm will now restart as expected if a user
+    runs "telinit 2" from single-user mode (LP: #436936).
+
+ -- James Hunt <[e-mail]>  Tue, 08 Mar 2011 17:58:30 +0000
+
+gdm (2.32.0-0ubuntu9) natty; urgency=low
+
+  * debian/patches/36_language_environment_settings.patch:
+    - Set LC_MESSAGES explicitly only if the value does not equal
+      $LANG, to prevent that side effects when connecting to other
+      computers via ssh appear unnecessarily.
+
+ -- Gunnar Hjalmarsson <[e-mail]>  Wed, 23 Feb 2011 20:53:50 +0100
+
+gdm (2.32.0-0ubuntu8) natty; urgency=low
+
+  [ Gunnar Hjalmarsson ]
+  * debian/patches/36_language_environment_settings.patch:
+    - Use locale names with '.UTF-8' instead of '.utf8' when setting
+      the LC_MESSAGES environment variable (LP: #666565).
+  * debian/patches/40_one_lang_option_per_translation.patch:
+    - Modification of /usr/share/gdm/language-options so an absent
+      translation directory won't cause it to exit.
+
+ -- Evan Dandrea <[e-mail]>  Mon, 14 Feb 2011 15:53:38 +0000
+
+gdm (2.32.0-0ubuntu7) natty; urgency=low
+
+  [ Gunnar Hjalmarsson ]
+  * debian/patches/40_one_lang_option_per_translation.patch:
+    - The option list in the language chooser changed so the items
+      represent available translations instead of locales
+      (LP: #693337).
+    - setlocale() validation removed (not applicable).
+    - Show locale variants in the list of language options
+      (LP: #408474).
+  * debian/patches/36_language_environment_settings.patch:
+    - Skip the encoding part in the dmrc "Language" value. It's not
+      a locale name, so let's not give the impression it is.
+    - Take main country code into account when generating
+      a locale name for LC_MESSAGES.
+
+  [ Kees Cook ]
+  * Restore 24_respect_system_minuid.patch: upstream does not handle
+    reading login.defs yet (LP: #708911).
+
+ -- Gunnar Hjalmarsson <[e-mail]>  Thu, 10 Feb 2011 10:07:31 +0100
+
+gdm (2.32.0-0ubuntu6) natty; urgency=low
+
+  * Backported some changes from Debian
+  * debian/patches/39_grep_path.patch:
+    - Don’t hardcode grep to a wrong location.
+  * debian/gdm.postrm:
+    - correctly deal with uninstalls while gdm is still running (lp: #613150)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 25 Jan 2011 16:53:46 +0100
+
+gdm (2.32.0-0ubuntu5) natty; urgency=low
+
+  [ Martin Pitt ]
+  * Add 38_user_chooser_focus.patch: Correctly give focus to the user chooser
+    on startup. Patch by Vincent Untz, merci! (LP: #687440)
+
+  [ James Hunt ]
+  * debian/gdm.upstart: Remove starting-dm event (which was missed from a
+    previous commit) and add login-session-start and desktop-session-start
+    events (LP: #706842).
+
+ -- Martin Pitt <[e-mail]>  Mon, 24 Jan 2011 17:14:25 +0100
+
+gdm (2.32.0-0ubuntu4) natty; urgency=low
+
+  * debian/control.in:
+    - updated the gtk requirement to the version having the new api required
+
+  [ Gunnar Hjalmarsson ]
+  * debian/patches/36_language_environment_settings.patch:
+    - grep() calls replaced for efficiency purposes
+    - ability to deal with @variants in locale names
+    - attempt to set the language fields in /var/cache/gdm/$USER/dmrc at
+      first login after upgrade from GDM version pre 2.32.0-0ubuntu2
+
+  [ Cody Russell ]
+  * debian/patches/37_disable_resize_grip.patch:
+    - disable the grips on the gdm screen (lp: #704018)
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 19 Jan 2011 11:33:33 +0100
+
+gdm (2.32.0-0ubuntu2) natty; urgency=low
+
+  [ Martin Pitt ]
+  * 06_run_xsession.d.patch: Don't trip over directories and other non-files
+    in Xsession.d/. (LP: #654578)
+
+  [ Gunnar Hjalmarsson ]
+  * debian/patches/35_langlist_and_lsmess_dmrc_fields.patch:
+    - Addition of the fields "Langlist" and "LCMess", which make ~/.dmrc
+      and /var/cache/gdm/$USER/dmrc able to store the user language
+      environment (LP: #553162).
+  * debian/patches/36_language_environment_settings.patch:
+    - Changes to Xsession's way to use GDM_LANG. It now sets LANGUAGE
+      and LC_MESSAGES, which makes it possible to keep the user language
+      for message translation apart from other locale settings
+      (LP: #553162).
+
+ -- Martin Pitt <[e-mail]>  Tue, 14 Dec 2010 22:24:40 +0100
+
+gdm (2.32.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+  * Drop 01_upower.patch, upstream now.
+  * Drop 03_hide_system_users.patch, fixed upstream in a different way.
+  * Drop 07_correct_distribution_version.patch, upstream now.
+  * Drop 12_fusa_name_change.patch, obsolete now as we don't install the gdm
+    one any more.
+  * Drop 18_locale_env_vars.patch, upstream now.
+  * Drop 24_system_uid.patch; upstream handles this more dynamically now, and
+    we really want to show users with an ID of < 1000 (but >= 500).
+  * Drop 90_git_name_escaping.patch, upstream now.
+  * Update all other patches to cleanly apply to new upstream version.
+  * 08_use_polkit_for_settings.patch: Add missing library linking to
+    libgdmcommon, to fix building with --as-needed.
+
+ -- Martin Pitt <[e-mail]>  Tue, 07 Dec 2010 15:55:34 +0100
+
+gdm (2.30.5-0ubuntu5) natty; urgency=low
+
+  * debian/control: 
+    - don't b-d on libglade2-dev, it uses gtkbuilder
+  * debian/rules:
+    - don't install the user switching applet, upstream is going to stop
+      shipping it in gdm for GNOME3 and Ubuntu already use indicator-session. 
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 09 Nov 2010 13:34:57 +0100
+
+gdm (2.30.5-0ubuntu4) maverick; urgency=low
+
+  * debian/gdm.upstart: Do not already fire on a framebuffer device. When a
+    real DRM driver gets loaded later on, X will be started too early to catch
+    it. This should go a long way towards fixing LP: #615549
+
+ -- Martin Pitt <[e-mail]>  Mon, 13 Sep 2010 15:23:24 +0200
+
+gdm (2.30.5-0ubuntu3) maverick; urgency=low
+
+  * debian/patches/90_git_name_escaping.patch:
+    - git change to correctly escape usernames (lp: #633050)
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 08 Sep 2010 17:37:51 +0200
+
+gdm (2.30.5-0ubuntu2) maverick; urgency=low
+
+  * debian/patches/09_gdmsetup.patch:
+    - don't list the policykit file in the configure, it's not required but
+      breaks the escaping and the strings listed in the authentification dialog
+      (lp: #617044)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 17 Aug 2010 21:47:44 +0200
+
+gdm (2.30.5-0ubuntu1) maverick; urgency=low
+
+  * New upstream version:
+    - Retry getpw* calls if they return EINTR
+    - #619588, don't show markup tags in UI (lp: #603097)
+    - #626564, fix intermittent failure to load user list (lp: #614810) 
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 11 Aug 2010 21:50:35 +0200
+
+gdm (2.30.4-0ubuntu1) maverick; urgency=low
+
+  [ Sebastien Bacher ]
+  * New upstream versions:
+    - Translation fixes
+    - Many performance improvements for the greeter
+    - Various robustness fixes
+    - Fix XDMCP
+    - Fix switch user menu item detection
+    - Remove obsolete restart and stop scripts
+    - Fixed #618834, GdmProductSlave does not handle OpenSession 
+    - Fixed #342397, gdm doesn't respond to XDMCP querys if local X server fails
+      to start 
+    - Fixed #544730, XDMCP broadcast discovery not working on BSD w/ ipv6 
+      enabled (lp: #393835)
+    - Fixed #589536, gdm-simple-slave crashed with signal 5 in 
+      g_return_if_fail_warning (lp: #403441)
+    - Fixed #592183, GDM entry field loses focus after dialogs are presented 
+    - Fixed #594857, Warning when type 'gdm --version' in terminal in new GDM 
+    - Fixed #599683, xdmcp Queries from Older software 
+    - Fixed #610179, GDM patch for accounts dialogue 
+    - Fixed #616722, Xdmcp linking problem 
+    - Fixed #616730, user-switch-applet build failure: missing -I for dbus-glib 
+    - Fixed #617665, Panel doesn't shrink after disabling "high contrast" 
+    - Fixed #619588, User's Real names should be escaped against XML markup 
+      (lp: #499690, #585128)
+    - Fixed #620430, memory leaks in gdm 
+    - Fixed #620893, bottom panel is overlapping at smaller sizes 
+    - Fixed #620908, gdm user switch applet goes nuts while 
+      changing password file 
+    - Fixed #621045, Improve startup performance of the greeter 
+    - Fixed #621131, User switch applet performance issues 
+    - Fixed #621661, Make slaves more robust against crashes 
+    - Fixed #622069, greeter doesn't work when there's no local user 
+    - Fixed #622337, shows shutdown buttons when connecting over xdmcp 
+    - Fixed #622430, keyboard layout handling wonky 
+    - Fixed #622431, cancel button not shown during timed login 
+    - Fixed #601458, Add presence items to status menu and port to JS 
+  * Refresh distribution changes
+  * debian/patches/07_correct_distribution_version.patch:
+    - use upstream version
+  * debian/patches/13_cache_ck_history.patch:
+    - dropped since the new upstream version solves this issue differently
+  * debian/patches/23_login_window_hint.patch:
+    - dropped, the change is in the new version
+
+  [ Kees Cook ]
+  * debian/patches/24_system_uid.patch: - updated for upstream code changes
+
+  [ Robert Ancell ]
+  * debian/xsession.desktop:
+  * debian/xterm.desktop:
+    - Use clearer session names (LP: #599336)
+  * debian/patches/09_gdmsetup.patch:
+    - Remove session comment from combo box to make it fit better
+
+  [ Martin Pitt ]
+  * 09_gdmsetup.patch: Only show "Play Login Sound" checkbox if we have
+    /usr/share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop.
+  * Add 01_upower.patch: Port to UPower.
+  * debian/control: libdevkit-power-gobject-dev → libupower-glib-dev.
+
+ -- Kees Cook <[e-mail]>  Fri, 06 Aug 2010 13:02:51 +0200
+
+gdm (2.30.2.is.2.30.2-0ubuntu3) maverick; urgency=low
+
+  * debian/patches/95_git_name_escaping.patch:
+    - updated to the current git version to fix escaping issues in the 
+      language selector list due the previous change
+      (lp: #603097)
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 21 Jul 2010 11:43:52 +0200
+
+gdm (2.30.2.is.2.30.2-0ubuntu2) maverick; urgency=low
+
+  * debian/60xdg_path-on-session:
+    - add XDG_CONFIG_DIRS depending on session so that we can show/hide desktop
+      file depending on session
+
+ -- Didier Roche <[e-mail]>  Tue, 20 Jul 2010 17:37:11 +0200
+
+gdm (2.30.2.is.2.30.2-0ubuntu1) maverick; urgency=low
+
+  * Tweak the version number to be newer than the lucid-updates one
+  * debian/patches/94_git_null_free_crash.patch:
+    - git change to fix a crasher (lp: #403441)
+  * debian/patches/95_git_name_escaping.patch:
+    - git change to fix escaping issues leading to crashes (lp: #499690),
+      or to having incorrect usernames displayed (lp: #585128)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 06 Jul 2010 13:36:48 +0200
+
+gdm (2.30.2-0ubuntu5) maverick; urgency=low
+
+  * debian/patches/09_gdmserver_gconf_settings.patch:
+  * debian/patches/09_gdmsetup.patch:
+    - Fix face browser toggle
+
+ -- Robert Ancell <[e-mail]>  Mon, 28 Jun 2010 10:03:02 +1000
+
+gdm (2.30.2-0ubuntu4) maverick; urgency=low
+
+  * debian/control:
+    - Build-depend on gnome-common for autotools
+  * debian/rules:
+    - Run autotools on build
+  * debian/source:
+    - Use source format 3.0
+  * debian/patches/*:
+    - Use quilt and fix patch headers
+  * debian/patches/09_gdmsetup.patch:
+    - Add checkbutton for enabling face browser (LP: #445123)
+  * debian/patches/99_autoreconf.patch:
+    - Removed, autotools now run from debian/rules
+
+ -- Robert Ancell <[e-mail]>  Tue, 22 Jun 2010 13:26:45 +1000
+
+gdm (2.30.2-0ubuntu3) maverick; urgency=low
+
+  * debian/patches/30_don_t_save_failsafe_session.patch: (LP: #542345)
+    - return FALSE instead of exiting on .desktop file without a comment
+
+ -- Didier Roche <[e-mail]>  Thu, 10 Jun 2010 10:32:58 +0200
+
+gdm (2.30.2-0ubuntu2) lucid-proposed; urgency=low
+
+  * debian/patches/16_gdmserver_user_manager.patch:
+  * debian/patches/24_system_uid.patch:
+    - Update to match IncludeAll behaviour in greeter (LP: #471542)
+
+ -- Robert Ancell <[e-mail]>  Wed, 09 Jun 2010 11:09:11 +1000
+
+gdm (2.30.2-0ubuntu1) lucid-proposed; urgency=low
+
+  * New upstream bug fix release:
+    - Accessibility is now enabled by default for the GDM login screen.
+    - When the face browser is disabled, the PAM conversation is started
+      immediately, so users do not need to click a button to start entering
+      the username and password.  (GNOME #591082)
+    - Add label-for and labelled-by a11y relations to the entry field in the
+      login GUI.  This makes the login GUI more accessible when using AT programs.
+      (GNOME #613434).
+    - Fixed bugs that were causing XDMCP to not show the greeter again after
+      logout.  (GNOME #606724).
+    - The default XDMCP PingIntervalSeconds was increased from 15 to
+      60 seconds.
+    - The WINDOWPATH environment variable is now set for the user session.
+      (GNOME #609272)
+    - Ensure Init script is called when using Automatic Login. (GNOME #614488)
+    - Fix race condition with Timed Login. (GNOME #614062)
+    - Drop xhost localuser:gdm and localuser:root when the user session starts.
+      (GNOME #605350)
+    - Removed the icon monitor from the GDM login GUI since it was not functional
+      and was causing problems with automounting user's $HOME directories.
+      (GNOME #609321, LP: #518810)
+    - Do not mark "%x" for translation. (GNOME #613306)
+    - Remove duplicated strings for translation. (GNOME #609179)
+    - Minor doc corrections.
+    - Translation updates.
+  * 04_fix_external_program_directories.patch, 99_autoreconf.patch: Refresh
+    for new upstream version.
+  * Add 34_disable_a11y_default.patch: Revert upstream change between 2.30.0
+    and 2.30.1 to enable a11y by default. This wasn't tested and isn't
+    appropriate for an SRU.
+  * 06_run_xsession.d.patch: Export $USERXSESSION, $USERXSESSIONRC, and
+    $ALTUSERXSESSION, so that running the "custom"/"default" sessions actually
+    works. Without those, /etc/X11/Xsession.d/50x11-common_determine-startup
+    decides to run the system default session even if we have the
+    "allow-user-xsession" option. This is a prerequisite for fixing LP#398300.
+    Also update the patch tag header to comply to DEP-3.
+  * Add debian/xsession.desktop: Add a new session type "~/.xsession" which
+    will run ~/.xsession (Exec=default will be interpreted by the
+    20x11-common_process-args and 50x11-common_determine-startup Xsession.d
+    scripts). If the admin sets "allow-user-xsession" to False, this will
+    launch the system default session instead. (LP: #398300)
+
+ -- Martin Pitt <[e-mail]>  Wed, 28 Apr 2010 14:41:12 +0200
+
+gdm (2.30.0-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/14_guest_session.patch:
+    - enable switching to guest session corresponsding to current one (ie UNE if
+      you are in UNE session and gnome if you are in GNOME session)
+      (LP: #562908)
+
+ -- Didier Roche <[e-mail]>  Wed, 14 Apr 2010 16:36:26 +0200
+
+gdm (2.30.0-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/29_switch_user.patch:
+    - Deselect user when cancelling user switch (LP: #532531)
+
+ -- Robert Ancell <[e-mail]>  Tue, 13 Apr 2010 15:43:37 +0800
+
+gdm (2.30.0-0ubuntu3) lucid; urgency=low
+
+  [ Didier Roche ]
+  * debian/patches/09_gdmsetup.patch:
+    - do not list users who have an encrypted home directory for autologin
+      candidate (still some corner case, see code comment). (LP: #353446)
+
+ -- Robert Ancell <[e-mail]>  Tue, 13 Apr 2010 15:43:27 +0800
+
+gdm (2.30.0-0ubuntu2) lucid; urgency=low
+
+  * 33-multi-keyboard-layouts.patch: Work around strange libxklavier behaviour
+    (which returns NULL for empty variants, but does not accept NULL when
+    setting a configuration). This fixes broken variant setting in some cases.
+    (LP: #550887)
+
+ -- Martin Pitt <[e-mail]>  Tue, 30 Mar 2010 22:29:15 +0200
+
+gdm (2.30.0-0ubuntu1) lucid; urgency=low
+
+  * New upstream release:
+    - Translation improvements
+  * debian/patches/09_gdmsetup.patch:
+    - Disable broken face browser checkbutton
+
+ -- Robert Ancell <[e-mail]>  Tue, 30 Mar 2010 12:56:00 +1100
+
+gdm (2.29.92-0ubuntu9) lucid; urgency=low
+
+  * 33-multi-keyboard-layouts.patch: Fix duplication of layouts by treating ""
+    and NULL variants equally. (LP: #548778)
+
+ -- Martin Pitt <[e-mail]>  Mon, 29 Mar 2010 10:07:58 +0200
+
+gdm (2.29.92-0ubuntu8) lucid; urgency=low
+
+  * debian/patches/09_gdmsetup.patch:
+    - reintegrate the needed bits lost in the merge in 2.29.92-0ubuntu5:
+      select default session is back! (LP: #548417)
+
+ -- Didier Roche <[e-mail]>  Fri, 26 Mar 2010 10:19:17 +0100
+
+gdm (2.29.92-0ubuntu7) lucid; urgency=low
+
+  * debian/patches/09_gdmserver_gconf_settings.patch:
+  * debian/patches/09_gdmsetup.patch:
+    - Add face browser checkbutton to gdmsetup (LP: #445123)
+
+ -- Robert Ancell <[e-mail]>  Fri, 26 Mar 2010 15:45:20 +1100
+
+gdm (2.29.92-0ubuntu6) lucid; urgency=low
+
+  * debian/patches/31-unify-power-strings.patch:
+    - drop the change for lucid it requires documentation update
+      which has not been taken into account there, similar changes are done on
+      the other desktop components too now
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 25 Mar 2010 11:26:02 +0100
+
+gdm (2.29.92-0ubuntu5) lucid; urgency=low
+
+  [ Robert Ancell ]
+  * debian/patches/09_gdmsetup.patch:
+  * debian/patches/15_gdmsetup_default_session.patch:
+  * debian/patches/09_gdmserver_sound_settings.patch:
+    - Add startup sound configuration
+    - Merged 15_gdmsetup_default_session.patch into 09_gdmsetup.patch
+
+   [ Didier Roche ]
+   * debian/patches/09_gdmserver_sound_settings.patch: (LP: #437429)
+   * debian/patches/15_gdmsetup_default_session.patch:
+     - add gconftool calls to get/set sound parameter
+     - fix some wrong signal call and missing callback function
+   * debian/patches/25_update_gconf_directories.patch:
+     - readd $HOME/.gconf between default and mandatory to take changes
+       into account
+
+ -- Didier Roche <[e-mail]>  Wed, 24 Mar 2010 11:11:33 +0100
+
+gdm (2.29.92-0ubuntu4) lucid; urgency=low
+
+  * 31-unify-power-strings.patch: Drop "Shut Down" → "Switch Off" hunk, still
+    under debate.
+  * Add 33-multi-keyboard-layouts.patch: Keep multiple system keyboard layouts
+    for session. (LP: #460328)
+
+ -- Martin Pitt <[e-mail]>  Tue, 23 Mar 2010 17:08:55 +0100
+
+gdm (2.29.92-0ubuntu3) lucid; urgency=low
+
+  * debian/gdm.upstart:
+    - Now we've inhibited rc2 from stopping plymouth once gdm has been
+      started, this script is responsible for stopping plymouth itself,
+      even if it doesn't start gdm.  Add a "plymouth quit || true" in
+      the "text" path.
+
+ -- Scott James Remnant <[e-mail]>  Wed, 17 Mar 2010 00:53:30 +0000
+
+gdm (2.29.92-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/28_plymouth_transition.patch:
+    - After deactivating plymouth, call plymouth --has-active-vt and if not,
+      just tell it to quit and don't continue with the transition -- start
+      gdm on a new vt
+
+      This solves the issue of just re-using the active VT when Plymouth
+      hasn't even shown a splash screen yet; resulting in X running on VT1
+      alongside the X server.
+
+ -- Scott James Remnant <[e-mail]>  Thu, 11 Mar 2010 20:06:42 +0000
+
+gdm (2.29.92-0ubuntu1) lucid; urgency=low
+
+  * New upsteam release:
+    - The greeter is not torn down until pam_open_session finishes since
+      some PAM modules can ask questions up until this point.
+    - The daemon now kills the session process rather than the entire process
+      group, fixing bug #607738. The corresponding gnome-session bug #607658
+       is released with 2.29.92 so this works properly.
+  * debian/patches/04_fix_external_program_directories.patch: adapt to
+    last upstream version
+  * debian/patches/99_autoreconf.patch: refreshed
+  * debian/control.in:
+    - bump Standards-Version to latest
+
+ -- Didier Roche <[e-mail]>  Tue, 09 Mar 2010 12:45:39 +0100
+
+gdm (2.29.6-0ubuntu7) lucid; urgency=low
+
+  * Add debian/patches/32-hide-mouse-cursor.patch: Hide the mouse cursor on
+    startup and when starting an user session.
+
+ -- Martin Pitt <[e-mail]>  Fri, 05 Mar 2010 11:03:55 +0100
+
+gdm (2.29.6-0ubuntu6) lucid; urgency=low
+
+  * debian/%gconf-tree.xml:
+    - updated artwork to the lucid one
+
+  [ Chris Coulson ]
+  * debian/patches/31-unify-power-strings.patch:
+    - Patch from Ted Gould to change "Shut down" and "Suspend" to
+      "Switch off" and "Sleep" (LP: #531493) 
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 04 Mar 2010 23:36:10 +0100
+
+gdm (2.29.6-0ubuntu5) lucid; urgency=low
+
+  * Add 18_locale_env_vars.patch: gdm does not have a facility to specify a
+    list of languages for $LANGUAGE, so do not break $LANGUAGE by forcing it
+    to $LANG (they have a completely different syntax, and different
+    meanings). Also, if the system sets $LC_ALL (which distros should never
+    ever do), we should not clobber this.  $LINGUAS is not a runtime
+    environment variable for locales, so just drop this.  (LP: #407300)
+
+ -- Martin Pitt <[e-mail]>  Thu, 04 Mar 2010 12:55:59 +0100
+
+gdm (2.29.6-0ubuntu4) lucid; urgency=low
+
+  * 05_initial_server_on_vt7.patch: Move the actual stamp file creation into
+    gdm_server_spawn(), so that the stamp file is also created when not using
+    gdm_server_start(). This happens when booting with Plymouth, since
+    28_plymouth_transition.patch introduces an alternative startup function.
+    (LP: #511134)
+
+ -- Martin Pitt <[e-mail]>  Wed, 03 Mar 2010 12:35:29 +0100
+
+gdm (2.29.6-0ubuntu3) lucid; urgency=low
+
+  * debian/patches/15_gdmsetup_default_session.patch: fix bug asking
+    polkit write access on load and erasing autologin
+
+ -- Didier Roche <[e-mail]>  Thu, 11 Feb 2010 12:24:10 +0100
+
+gdm (2.29.6-0ubuntu2) lucid; urgency=low
+
+  * debian/rules: Enable --with-incomplete-locales, so that the language
+    picker also displays languages which do not have any .mo file in
+    /usr/share/locale/ (since our langpacks ship the .mo files in a different
+    path). Thanks to Robert Collins for debugging this!
+
+ -- Martin Pitt <[e-mail]>  Fri, 05 Feb 2010 15:04:53 -0800
+
+gdm (2.29.6-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Various build fixes
+    - Crash fix in layout detection
+    - Crash fix in session list detection
+    - Remove timeout for interacting with PAM
+    - Fix compile with --no-as-needed
+    - Add debug message if system lacks fonts
+    - Disable switch user item if user switching won't work
+  * debian/patches/01_disable_hal.patch,
+    debian/patches/00git-add-missing-locale-alias.patch,
+    debian/patches/00git-keyboard-layout-crash.patch,
+    debian/patches/18_do_not_double_free_exec_variable.patch:
+    - those changes are in the new version
+  * debian/patches/15_default_session.patch,
+    debian/patches/99_autoreconf.patch:
+    - new version update
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 28 Jan 2010 17:10:32 +0100
+
+gdm (2.29.5-0ubuntu6) lucid; urgency=low
+
+  * add debian/patches/30_don_t_save_failsafe_session.patch:
+    Don't set failsafe session as default when user select it (LP: #509182)
+
+ -- Didier Roche <[e-mail]>  Thu, 21 Jan 2010 20:45:19 +0100
+
+gdm (2.29.5-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/15_gdmsetup_default_session.patch:
+    Provide default session choice in gdmsetup
+  * debian/patches/99_autoreconf.patch: refresh to take into account
+    new files in previous file
+
+ -- Didier Roche <[e-mail]>  Wed, 20 Jan 2010 15:04:11 +0100
+
+gdm (2.29.5-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/18_do_not_double_free_exec_variable.patch:
+    - don't free the exec variable twice, thank Colin Gibbs for the detailled 
+      bug description (lp: #505051)
+  * debian/patches/20_upstart.patch:
+    - specify the initctl path to avoid command not found errors which break
+      user switching and guest session
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 19 Jan 2010 23:42:30 +0100
+
+gdm (2.29.5-0ubuntu3) lucid; urgency=low
+
+  * debian/patches/15_default_session.patch: use gpointer* instead of
+    GObject* (as a parameter can be a GType)
+
+ -- Didier Roche <[e-mail]>  Tue, 19 Jan 2010 10:57:14 +0100
+
+gdm (2.29.5-0ubuntu2) lucid; urgency=low
+
+  * Add 00git-keyboard-layout-crash.patch: Fixes the crash that happens at the
+    second call of get_system_default_layout(). (LP: #505972)
+
+ -- Martin Pitt <[e-mail]>  Mon, 18 Jan 2010 16:28:48 +0100
+
+gdm (2.29.5-0ubuntu1) lucid; urgency=low
+
+  [ Robert Ancell ]
+  * debian/patches/29_switch_user.patch:
+    - Add bug link
+
+  [ Milan Bouchet-Valat ]
+  * debian/gdm.pam: allow members or the 'nopasswdlogin' group to log in
+    without password. This integrates with the gnome-system-tools, which
+    include such an option in 2.27.
+  * debian/gdm.postinst: create this group on install, which enables that
+    feature in the g-s-t.
+
+  [ Martin Pitt ]
+  * New upstream release:
+    - XDMCP fixes on Solaris
+    - run PostLogin script as user instead of gdm
+    - Fix ellipses usage on User Switch Applet
+    - Add ability to customize system language list
+    - Solaris NULL printf fixes
+    - Convert from glade to gtkbuilder
+    - Detect default keyboard layout better
+    - Ignore executable subfolders of xinitrc.d
+    - Don't reveal valid usernames when authenticating
+  * Drop 01_default_keyboard_layout.patch, accepted upstream.
+  * Refresh patches for new upstream version.
+  * Add 01_disable_hal.patch: Don't attempt to connect to Hal. The hal-using
+    code is already commented out, and this just needlessly triggers Hal
+    startup during boot.
+  * Add 00git-add-missing-locale-alias.patch: Add missing locale.alias file
+    (taken from upstream git head).
+
+ -- Martin Pitt <[e-mail]>  Thu, 14 Jan 2010 17:07:34 +0100
+
+gdm (2.29.4-0ubuntu3) lucid; urgency=low
+
+  * debian/patches/29_switch_user.patch:
+    - Add SwitchToUser() method call
+
+ -- Robert Ancell <[e-mail]>  Thu, 14 Jan 2010 13:11:06 +1100
+
+gdm (2.29.4-0ubuntu2) lucid; urgency=low
+
+  * debian/gdm.upstart: Wait for D-Bus to be ready, to avoid failure if gdm
+    starts too early. Thanks to Robert Hooker! (LP: #502838)
+
+ -- Martin Pitt <[e-mail]>  Sat, 09 Jan 2010 17:34:43 +0100
+
+gdm (2.29.4-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Remove deprecated function g_mapped_file_free
+    - Fix option widgets to work better with orca
+    - make --with-custom-conf work
+    - Don't hard code path to policykit agent
+    - Don't backup xkb configuration before login
+  * debian/control:
+    - updated libglib requirement
+  * debian/patches/08_use_polkit_for_settings.patch:
+    - new version update
+  * debian/patches/99_autoreconf.patch:
+    - new version update
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 07 Jan 2010 17:05:51 +0100
+
+gdm (2.29.1-0ubuntu9) lucid; urgency=low
+
+  * debian/patches/24_system_uid.patch: use configured system UID
+    minimum instead of hard-coded value (LP: #459199).
+
+ -- Kees Cook <[e-mail]>  Wed, 16 Dec 2009 10:35:09 -0800
+
+gdm (2.29.1-0ubuntu8) lucid; urgency=low
+
+  * debian/gdm.upstart:
+    - Revert Mario's changes which prevent gdm from starting for most people,
+      and introduce expensive dkms integration code in the non-dkms case!
+
+ -- Scott James Remnant <[e-mail]>  Tue, 15 Dec 2009 09:37:02 +0000
+
+gdm (2.29.1-0ubuntu7) lucid; urgency=low
+
+  * debian/60xdg_path-on-session:
+    - Add xdg path depending on GDM selected session. This enables starting
+      desired applications depending on session
+  * debian/gdm.install: install previous file in /etc/X11/Xsession.d
+
+ -- Didier Roche <[e-mail]>  Mon, 14 Dec 2009 21:20:06 +0100
+
+gdm (2.29.1-0ubuntu6) lucid; urgency=low
+
+  * debian/gdm.upstart (LP: #453365)
+    - Start on built-successful signal for fglrx or nvidia modules.
+    - If dkms is available on the system, use it to check the status
+      of fglrx or nvidia.  
+    - If they're in the DKMS tree but not built, exit the gdm task
+      and wait for the build-successful signal.  If they don't build,
+      the failsafe-x task will receive a build-failed and can start
+      BulletProof-X.
+
+ -- Mario Limonciello <[e-mail]>  Mon, 14 Dec 2009 14:09:14 -0600
+
+gdm (2.29.1-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/15_default_session.patch: (LP: #403291)
+    - Choose default session in /etc/gdm/custom.conf using DBus. Removed
+      default.desktop hack.
+    - Add /usr/lib/gdm-set-default-session to properly define default session:
+      use DBus when gdm daemon is on and filing the file when it's off. This
+      script can be called in postinst file of ubuntu derivatives.
+  * debian/60xdg_path-on-session:
+    - Add xdg path depending on GDM selected session. This enables starting
+      desired applications depending on session
+  * debian/patches/99_autoreconf.patch: refreshed
+
+ -- Didier Roche <[e-mail]>  Sat, 12 Dec 2009 22:55:06 +0100
+
+gdm (2.29.1-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/05_initial_server_on_vt7.patch:
+    - Fix a bug in the patch: the return value of open() can be zero on
+      success, because zero is a valid file descriptor!  This probably
+      never broke in the real world, because we always have standard
+      input set to something, but it's worth fixing bugs when you find
+      them ;-)
+  * debian/patches/27_save_root_window.patch:
+    - Patch taken from the plymouth-integration branch of Upstream GIT
+      to save the root window pixmap in a property for other things to
+      pick up. 
+  * debian/patches/28_plymouth_transition.patch:
+    - Patch taken from the plymouth-integration branch of Upstream GIT,
+      makes gdm check whether plymouth is running on startup; if it is,
+      actively arranges for a smooth transition.  Also handles getting
+      plymouth out of the way in case the X server doesn't start.
+  * debian/gdm.upstart:
+    - Remove "starting-dm" event; the above patch means we handle
+      stopping the splash screen gracefully by ourselves so don't need
+      it.
+    - Only look at /etc/X11/default-display-manager and /proc/cmdline
+      when started automatically; always allow "start gdm" to work.
+    - Use the PRIMARY_DEVICE_FOR_DISPLAY tag on the framebuffer or
+      drm card devices to start the X server, still falling back on
+      end of udev probing (we may have neither).  Drop the tty
+      part, we need both more and less than this.  LP: #491162.
+
+ -- Scott James Remnant <[e-mail]>  Fri, 11 Dec 2009 06:00:05 +0000
+
+gdm (2.29.1-0ubuntu3) lucid; urgency=low
+
+  * debian/gdm.upstart: Do not fail with exit status !=0 on startup 
+    when disabled. LP: #491483
+
+ -- Philip Muskovac <[e-mail]>  Mon, 07 Dec 2009 19:33:05 +0100
+
+gdm (2.29.1-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/26_no_debug.patch:
+    - Turn off debugging for unstable versions by default. Logging to
+      syslog will slow down loading
+
+ -- Chris Coulson <[e-mail]>  Fri, 04 Dec 2009 17:38:24 +0000
+
+gdm (2.29.1-0ubuntu1) lucid; urgency=low
+
+  * New upstream release:
+    [ 2.29.1 ]
+    - A new desktop extension is now supported in GDM session desktop files
+      (normally found in /usr/share/xsessions). Setting the key to true as follows:
+       X-GDM_BypassXsession=true
+      will cause the Xsession script to not be used to launch the session.  This
+      can be useful if you want to create a "failsafe" xterm session.  The Xsession
+      script sources the user's $HOME/.profile, for example, so setting this key
+      to true will ensure that any errors in the user's $HOME/.profile will not
+      cause the session to fail to start.
+    - Fix makedist problem.
+    [ 2.29.0 ]
+    - Now GDM supports Include, Exclude, and IncludeAll configuration options to
+      allow the ability to configure which users are displayed in the FaceBrowser.
+    - Now GDM supports better debugging.  Users can set the debug/Enable
+      configuration option to turn on GDM debugging.
+    - The directory where GDM screenshots are placed has been moved to its own
+      directory: /var/run/gdm/greeter/GDM-Screenshot.png.  The screenshot directory
+      can now be specified at build time via the --with-screenshot-dir configure
+      argument.
+    - Many simple-greeter Face Browser usability improvements.
+    - The simple-greeter Face Browser tree view search entry is now obscured to
+      help prevent accidental display of passwords.
+    - Shutdown and reboot functions are moved to a menu in the simple-greeter panel
+      instead of being presented as buttons.  The shutdown menu is better
+      positioned on multi-monitor displays.
+    - The simple-greeter panel notification area has been improved and now honors
+      the GConf setting for /apps/notification_area_applet/prefs/padding.
+    - The entry field in the simple-greeter now has accessibility labels so it will
+      work better with accessibility programs.
+    - The clock in the simple-greeter panel no longer shows the date, making the
+      screen look a little cleaner.  The date is moved to the clock tooltip so it
+      is still available.
+    - The simple-greeter now uses gethostname instead of g_get_host_name since
+      is more reliable when the hostname changes at runtime.
+    - The user switch applet now honors disable_lock_screen.  The option to lock
+      screen is now not shown if disable_lock_screen is set.
+    - The /var/run/gdm directory is better locked down.
+    - GDM no longer crashes on bad UTF-8 in the /etc/passwd file.
+    - When the worker dies, the auth-failed signal is no longer sent.  This 
+      prevents a crash that happens when switching run-levels when the login screen
+      is displayed.
+    - Ensure that the length of sockaddr structure is set to the correct length for
+      IPv4 or IPv6.  This makes GDM work better on some operating systems that are
+      picky about the length being exact.
+    - String and documentation improvements.
+  * debian/patches/17_add_failsafe.patch:
+  * debian/patches/22_shutdown_menu.patch:
+    - Applied upstream
+
+ -- Robert Ancell <[e-mail]>  Fri, 04 Dec 2009 16:19:35 +1100
+
+gdm (2.28.1-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/10_xsplash.patch:
+    - don't use xsplash by default for now, it uses lot of cpu and costs one
+      second to the current login, that will be reactivated later in lucid
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 03 Dec 2009 11:29:59 +0100
+
+gdm (2.28.1-0ubuntu4) lucid; urgency=low
+
+  * debian/gdm.upstart: Do not wait for hal, since we don't need it any more
+    (and doesn't even need to be installed any more with a dehalified X.org).
+
+ -- Martin Pitt <[e-mail]>  Fri, 27 Nov 2009 22:16:26 +0100
+
+gdm (2.28.1-0ubuntu3) lucid; urgency=low
+
+  * Replace 01_default_keyboard_layout_hal.patch with
+    01_default_keyboard_layout.patch which uses libxklavier instead of hal to
+    read the default keyboard layout from X.org. Drop hal build and binary
+    dependencies. (LP: #418981)
+  * 16_gdmserver_user_manager.patch, 99_autoreconf.patch: Updated.
+
+ -- Martin Pitt <[e-mail]>  Fri, 27 Nov 2009 09:25:31 +0100
+
+gdm (2.28.1-0ubuntu2) karmic-proposed; urgency=low
+
+  * Don't respawn gdm on failure; this lets us capture X failures instead and
+    trigger the bulletproof X handler here.  LP: #441638.
+  * re-export any XORGCONFIG value passed to the upstart job, needed to
+    complete integration with bulletproof X.  LP: #474806.
+
+ -- Steve Langasek <[e-mail]>  Wed, 04 Nov 2009 18:15:37 -0800
+
+gdm (2.28.1-0ubuntu1) karmic; urgency=low
+
+  * New upstream release (LP: #455944)
+    - GDM will now avoid calling XAddHosts for remote connections.
+    - Now GDM uses DeviceKit-power instead of gnome-power-manager for Suspend
+      support.
+    - Now the at-spi-registryd-wrapper.desktop GDM autostart file will run
+      at-spi-registryd directly instead of calling at-spi-registryd-wrapper.
+    - Fix to the visibility check for the "Other" button which corrects some
+      situations where the button would not appear when it was supposed to.
+    - Now the GDM daemon will make the /var/log/gdm directory if it does not
+      exist.
+    - Fixes to avoid autologin failure when a NULL username is passed in.
+    - Restore CTYPE when canonicalizing codesets.
+    - Several fixes to avoid warnings.
+  * debian/patches/18_create_log_dir_when_required.patch:
+  * debian/patches/21_dkpower.patch:
+    - Applied upstream
+  * debian/patches/22_shutdown_menu.patch:
+    - Updated
+
+ -- Robert Ancell <[e-mail]>  Tue, 20 Oct 2009 11:52:57 +1100
+
+gdm (2.28.0-0ubuntu19) karmic; urgency=low
+
+  * debian/%gconf-tree.xml, debian/gdm.postinst, debian/rules:
+    - don't use gconftool to register the default gconf keys but rather
+      install a xml files with the values, that will avoid different issues
+      due to the su call or the gconf server not being running 
+      (lp: #441028, #441167)
+    - set the gnome-power-manager icon key to never since that's not useful
+      on the login screen and the design team recommended to not have it there
+  * debian/gdm.postinst:
+    - workaround chown breaking due to the .gvfs fuse directory (lp: #438561)
+  * debian/patches/25_update_gconf_directories.patch:
+    - define a new directory which is used for the default gconf values
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 15 Oct 2009 12:34:11 +0200
+
+gdm (2.28.0-0ubuntu18) karmic; urgency=low
+
+  * debian/patches/14_guest_session.patch:
+    - Switch to existing guest session if already open (LP: #450965)
+  * debian/patches/24_system_uid.patch:
+  * debian/patches/16_gdmserver_user_manager.patch:
+    - Fix more cases of users with UID < 1000
+
+ -- Robert Ancell <[e-mail]>  Thu, 15 Oct 2009 01:07:18 +0200
+
+gdm (2.28.0-0ubuntu17) karmic; urgency=low
+
+  [ Robert Ancell ]
+  * debian/patches/22_shutdown_menu.patch:
+    - Mark power menu options as translatable (LP: #450707)
+
+  [ Scott James Remnant ]
+  * debian/gdm.upstart:
+    - Wait for tty7 to be ready, and either a framebuffer or the end
+      of coldplugging.
+
+ -- Scott James Remnant <[e-mail]>  Wed, 14 Oct 2009 05:08:47 +0100
+
+gdm (2.28.0-0ubuntu15) karmic; urgency=low
+
+  * debian/patches/23_login_window_hint.patch:
+    - Don't put a type hint on the login window as this causes it not to get
+      focus (LP: #447049)
+  * debian/patches/16_gdmserver_user_manager.patch:
+    - Don't show users with UID < 1000 (LP: #427462)
+
+ -- Robert Ancell <[e-mail]>  Tue, 13 Oct 2009 15:56:41 +1100
+
+gdm (2.28.0-0ubuntu14) karmic; urgency=low
+
+  * debian/gdm.postinst: Set icon theme to HumanLoginIcons. Also, call su just
+    once with all four gconftool commands instead of several times.
+
+ -- Martin Pitt <[e-mail]>  Wed, 07 Oct 2009 15:39:17 +0200
+
+gdm (2.28.0-0ubuntu13) karmic; urgency=low
+
+  * debian/gdm{,-autologin}.pam: correctly handle SELinux transitions,
+    thanks to Caleb Case (LP: #430205).
+
+ -- Kees Cook <[e-mail]>  Tue, 06 Oct 2009 16:49:25 -0700
+
+gdm (2.28.0-0ubuntu12) karmic; urgency=low
+
+  * debian/gdm.upstart: Also stop when entering single-user mode.
+    LP: #437281.
+
+ -- Scott James Remnant <[e-mail]>  Sat, 03 Oct 2009 08:09:44 +0100
+
+gdm (2.28.0-0ubuntu11) karmic; urgency=low
+
+  * 99_autoreconf.patch: Drop removal of *.rej junk, it was fixed in
+    04_fix_external_program_directories.patch.
+
+ -- Martin Pitt <[e-mail]>  Fri, 02 Oct 2009 12:22:28 +0200
+
+gdm (2.28.0-0ubuntu10) karmic; urgency=low
+
+  * 01_default_keyboard_layout_hal.patch: Read keyboard variant from hal, too.
+    (LP: #421212)
+  * debian/gdm.postinst: Set HumanLogin theme for metacity, too. Thanks to
+    Devid Antonio Filoni! (LP: #439546)
+  * 04_fix_external_program_directories.patch: Remove *.rej junk.
+  * 04_fix_external_program_directories.patch: Fix path to polkit-gnome
+    authentication agent. (Caught as a side issue in LP #401822)
+  * debian/rules: Drop polkit-gnome agent autostart file. It has never worked
+    anyway due to wrong path (see previous change), and we do not currently
+    need it.
+
+ -- Martin Pitt <[e-mail]>  Thu, 01 Oct 2009 23:53:54 +0200
+
+gdm (2.28.0-0ubuntu9) karmic; urgency=low
+
+  * debian/gdm.postinst:
+    - use the correct key to set the gtk theme
+
+  [ Robert Ancell ]
+  * debian/patches/22_shutdown_menu.patch:
+    - Fix spacing on shutdown menu (LP: #437691)
+  * debian/patches/*.patch:
+    - Update patch headers
+  * debian/patches/19_no_greeter_for_autologin.patch:
+    - Fix bug that caused the GDM greeter to be displayed briefly when
+      automatically logging in (LP: #435801)
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 30 Sep 2009 15:21:09 +0200
+
+gdm (2.28.0-0ubuntu8) karmic; urgency=low
+
+  * debian/gdm.upstart:
+    - Emit a starting-dm event just before starting gdm itself, for the
+      benefit of usplash.
+
+ -- Colin Watson <[e-mail]>  Tue, 29 Sep 2009 00:18:49 +0100
+
+gdm (2.28.0-0ubuntu7) karmic; urgency=low
+
+  * debian/gdm.postinst:
+    - set a different theme for the gdm login screen (lp: #436817)
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 28 Sep 2009 23:25:40 +0200
+
+gdm (2.28.0-0ubuntu6) karmic; urgency=low
+
+  * debian/patches/16_gdmserver_user_manager.patch:
+    - change by Cody Russell to Fix user-added and user-removed signal emissions
+      to emit the UID instead of the user pointer. (lp :#436195)
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 25 Sep 2009 00:58:39 +0200
+
+gdm (2.28.0-0ubuntu5) karmic; urgency=low
+
+  * debian/patches/17_add_failsafe.patch:
+    - adds code to support failsafe sessions again (from gnome #594833) 
+
+ -- Travis Watkins <[e-mail]>  Thu, 24 Sep 2009 10:30:08 +0200
+
+gdm (2.28.0-0ubuntu4) karmic; urgency=low
+
+  * Move shutdown buttons from under user list to lower right corner of screen
+    (LP: #434338)
+
+ -- Robert Ancell <[e-mail]>  Wed, 23 Sep 2009 15:44:15 +1000
+
+gdm (2.28.0-0ubuntu3) karmic; urgency=low
+
+  * debian/patches/21_dkpower.patch:
+    - Port the greeter to DK-Power so that the suspend/hibernate buttons
+      appear again, where supported (LP: #420063).
+  * debian/control:
+    - Add build-depend on libdevkit-power-gobject-dev (>= 008)
+  * Refreshed 99_autoreconf.patch
+
+ -- Chris Coulson <[e-mail]>  Tue, 22 Sep 2009 22:04:11 +0100
+
+gdm (2.28.0-0ubuntu2) karmic; urgency=low
+
+  * debian/patches/08_use_polkit_for_settings.patch:
+    - set translatable strings and list the file to translate (lp: #425798)
+  * debian/patches/09_gdmsetup.patch,
+    debian/patches/99_autoreconf.patch:
+    - initialize the translations so the gdmsetup interface is translated
+      (lp: #434102)
+  * debian/patches/17_use_timed_login_after_autologin.patch:
+    - revert upstream change to not use timed login after autologin session
+      (lp: #396489)
+  * debian/patches/18_create_log_dir_when_required.patch:
+    - create the log directory when required (lp: #405227)
+  * debian/gdm.config, debian/gdm.templates:
+    - restore debconf files which have been dropped by error in karmic, 
+      thanks Pär Andersson (lp: #395591)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 22 Sep 2009 15:20:27 +0200
+
+gdm (2.28.0-0ubuntu1) karmic; urgency=low
+
+  * New upstream release (LP: #434354)
+    - Now GDM supports the ability to specify the automatic/timed login user via
+      a script via the same interface that the old GDM supported.
+    - Now the user's dmrc and face image files are stored in /var/cache/gdm, so 
+      that the login process does not need to access the user's $HOME directory 
+      before authentication.
+    - Fix the login GUI options widget so the language/session/layout choices
+      are not reset after a failed login.
+    - Fix language dialog so it does not crash if the user click's the "OK"
+      button when no language is selected.
+    - Fix to ensure that the login dialog regains focus after the language or
+      layout dialogs are used.
+    - The language dialog has improved logic to sort the language names more
+      correctly.
+    - Make sure to check error variable is not NULL before referencing it in the
+      gdm-user-manager code.
+    - Make sure to not print NULL strings since this causes crashes on some
+      platforms.
+    - Improve documentation.
+  * debian/patches/09_gdmsetup.patch: updated:
+    - Filter ConsoleKit system users (LP: #432271)
+    - Make window size fixed (LP: #429206)
+  * debian/patches/01_default_keyboard_layout_hal.patch, 
+    debian/patches/99_autoreconf.patch: updated.
+
+ -- Robert Ancell <[e-mail]>  Mon, 21 Sep 2009 13:05:51 +1000
+
+gdm (2.27.90-0ubuntu7) karmic; urgency=low
+
+  [ Ken VanDine ]
+  * debian/patches/10_xsplash.patch:
+    - Use --daemon instead of using the "&" (LP: #430834) 
+  * debian/control:
+    - Conflict with xsplash (<< 0.8), we don't depend on xsplash but if 
+      /usr/bin/xsplash exists we need it to support the --daemon option
+
+  [ Martin Pitt ]
+  * debian/gdm.upstart: Drop gdm-cdd.conf handling, gdm does not support it
+    any more.
+  * debian/gdm.upstart: Do not start in single-user modes or when "text" is
+    given as a kernel command line option. This restores previous behaviour.
+    (LP: #431176)
+  * Add debian/onboard.desktop: gdm "onboard" configuration for the
+    accessibility dialog, thanks to Francesco Fumanti!
+  * debian/rules: Install onboard.desktop, remove gok.desktop from upstream
+    install. We do not ship gok any more. (LP: #423831, #130368)
+
+ -- Martin Pitt <[e-mail]>  Thu, 17 Sep 2009 19:22:46 +0200
+
+gdm (2.27.90-0ubuntu6) karmic; urgency=low
+
+  * The upstart job won't start unless hal is also started, so add an
+    appropriate versioned dependency on the upstarted hal.
+
+ -- Steve Langasek <[e-mail]>  Wed, 16 Sep 2009 01:58:11 -0700
+
+gdm (2.27.90-0ubuntu5) karmic; urgency=low
+
+  FFE LP: #427356.
+
+  * Replace init script with Upstart job.
+  * debian/control:
+    - Bump build-dependency on debhelper for Upstart-aware dh_installinit
+  * debian/patches/20_upstart.patch:
+    - Emit Upstart events when starting the login session and desktop
+      session, just after starting xsplash.  These can be used as
+      synchronisation points.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 15 Sep 2009 03:31:21 +0100
+
+gdm (2.27.90-0ubuntu4) karmic; urgency=low
+
+  * debian/patches/16_gdmserver_user_manager.patch:
+    - Add user manager d-bus interface to gdmserver (LP: #423450)
+
+ -- Robert Ancell <[e-mail]>  Sat, 12 Sep 2009 12:49:48 +0200
+
+gdm (2.27.90-0ubuntu3) karmic; urgency=low
+
+  * Add 15_default_session.patch: Prefer "default.session", so that other
+    desktop environments like XFCE can use gdm, too, without being forced to
+    start GNOME. (LP: #403291)
+  * debian/gdm.postrm: Fix purge breakage if one of the to-be-cleaned-up
+    directories does not exist.
+
+ -- Martin Pitt <[e-mail]>  Thu, 10 Sep 2009 13:02:27 +0200
+
+gdm (2.27.90-0ubuntu2) karmic; urgency=low
+
+  [ Robert Ancell ]
+  * debian/patches/13_cache_ck_history.patch:
+    - Cache result of ck-history to make startup fast (LP: #400863)
+
+  [ Martin Pitt ]
+  * Add 14_guest_session.patch: Rewrite guest session support for new gdm
+    architecture. This now adds a D-BUS operation StartGuestSession(), since
+    gdmflexiserver is being deprecated. (LP: #404870)
+
+ -- Martin Pitt <[e-mail]>  Mon, 07 Sep 2009 18:18:15 +0200
+
+gdm (2.27.90-0ubuntu1) karmic; urgency=low
+
+  [ Robert Ancell ]
+  * New upstream release: (LP: #418426)
+    - Autostart polkit-gnome authentication agent.
+    - Add screen capture sound effect to screenshot tool.
+    - If HOST_NAME_MAX is not available, try _POSIX_HOST_NAME_MAX, then 
+      default to 256.
+    - Add users "nobody4" and "noaccess" to the list of users to filter from
+      the Face Browser.
+    - Add Solaris logindevperm support. 
+    - Fix mispelling of XDMCP.
+    - Improve documentation.
+  * debian/control:
+    - Depend on libcanberra-gtk
+  * debian/patches/01_default_keyboard_layout_hal.patch:
+  * debian/patches/02_x_server_location.patch:
+  * debian/patches/03_hide_system_users.patch:
+  * debian/patches/04_fix_external_program_directories.patch:
+  * debian/patches/08_use_polkit_for_settings.patch:
+  * debian/patches/99_autoreconf.patch:
+    - Refreshed
+  * debian/patches/09_gdmsetup.patch:
+    - Set gdmsetup window title and icon
+    - Fix crash when have no default users configured
+
+  [ Ted Gould ]
+   * Add 12_fusa_name_change.patch: Change the Bonobo activation server name
+     of the FUSA applet.
+   * debian/rules: Rename the Bonobo activate server description before
+     installing it. (LP: #410498)
+
+ -- Robert Ancell <[e-mail]>  Tue, 25 Aug 2009 15:32:13 +0200
+
+gdm (2.27.4-0ubuntu11) karmic; urgency=low
+
+  * debian/patches/09_gdmsetup.patch:
+    - clean some unused variables there
+    - don't crash if there is no autologin key in the configuration yet
+      (lp: #410475)
+    - don't specify encoding in desktop entry (lp: #410591)
+  * debian/patches/11_crash_for_apport.patch:
+    - don't catch crashes so apport can do its job
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 12 Aug 2009 16:17:23 +0200
+
+gdm (2.27.4-0ubuntu10) karmic; urgency=low
+
+  * debian/patches/10_xsplash.patch:
+    - updated version by Cody Russell
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 11 Aug 2009 19:10:45 +0200
+
+gdm (2.27.4-0ubuntu9) karmic; urgency=low
+
+  * debian/control:
+   - build-depends on libpolkit-gobject-1-dev
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 07 Aug 2009 17:00:43 +0100
+
+gdm (2.27.4-0ubuntu8) karmic; urgency=low
+
+  * debian/patches/10_xsplash.patch:
+    - Fixed a syntax error
+
+ -- Ken VanDine <[e-mail]>  Fri, 07 Aug 2009 16:29:02 +0100
+
+gdm (2.27.4-0ubuntu7) karmic; urgency=low
+
+  * debian/patches/08_use_polkit_for_settings.patch:
+    - Use PolicyKit for GDM settings
+  * debian/patches/09_gdmsetup.patch:
+    - Provide a setup tool for basic configuration (LP: #395299)
+  * debian/patches/10_xsplash.patch:
+    - Load xsplash on login
+  * debian/patches/99_autoreconf.patch:
+    - Updated
+
+ -- Robert Ancell <[e-mail]>  Fri, 07 Aug 2009 09:23:21 +0100
+
+gdm (2.27.4-0ubuntu6) karmic; urgency=low
+
+  * debian/patches/07_correct_distribution_version.patch:
+    - correctly display ubuntu as distribution (lp: #396805)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 23 Jul 2009 23:19:33 +0200
+
+gdm (2.27.4-0ubuntu5) karmic; urgency=low
+
+  * debian/rules:
+    - move custom.conf to /usr/share/doc/gdm/examples to avoid
+      a conffile prompt when upgrading from a existing gdm
+  * debian/gdm.preinst:
+    - fix typo
+
+ -- Michael Vogt <[e-mail]>  Wed, 22 Jul 2009 10:51:59 +0200
+
+gdm (2.27.4-0ubuntu4) karmic; urgency=low
+
+  * debian/control:
+    - Replace dependency on gnome-session with gnome-session-bin
+    - Add recommends on metacity | x-window-manager
+    - Add recommends on gnome-settings-daemon | xfconf
+    - Add suggestion on gnome-power-manager, gnome-orca, gok, and gnome-mag
+    - (LP: #400901)
+
+ -- Cody A.W. somerville <[e-mail]>  Tue, 21 Jul 2009 21:28:30 +0200
+
+gdm (2.27.4-0ubuntu3) karmic; urgency=low
+
+  * 06_run_xsession.d.patch: Define $OPTIONFILE, so that the
+    75dbus_dbus-launch Xsession.d script properly runs the session under
+    dbus-launch. (LP: #402161)
+
+ -- Martin Pitt <[e-mail]>  Tue, 21 Jul 2009 14:31:02 +0200
+
+gdm (2.27.4-0ubuntu2) karmic; urgency=low
+
+  * debian/control: Fix typo in Conflicts
+
+ -- Didier Roche <[e-mail]>  Mon, 20 Jul 2009 16:12:11 +0200
+
+gdm (2.27.4-0ubuntu1) karmic; urgency=low
+
+  * New upstream release:
+    - Favor XFree86 Xinerama over Solaris Xinerama on Solaris
+    - Make greeter a well behaved session client
+    - XDMCP fixes
+    - Fix up btmp record handling
+    - Handle locales with modifiers better
+    - Use better logic with keyboard layout handling
+    - Change example PAM file/documentation to demonstrate password-less login
+    - Handle usernames from non-utf8 locales
+    - Allow dbus introspection for gdm services
+    - Show more details authentication error messages in UI
+    - Allow uppercase and lowercase booleans in config file
+    - Be more consistent with booleans in schemas
+    - Use g_timeout_add_seconds to reduce wakeups
+    - Make greeter window more clear when user list is disabled
+    - Put greeter login window in same ctrl-alt-tab menu as panel
+    - Port greeter to PolicyKit 1.0
+    - Shave off 1/2 second delay when bringing up greeter
+    - OS X portability fixes
+    - Look for locales in /usr/lib/locale instead of /usr/share/locale
+    - Better handling when two users have the same name
+  * Drop 01_xrdb_nocpp.patch, applied upstream.
+  * debian/control:
+    - use conflicts on the buggy libxklavier version to avoid race upgrade
+      leading to a gdm greeter crash
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 20 Jul 2009 15:20:37 +0200
+
+gdm (2.26.1git20090717-0ubuntu2) karmic; urgency=low
+
+  * Add 06_run_xsession.d.patch: Run /etc/X11/Xsession.d/. (LP: #401201)
+  * Add debian/watch.
+  * Add 01_default_keyboard_layout_hal.patch: Get default keyboard layout from
+    hal. Patch taken from Fedora. (LP: #395103) Add libhal-dev build
+    dependency.
+  * Add 99_autoreconf.patch to pick up above change.
+
+ -- Martin Pitt <[e-mail]>  Mon, 20 Jul 2009 13:20:46 +0200
+
+gdm (2.26.1git20090717-0ubuntu1) karmic; urgency=low
+
+  * Update to latest upstream git head:
+    - Make greeter login window be a dock. Fixes metacity complaining about
+      session management. (LP: #395324)
+  * Drop patches which are fixed upstream:
+    - 00git-greeter-session-management.patch
+    - 00git-invalid-dmrc-layout.patch
+    - 00git-use-after-free.patch
+    - 00git-xklavier4.patch
+    - 02_dont_force_us_keyboard.patch
+    - 04_polkit1.patch
+  * 80_workaround_incorrect_directories.patch: Update to new upstream version.
+  * Drop 01_xconfigoptions.patch; these configure variables are not used any
+    more in the upstream code, and upstream supplies the X.org -br option by
+    default now. Also drop the corresponding configure changes from
+    17_update_default_xserver.patch.
+  * Apply 15_usplash.patch to debian/gdm.init and drop the patch.
+  * 17_update_default_xserver.patch: Update to new upstream version, add
+    corresponding configure change, add patch tag header, forward upstream,
+    and rename to 02_x_server_location.patch.
+  * Drop 99_autoreconf.patch. The only remaining build system change is the
+    previous item.
+  * Drop 20_xdm-stuff.patch, it's just cruft.
+  * Drop debian/Xsession, and change debian/rules to install the upstream one.
+  * 01_xrdb_nocpp.patch: Add patch tag header, forward upstream.
+  * Rename 80_workaround_incorrect_directories.patch to
+    04_fix_external_program_directories.patch and add patch tag header.
+  * Rename 81_initial_server_on_vt7.patch to 05_initial_server_on_vt7.patch.
+  * debian/rules: Remove /var/gdm (empty and nonstandard) and /var/run (will
+    be created at runtime), thanks lintian.
+  * debian/copyright: Point to versioned GPL, thanks lintian.
+  * debian/gdm.postrm: Use "set -e" to conform to policy.
+  * Add debian/xterm.desktop: Reintroduce "failsafe xterm" session.
+
+ -- Martin Pitt <[e-mail]>  Fri, 17 Jul 2009 11:41:35 +0200
+
+gdm (2.26.1-0ubuntu7) karmic; urgency=low
+
+  * Rename 04_xklavier4.patch to 00git-xklavier4.patch.
+  * Add 04_polkit1.patch: Port to PolicyKit (which essentially means to rip
+    out all PolicyKit code, since the backend now talks to the authentication
+    agent itself).
+  * debian/control: Drop polkit build dependency.
+  * Add debian/patches/99_autoreconf.patch: Regenerate autotools files to pick
+    up 04_polkit1.patch changes.
+
+ -- Martin Pitt <[e-mail]>  Mon, 13 Jul 2009 14:50:17 +0200
+
+gdm (2.26.1-0ubuntu6) karmic; urgency=low
+
+  * Add 00git-greeter-session-management.patch: Make the greeter a
+    well-behaved session client. Patch taken from upstream git head.
+  * Add 00git-use-after-free.patch: Fix crash in xdmcp chooser. Taken from
+    upstream git head.
+  * debian/control: Add libxklavier-dev build dependency, to get the
+    keyboard selector.
+  * Add 04_xklavier4.patch: Fix build with libxklavier 4.0. Taken from
+    upstream git head.
+  * Add 00git-invalid-dmrc-layout.patch: Correctly handle invalid xkb layout
+    from ~/.dmrc. Taken from upstream git head.
+
+ -- Martin Pitt <[e-mail]>  Mon, 13 Jul 2009 11:17:44 +0200
+
+gdm (2.26.1-0ubuntu5) karmic; urgency=low
+
+  * debian/gdm.preinst: Remove obsolete conffiles.
+  * debian/gdm.preinst: Migrate autologin settings from gdm.conf (which isn't
+    read any more) to custom.conf. (LP: #396459)
+  * Add 81_initial_server_on_vt7.patch: Force initial X server to go to tty7
+    instead of tty1. This is an Ugly Hack until we have a cleaner solution for
+    getty not to tramp over a running X server on vt1. This bandaids the
+    immediate problem of the first X server being killed after a few minutes
+    due to getty on tty1 timing out. (LP: #396226)
+
+ -- Martin Pitt <[e-mail]>  Thu, 09 Jul 2009 18:08:07 +0200
+
+gdm (2.26.1-0ubuntu4) karmic; urgency=low
+
+  * debian/gdm.preinst: Do not check for an existing custom.conf, since we
+    already ship it. Always let the gdm.conf-custom win, to actually migrate
+    settings.
+  * debian/control: Drop alternative dependencies for gnome-session, since gdm
+    itself now needs gnome-session. (LP: #396321).
+
+ -- Martin Pitt <[e-mail]>  Tue, 07 Jul 2009 08:53:38 +0200
+
+gdm (2.26.1-0ubuntu3) karmic; urgency=low
+
+  * Add 03_hide_system_users.patch: Do not show system users in the "frequent
+    users" list. (LP: #395281)
+  * debian/rules: Call dh_installinit with --no-scripts, to avoid restarting
+    gdm (and killing your X session) during upgrade. The prerm/postinst
+    scripts already have code to reload gdm if appropriate. Unfortunately this
+    doesn't help to fix the upgrade from 0ubuntu2, its prerm already kills it.
+    (LP: #395302) This also fixes the "locks session and spawns a second X
+    server" issue on upgrades from Jaunty. (LP: #395313)
+  * Drop 16_correct_customconf_naming.patch: Upstream uses
+    and installs /etc/gdm/custom.conf, so gdm also needs to read this. Add
+    debian/gdm.preinst to migrate the old name to the new name on upgrades.
+    (LP: #395861)
+  * 02_dont_force_us_keyboard.patch: Don't return NULL in
+    get_default_layout(), but return an empty string and explicitly check this
+    when setting $GDM_KEYBOARD_LAYOUT. With NULL, gdm trips over an assertion
+    check. (LP: #395595)
+
+ -- Martin Pitt <[e-mail]>  Mon, 06 Jul 2009 16:04:25 +0200
+
+gdm (2.26.1-0ubuntu2) karmic; urgency=low
+
+  * debian/control: Add Vcs-Bzr, package imported into bzr.
+  * Add 02_dont_force_us_keyboard.patch: Don't force GDM_KEYBOARD_LAYOUT=us if
+    gdm does not have an explicit setting (which it currently doesn't, since
+    there is not even an interface for changing the keyboard layout). Instead,
+    let the GNOME session default to the very same system default as gdm
+    itself. (LP: #395103)
+
+ -- Martin Pitt <[e-mail]>  Fri, 03 Jul 2009 19:19:56 +0200
+
+gdm (2.26.1-0ubuntu1) karmic; urgency=low
+
+  * Upload the new gdm codebase to karmic, there is several known issues but
+    the new version need testing:
+    - there is no graphical configure tool yet
+    - gdm will not work correctly after upgrade until restart (restarting on
+      upgrade is not possible since it would close running xsession)
+    - the fast user switch applet ubuntu changes and the guest session
+      have not been updated yet
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 02 Jul 2009 16:24:43 +0200
+
+gdm (2.26.1-0ubuntu0.3) karmic; urgency=low
+
+  * debian/gdm.init: tweak previous change to not break default server
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 01 Jul 2009 09:55:39 +0200
+
+gdm (2.26.1-0ubuntu0.2) karmic; urgency=low
+
+  * debian/patches/17_update_default_xserver.patch:
+    - update xserver location
+  * debian/gdm.init: use the correct binary naming so restart is working
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 30 Jun 2009 23:23:17 +0200
+
+gdm (2.26.1-0ubuntu0.1) karmic; urgency=low
+
+  * New upstream version 
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 04 Jun 2009 16:01:19 +0200
+
+gdm-new (2.25.2-0ubuntu0.2) jaunty; urgency=low
+
+  * debian/patches/16_correct_customconf_naming.patch:
+    - use correct gdm.conf-custom location so user config settings are read
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 03 Mar 2009 17:40:04 +0100
+
+gdm-new (2.25.2-0ubuntu0.1) intrepid; urgency=low
+
+  * New upstream version, the code is a rewrite so the packaging is new too
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 15 Jul 2008 14:16:47 +0100
+

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2011-03-10 14:39:08 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2011-03-10 14:39:08 +0000
@@ -0,0 +1,67 @@
+Source: gdm
+Section: gnome
+Priority: optional
+Maintainer: Sebastien Bacher <[e-mail]>
+Build-Depends: cdbs, 
+               debhelper (>= 7.3.15ubuntu2),
+               gnome-common,
+               autotools-dev, 
+               gnome-pkg-tools,
+               libglib2.0-dev (>= 2.22), 
+               libdbus-glib-1-dev (>= 0.74), 
+               libx11-dev, 
+               libgtk2.0-dev (>= 2.23.90-0ubuntu4), 
+               libgconf2-dev, 
+               gnome-doc-utils,
+               libpanel-applet2-dev, 
+               gconf2,
+               libattr1-dev,
+               libpam0g-dev, 
+               libxdmcp-dev, 
+               libwrap0-dev, 
+               libxi-dev, 
+               libxinerama-dev, 
+               libxklavier-dev,
+               libpolkit-gobject-1-dev,
+               libcanberra-gtk-dev (>= 0.4),
+               libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], 
+               iso-codes,
+               libupower-glib-dev (>= 0.9.0)
+Standards-Version: 3.9.1
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gdm/ubuntu
+
+Package: gdm
+Conflicts: gdm-snapshot, fast-user-switch-applet, libxklavier15 (<< 4.0-0ubuntu2), xsplash (<< 0.8)
+Replaces: gdm-snapshot, fast-user-switch-applet
+Architecture: any
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends},
+         adduser,
+         libpam-modules (>= 0.72-1),
+         libpam-runtime (>= 0.76-13.1),
+         gnome-session-bin,
+         kbd | console-tools,
+         udev (>= 149-2)
+Recommends: xserver-xorg,
+         metacity | x-window-manager,
+         gnome-settings-daemon | xfconf
+Suggests: locales,
+          uswsusp,
+          libpam-gnome-keyring,
+          gnome-power-manager,
+          gnome-orca,
+          gok,
+          gnome-mag
+Provides: x-display-manager
+Breaks: usplash
+Description: GNOME Display Manager
+ gdm provides the equivalent of a "login:" prompt for X displays- it
+ pops up a login window and starts an X session.
+ .
+ It provides all the functionality of xdm, including XDMCP support for
+ managing remote displays.
+ .
+ The greeting window is written using the GNOME libraries and hence
+ looks like a GNOME application- even to the extent of supporting
+ themes! By default, the greeter is run as an unprivileged user for
+ security.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2011-03-10 14:39:08 +0000
@@ -0,0 +1,54 @@
+This package was debianized by Sebastien Bacher <[e-mail]> on
+Tue, 15 Jul 2008 14:16:47 +0100.
+
+It was downloaded from http://ftp.acc.umu.se/pub/GNOME/sources/gdm/2.22
+
+Upstream Authors:
+
+	 William Jon McCann <[e-mail]>
+	 Ray Strode <[e-mail]>
+
+Copyright:
+
+Copyright (C) 2007 William Jon McCann <[e-mail]>
+Copyright (C) 2003 Red Hat Inc.
+Copyright (C) 1999, 2000 Aladdin Enterprises.  All rights reserved.
+Copyright (C) 2006 Red Hat, Inc.
+Copyright (C) 2006 Ray Strode <[e-mail]>
+Copyright (C) 2004, 2008 Sun Microsystems, Inc.
+Copyright (C) 2005, 2008 Red Hat, Inc.
+Copyright (c) 2007 David Zeuthen <[e-mail]>
+Copyright (C) 1998, 1999, 2000 Martin K. Petersen <[e-mail]>
+Copyright (C) 2004-2005 James M. Cape <[e-mail]>.
+Copyright (C) 2001 Havoc Pennington, 2002 Red Hat Inc.
+Copyright (C) 2003-2006 Vincent Untz
+Copyright (C) 2002 Red Hat, Inc.
+Copyright (C) 2006, 2007 Christian Persch
+Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+Copyright (C) 2002 Anders Carlsson <[e-mail]>
+Copyright (C) 2008 Red Hat, Inc.
+Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2003 Sun Microsystems, Inc.
+Copyright (C) 2000 Helix Code, Inc.
+Copyright (C) 2001-2006  Jonathan Blandford <[e-mail]> 
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation version 3
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is (C) 2008, Sebastien Bacher <[e-mail]> and
+is licensed under the GPL, see above.

=== added file 'debian/gdm-autologin.pam'
--- debian/gdm-autologin.pam	1970-01-01 00:00:00 +0000
+++ debian/gdm-autologin.pam	2011-03-10 14:39:08 +0000
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth    requisite       pam_nologin.so
+auth    required        pam_env.so readenv=1
+auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
+auth    required        pam_permit.so
+@include common-account
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+session required        pam_limits.so
+@include common-session
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+@include common-password

=== added file 'debian/gdm.8.pod'
--- debian/gdm.8.pod	1970-01-01 00:00:00 +0000
+++ debian/gdm.8.pod	2011-03-10 14:39:08 +0000
@@ -0,0 +1,47 @@
+=head1 NAME
+
+gdm - GNOME Display Manager
+
+=head1 SYNOPSIS
+
+gdm
+
+=head1 DESCRIPTION
+
+B<gdm> is the equivalent of xdm(1x) or wdm(1x), but uses the GNOME
+libraries to provide a GNOME look-and-feel. It provides the GNOME
+equivalent of a "login:" prompt.
+
+B<gdm> reads F</etc/gdm/gdm.conf> for its configuration. For each
+local display, gdm starts an X server and runs gdmlogin(8x) on that
+display. The main gdm process also listens for XDMCP requests from
+remote displays. These requests can either be direct, causing B<gdm>
+to start a gdmlogin(8x) on the remote display, or indirect, causing
+a gdmchooser(8x) to be opened.
+
+When managing a display, B<gdm> attempts to execute
+F</etc/gdm/Init/>I<display>, or F</etc/gdm/Init/Default> if that does
+not exist. When a user logs in, B<gdm> first attempts
+F</etc/gdm/PreSession/>I<display> (or F</etc/gdm/PreSession/Default>),
+and then one of the sessions in F</etc/gdm/Sessions>. When the session
+has completed, B<gdm> attempts to run
+F</etc/gdm/PostSession/>I<display>, or
+F</etc/gdm/PostSession/>I<Default>. Of all these files, only the
+F</etc/gdm/Sessions> one is required to exist.
+
+B<gdm> maintains information about the displays it is managing in
+F</var/lib/gdm>. This includes xauth information, so this directory
+is not readable to normal users.
+
+B<gdm> uses PAM to perform authentication using the config file
+F</etc/pam.d/gdm>.
+
+=head1 AUTHOR
+
+Martin Kasper Petersen <[e-mail]>
+
+This manual page written by Steve Haslam <[e-mail]> for
+Debian GNU/Linux. Updated by Raphaël Hertzog <[e-mail]>.
+Updated by Ryan Murray <[e-mail]>.
+
+=cut

=== added file 'debian/gdm.config'
--- debian/gdm.config	1970-01-01 00:00:00 +0000
+++ debian/gdm.config	2011-03-10 14:39:08 +0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+# Debian gdm package configuration script
+# Copyright 2000-2001 Branden Robinson.
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+
+set -e
+
+# source debconf library
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=gdm
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+# set default display manager
+
+db_get shared/default-x-display-manager
+OLD_DEFAULT="$RET"
+
+db_metaget shared/default-x-display-manager owners
+OWNERS="$RET"
+db_metaget shared/default-x-display-manager choices
+CHOICES="$RET"
+
+if [ "$OWNERS" != "$CHOICES" ]; then
+  db_subst shared/default-x-display-manager choices $OWNERS
+  db_fset shared/default-x-display-manager seen false
+fi
+
+db_input high shared/default-x-display-manager || true
+db_go
+
+# using this display manager?
+db_get shared/default-x-display-manager
+CURRENT_DEFAULT="$RET"
+# remove the default display manager file if we're going to change it
+if [ "$OLD_DEFAULT" != "$CURRENT_DEFAULT" ]; then
+  rm -f $DEFAULT_DISPLAY_MANAGER_FILE
+fi
+
+exit 0

=== added file 'debian/gdm.init'
--- debian/gdm.init	1970-01-01 00:00:00 +0000
+++ debian/gdm.init	2011-03-10 14:39:08 +0000
@@ -0,0 +1,119 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          gdm
+# Should-Start:      console-screen acpid dbus hal network-manager
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: GNOME Display Manager
+# Description:       Debian init script for the GNOME Display Manager
+### END INIT INFO
+#
+# Author:       Ryan Murray <[e-mail]>
+#
+set -e
+
+# To start gdm even if it is not the default display manager, change
+# HEED_DEFAULT_DISPLAY_MANAGER to "false."
+HEED_DEFAULT_DISPLAY_MANAGER=true
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/gdm-binary
+PIDFILE=/var/run/gdm.pid
+UPGRADEFILE=/var/run/gdm.upgrade
+
+if [ -e $UPGRADEFILE -a "$1" != "restart" -a "$1" != "force-reload" ]; then
+	SSD_ARG="--startas $DAEMON"
+	rm -f $UPGRADEFILE
+else
+	SSD_ARG="--exec $DAEMON"
+fi
+
+# Allow cdd to override the config
+if [ -f /etc/gdm/gdm-cdd.conf ]; then
+	CONFIG_FILE="--config=/etc/gdm/gdm-cdd.conf"
+fi
+
+test -x $DAEMON || exit 0
+
+if [ -r /etc/default/locale ]; then
+  . /etc/default/locale
+  export LANG LANGUAGE
+elif [ -r /etc/environment ]; then
+  . /etc/environment
+  export LANG LANGUAGE
+fi
+
+. /lib/lsb/init-functions
+
+case "$1" in
+  start)
+        if grep -wqs text /proc/cmdline; then
+		log_warning_msg "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
+  	elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" -a "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" -a "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2>/dev/null)" != "/usr/sbin/gdm" ]; then
+		log_warning_msg "Not starting GNOME Display Manager (gdm); it is not the default display manager."
+	else
+		if [ -z "$SPLASH_ORIG_CONSOLE" ]; then
+			log_begin_msg "Starting GNOME Display Manager..."
+		fi
+		# if usplash is running, make sure to stop it now, yes "start" kills it.
+		if [ "$SPLASH_ORIG_CONSOLE" ]; then
+			# usplash was already shut down earlier, so don't
+			# log success as it will look weird on the console.
+			log_end_msg=:
+	        elif pidof usplash > /dev/null; then
+			SPLASH_ORIG_CONSOLE="$(fgconsole)"
+			DO_NOT_SWITCH_VT=yes /etc/init.d/usplash start
+			# We've just shut down usplash, so don't log
+			# success as it will look weird on the console.
+			log_end_msg=:
+		else
+			log_end_msg=log_end_msg
+		fi
+		start-stop-daemon --start --quiet --background --oknodo --pidfile $PIDFILE --name gdm-binary $SSD_ARG -- $CONFIG_FILE >/dev/null 2>&1 || log_end_msg 1
+		$log_end_msg 0
+
+		if [ "$SPLASH_ORIG_CONSOLE" ] && \
+		   [ "$SPLASH_ORIG_CONSOLE" != serial ]; then
+			# Wait a short while for the active console to
+			# change, to try to avoid visible console noise from
+			# later init scripts.
+			i=0
+			while [ "$(fgconsole)" = "$SPLASH_ORIG_CONSOLE" ]; do
+				i="$(($i + 1))"
+				if [ "$i" -gt 5 ]; then
+					break
+				fi
+				sleep 1
+			done
+		fi
+	fi
+  ;;
+  stop)
+	log_begin_msg "Stopping GNOME Display Manager..."
+	start-stop-daemon --stop  --quiet --oknodo --pidfile $PIDFILE --name gdm-binary $SSD_ARG --retry 30 >/dev/null 2>&1
+	log_end_msg 0
+  ;;
+  reload)
+	log_begin_msg "Reloading GNOME Display Manager configuration..."
+	log_warning_msg "Changes will take effect when all current X sessions have ended."
+	start-stop-daemon --stop --signal USR1 --quiet --pidfile \
+		$PIDFILE --name gdm-binary $SSD_ARG >/dev/null 2>&1
+	log_end_msg 0
+  ;;
+  restart|force-reload)
+	$0 stop || true
+	$0 start
+  ;;
+  status)
+	status_of_proc -p "$PIDFILE" "$DAEMON" gdm-binary && exit 0 || exit $?
+  ;;
+  *)
+	log_success_msg "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}"
+	exit 1
+  ;;
+esac
+
+exit 0

=== added file 'debian/gdm.install'
--- debian/gdm.install	1970-01-01 00:00:00 +0000
+++ debian/gdm.install	2011-03-10 14:39:08 +0000
@@ -0,0 +1,1 @@
+debian/60xdg_path-on-session etc/X11/Xsession.d/

=== added file 'debian/gdm.pam'
--- debian/gdm.pam	1970-01-01 00:00:00 +0000
+++ debian/gdm.pam	2011-03-10 14:39:08 +0000
@@ -0,0 +1,14 @@
+#%PAM-1.0
+auth    requisite       pam_nologin.so
+auth    required        pam_env.so readenv=1
+auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
+auth    sufficient      pam_succeed_if.so user ingroup nopasswdlogin
+@include common-auth
+auth    optional        pam_gnome_keyring.so
+@include common-account
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
+session required        pam_limits.so
+@include common-session
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+session optional        pam_gnome_keyring.so auto_start
+@include common-password

=== added file 'debian/gdm.postinst'
--- debian/gdm.postinst	1970-01-01 00:00:00 +0000
+++ debian/gdm.postinst	2011-03-10 14:39:08 +0000
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=gdm
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+# creating gdm group if he isn't already there
+if ! getent group gdm >/dev/null; then
+        addgroup --system gdm
+fi
+
+# creating gdm user if he isn't already there
+if ! getent passwd gdm >/dev/null; then
+        adduser --system --ingroup gdm --home /var/lib/gdm gdm
+        usermod -c "Gnome Display Manager" gdm
+        usermod -d "/var/lib/gdm"          gdm
+        usermod -g "gdm"                   gdm
+        usermod -s "/bin/false"            gdm
+fi
+
+# Creating nopasswdlogin group if he isn't already there.
+# That enables the password-less login feature in the users-admin
+# tool of the gnome-system-tools for users that belong to it,
+# and which is working thanks to GDM's PAM policy.
+if ! getent group nopasswdlogin >/dev/null; then
+        addgroup --system nopasswdlogin
+fi
+
+if [ -d /var/lib/gdm ]; then
+  chown gdm:gdm /var/lib/gdm
+  chown -R gdm:gdm /var/lib/gdm/.gconf*
+  chmod 0750 /var/lib/gdm
+fi
+
+# debconf is not a registry, so we only fiddle with the default file if it
+# does not exist
+if [ ! -e $DEFAULT_DISPLAY_MANAGER_FILE ]; then
+  if db_get shared/default-x-display-manager; then
+    # workaround debconf passthru bug (#379198)
+    if [ -z "$RET" ]; then
+      $RET="$THIS_PACKAGE"
+    fi
+    if [ "$THIS_PACKAGE" != "$RET" ]; then
+      echo "Please be sure to run \"dpkg --configure $RET\"."
+    fi
+    if db_get "$RET"/daemon_name; then
+      echo "$RET" > $DEFAULT_DISPLAY_MANAGER_FILE
+    fi
+  fi
+fi
+# debconf hangs if gdm gets started below without this
+db_stop || true
+
+PID=$(status "gdm" 2>/dev/null | awk '/[0-9]$/ { print $NF }')
+[ -z "$PID" ] || kill -HUP $PID
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/gdm.postrm'
--- debian/gdm.postrm	1970-01-01 00:00:00 +0000
+++ debian/gdm.postrm	2011-03-10 14:39:08 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "purge" ] ; then
+        rm -f /etc/default/gdm
+        if [ -d /etc/gdm ]; then
+                rmdir /etc/gdm/Init /etc/gdm/PreSession /etc/gdm/PostSession /etc/gdm/PostLogin /etc/gdm/Sessions /etc/gdm 2>/dev/null || true
+        fi
+        if [ -d /var/lib/gdm ]; then
+                rm -r /var/lib/gdm
+        fi
+        if [ -d /var/log/gdm ]; then
+                rm -r /var/log/gdm
+        fi
+        if getent passwd gdm >/dev/null; then
+                if [ -x /usr/sbin/deluser ]; then
+                        deluser --system gdm || echo "Could not remove gdm user."
+                fi
+        fi
+        if getent group gdm >/dev/null; then
+                if [ -x /usr/sbin/delgroup ]; then
+                        delgroup --system gdm || echo "Could not remove gdm group."
+                fi
+        fi
+fi
+#DEBHELPER#
+exit 0

=== added file 'debian/gdm.preinst'
--- debian/gdm.preinst	1970-01-01 00:00:00 +0000
+++ debian/gdm.preinst	2011-03-10 14:39:08 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh -e
+
+rm_conffile() {
+  PKGNAME="gdm"
+  CONFFILE="$1"
+
+  if [ -e "$CONFFILE" ]; then
+   md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+   old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+   if [ "$md5sum" != "$old_md5sum" ]; then
+     echo "Obsolete conffile $CONFFILE has been modified by you."
+     echo "Saving as $CONFFILE.dpkg-bak ..."
+     mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+   else
+     echo "Removing obsolete conffile $CONFFILE ..."
+     rm -f "$CONFFILE"
+   fi
+ fi
+}
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ] && \
+    # earlier releases used /etc/gdm/gdm.conf-custom, but upstream uses
+    # custom.conf
+    dpkg --compare-versions "$2" le-nl "2.26.1-0ubuntu5"; then
+    if [ -f /etc/gdm/gdm.conf-custom ]; then
+	echo "Renaming /etc/gdm/gdm.conf-custom to /etc/gdm/custom.conf" >&2
+	mv /etc/gdm/gdm.conf-custom /etc/gdm/custom.conf
+    fi
+
+    # migrate autologin settings
+    if ! egrep -q '^(Automatic|Timed)Login(Enable|Delay|)=' /etc/gdm/custom.conf; then
+	settings="`egrep '^((Automatic|Timed)LoginEnable=[^f])|^((Automatic|Timed)Login=.)|^TimedLoginDelay=[^3]' /etc/gdm/gdm.conf`" || true
+	if [ -n "$settings" ]; then
+	    echo '[daemon]' >> /etc/gdm/custom.conf
+	    echo "$settings" >> /etc/gdm/custom.conf
+	fi
+    fi
+
+    # obsolete conffiles
+    rm_conffile /etc/gdm/gdm.conf
+    rm_conffile /etc/gdm/locale.conf
+    rm_conffile /etc/gdm/gdmprefetchlist
+    rm_conffile /etc/gdm/XKeepsCrashing
+    rm_conffile /etc/gdm/modules/AccessKeyMouseEvents
+    rm_conffile /etc/gdm/modules/factory-AccessKeyMouseEvents
+    rm_conffile /etc/gdm/modules/AccessDwellMouseEvents
+    rm_conffile /etc/gdm/modules/factory-AccessDwellMouseEvents
+fi
+

=== added file 'debian/gdm.prerm'
--- debian/gdm.prerm	1970-01-01 00:00:00 +0000
+++ debian/gdm.prerm	2011-03-10 14:39:08 +0000
@@ -0,0 +1,64 @@
+#!/bin/bash
+# Debian gdm package pre-removal script
+# Copyright 2001 Branden Robinson.
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+set -e
+
+THIS_PACKAGE=gdm
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
+  if [ -e /usr/share/debconf/confmodule ]; then
+    . /usr/share/debconf/confmodule
+    # disown this question
+    db_unregister shared/default-x-display-manager || true
+    # does the question still exist?
+    if db_get shared/default-x-display-manager; then
+      db_metaget shared/default-x-display-manager owners
+      db_subst shared/default-x-display-manager choices "$RET"
+      db_get shared/default-x-display-manager
+      # are we removing the currently selected display manager?
+      if [ "$THIS_PACKAGE" = "$RET" ]; then
+        if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+          db_get "$RET"/daemon_name
+          if [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" = "$RET" ]; then
+            rm "$DEFAULT_DISPLAY_MANAGER_FILE"
+          fi
+        fi
+        # ask the user to choose a new default
+        db_fset shared/default-x-display-manager seen false
+        db_input critical shared/default-x-display-manager || true
+        db_go
+        # if the display manager file doesn't exist, write it with the path
+        # to the new default display manager
+        if [ ! -e $DEFAULT_DISPLAY_MANAGER_FILE ]; then
+          db_get shared/default-x-display-manager
+          echo "Please be sure to run \"dpkg-reconfigure $RET\"."
+          db_get "$RET"/daemon_name
+          echo "$RET" > "$DEFAULT_DISPLAY_MANAGER_FILE"
+        fi
+      fi
+    fi
+  fi
+fi
+
+if [ "$1" = "remove" ]; then
+  if [ -x /etc/init.d/gdm ]; then
+    nostop=
+    for hostname in "" "localhost" "$(hostname)" "$(hostname -f)"; do
+      if echo $DISPLAY | grep -q "^$hostname:0.*"; then
+        nostop=yes
+      fi
+    done
+    if [ -z $nostop ]; then
+      stop gdm || :
+    fi
+  fi
+fi
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/gdm.templates'
--- debian/gdm.templates	1970-01-01 00:00:00 +0000
+++ debian/gdm.templates	2011-03-10 14:39:08 +0000
@@ -0,0 +1,123 @@
+Template: gdm/daemon_name
+Type: string
+Default: /usr/sbin/gdm
+Description: for internal use only
+
+Template: shared/default-x-display-manager
+Type: select
+Choices: ${choices}
+Description: Default display manager:
+ A display manager is a program that provides graphical login capabilities for
+ the X Window System.
+ .
+ Only one display manager can manage a given X server, but multiple display
+ manager packages are installed. Please select which display manager should
+ run by default.
+ .
+ Multiple display managers can run simultaneously if they are configured to
+ manage different servers; to achieve this, configure the display managers
+ accordingly, edit each of their init scripts in /etc/init.d, and disable the
+ check for a default display manager.
+Description-ca.UTF-8: Escolliu el gestor de pantalla:
+ Un gestor de pantalla (display manager) és un programa que proporciona la capacitat d’un quadre gràfic d’entrada (login) a l’X Window System.
+ .
+ Només un gestor de pantalla pot gestionar un servidor X determinat, però teniu instaŀlats diversos paquets de gestor de pantalla.  Per favor, escolliu quin gestor de pantalla s'executarà per defecte.
+ .
+ Poden haver diversos gestors de pantalla corrent simultàniament si es configuren per a gestionar diferents servidors; per a aconseguir açò, configureu adequadament els gestors de pantalla, editeu cadascun dels seus scripts d’inici en «/etc/init.d», i deshabiliteu la comprovació de gestor de pantalla per defecte.
+Description-cs.UTF-8: Výchozí správce obrazovky:
+ Správce obrazovky je program, který nabízí grafické přihlášení do systému X Window.
+ .
+ Je nainstalováno několik správců obrazovky, ale jen jeden může obsluhovat daný X server. Vyberte, který správce se má spouštět jako výchozí.
+ .
+ Více správců obrazovky může běžet zároveň pouze pokud spravují různé servery. Pro dosažení takového nastavení je musíte správně nakonfigurovat, upravit jejich spouštěcí skripty v /etc/init.d a zakázat kontrolu výchozího správce obrazovky.
+Description-de.UTF-8: Standardmäßiger Display-Manager:
+ Ein Display-Manager ist ein Programm, welches grafische Anmeldemöglichkeiten für das X Window System zur Verfügung stellt.
+ .
+ Nur ein einziger Display-Manager kann einen gegebenen X-Server verwalten, es sind allerdings mehrere Display-Manager installiert. Bitte wählen Sie den Display-Manager aus, der standardmäßig ausgeführt werden soll.
+ .
+ Es können mehrere Display-Manager gleichzeitig laufen, wenn diese so konfiguriert sind, dass sie verschiedene X-Server verwalten. Um dies zu erreichen, konfigurieren Sie die Display-Manager entsprechend, editieren Sie jedes ihrer Init-Skripte in /etc/init.d, und schalten Sie die Überprüfung auf einen Standard-Display-Manager ab.
+Description-eu.UTF-8: Lehenetsiriko pantaila kudeatzailea:
+ Pantaila kudeatzailea X Leiho Sistemarako saio hasiera grafiko aukera ematen duen programa bat da.
+ .
+ Jakindako X zerbitzari bat pantaila kudeatzaile batek bakarrik kudea dezake, baina pantaila kudeatzaile anitz daude instalaturik.  Hautatu zein pantaila kudeatzaile erabili nahi duzun lehenetsi bezala.
+ .
+ Pantaila kudeatzaile anitz batera martxan egon daitezke, zerbitzari ezberdinak kudeatzeko konfiguraturik badaude; hau lortzeko, pantaila kudeatzaileak behar bezala konfiguratu eta /etc/init.d-eko init script-ean lehenetsiriko pantaila kudeatzailea arakatzeko aukera ezgaitu.
+Description-fr.UTF-8: Gestionnaire graphique de session par défaut :
+ Un gestionnaire graphique de session est un programme qui permet de se connecter depuis le système X Window.
+ .
+ Un seul gestionnaire graphique de session peut s'occuper d'un serveur X donné, bien que plusieurs gestionnaires puissent être installés simultanément. Veuillez choisir celui qui sera utilisé par défaut.
+ .
+ Plusieurs gestionnaires graphiques peuvent être lancés en même temps, s'ils gèrent des serveurs X différents ; pour cela, configurez correctement chacun des gestionnaires graphiques, modifiez leurs scripts de lancement dans /etc/init.d, et désactivez le test de gestionnaire graphique par défaut.
+Description-gl.UTF-8: Xestor de pantalla por defecto:
+ Un xestor de pantalla é un programa que fornece capacidades de inicio de sesión gráfico para o sistema X Window.
+ .
+ Só un xestor de pantalla pode xestionar un servidor X determinado, pero hai varios paquetes de xestores de pantalla instalados. Escolla o xestor de pantalla que se debería executar por defecto.
+ .
+ Pódense executar varios xestores de pantalla ao mesmo tempo se se configuran para xestionar servidores distintos; para facelo, configure os xestores de pantalla, edite cada un dos scripts de inicio de /etc/init.d e desactive a comprobación do xestor de pantalla por defecto.
+Description-it.UTF-8: Display manager predefinito.
+ Un display manager è un programma che fornisce capacità di login grafico per il sistema X Window.
+ .
+ Solo un display manager può gestire un dato server X, ma sono installati più pacchetti di display manager. Scegliere il display manager da usare come predefinito.
+ .
+ Possono essere eseguiti più display manager contemporaneamente, a patto che siano impostati per gestire server diversi; per fare questo, configurare i display manager in maniera appropriata, modificare ciascuno dei loro script di avvio in /etc/init.d e disabilitare il controllo per un display manager predefinito.
+Description-ja.UTF-8: デフォルトのディスプレイマネージャ:
+ ディスプレイマネージャとは、X Window System 上でのグラフィカルなログイン機能を提供するものです。
+ .
+ ひとつの X サーバを管理できるのはひとつのディスプレイマネージャだけですが、ディスプレイマネージャパッケージが複数インストールされています。どのディスプレイマネージャをデフォルトで起動させるか選択して下さい。
+ .
+ 異なるサーバを担当するように設定すれば、複数のディスプレイサーバは同時に動作できます。そのようにするには、/etc/init.d にある各ディスプレイマネージャの初期化スクリプトを編集し、デフォルトディスプレイマネージャのチェックを無効にして下さい。
+Description-ml.UTF-8: ഡിഫാള്‍ട്ടായി വേണ്ട പ്രദര്‍ശന മാനേജര്‍:
+ എക്സ് ജാലക സിസ്റ്റത്തിന് ഗ്രാഫിക്കലായി അകത്ത് കടക്കാനുള്ള കഴിവുകള്‍ നല്കുന്ന ഒരു പ്രോഗ്രാമാണ് ഒരു പ്രദര്‍ശന മാനേജര്‍.
+ .
+ ഏതെങ്കിലും ഒരു എക്സ് സേവകനെ ഒരേ ഒരു പ്രദര്‍ശന മാനേജര്‍‌ക്കേ മാനേജ് ചെയ്യാന്‍ പറ്റൂ, പക്ഷേ ഒന്നിലധികം പ്രദര്‍ശന മാനേജര്‍ പാക്കേജുകള്‍ ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടുണ്ട്. ദയവായി ഡിഫാള്‍ട്ടായി പ്രവര്‍ത്തിപ്പിക്കേണ്ട പ്രദര്‍ശന മാനേജര്‍ ഏതാണെന്ന് തിരഞ്ഞെടുക്കുക.
+ .
+ വ്യത്യസ്ത സേവകന്‍മാരെ മാനേജ് ചെയ്യാനായി ക്രമീകരിച്ചിട്ടുണ്ടെങ്കില്‍ ഒന്നിലധികം പ്രദര്‍ശന മാനേജര്‍മാര്‍ക്ക് ഒരേ സമയം പ്രവര്‍ത്തിക്കാം; ഇത് കൈവരിക്കണമെങ്കില്‍, പ്രദര്‍ശന മാനേജര്‍മാരെ അനുസൃതമായി ക്രമീകരിക്കുകയും, അവയോരോന്നിന്റേയും /etc/init.d യിലുള്ള ഇനിറ്റ് സ്ക്രിപ്റ്റുകളെ മാറ്റുകയും, ഡിഫാള്‍ട്ട് പ്രദര്‍ശന മാനേജര്‍ക്കായുള്ള പരിശോദന ഡിസേബിള്‍ ചെയ്യുകയും ചെയ്യുക.
+Description-nl.UTF-8: Standaard beeldschermbeheerder:
+ Een beeldschermbeheerder is een programma waarmee u zich grafisch op het systeem kunt aanmelden, waarna u in de grafische omgeving (het X Window System) terecht komt.
+ .
+ Elke X-server kan door slechts één beeldschermbeheerder beheerd worden, hoewel er meerdere beeldschermbeheerders geïnstalleerd kunnen zijn. Welke beeldschermbeheerder dient standaard gebruikt te worden?
+ .
+ Het is mogelijk om meerdere beeldschermbeheerders tegelijk te draaien zolang deze verschillende servers beheren. Om dat te bereiken dient u de beeldschermbeheerders overeenkomstig in te stellen door in hun init-scripts (in /etc/init.d) de controle of ze de standaard beeldschermbeheerder zijn uit te schakelen.
+Description-pt.UTF-8: Seleccione o gestor de ecrã por omissão desejado.
+ Um gestor de ecrã é um programa que fornece capacidades de autenticação gráfica ao X Window System.
+ .
+ Apenas um único gestor de ecrã pode gerir um dado servidor X, mas estão instalados múltiplos pacotes de gestores de ecrã.  Por favor seleccione qual o gestor de ecrã que deve ser executado por omissão.
+ .
+ Podem ser executados em simultâneo múltiplos gestores de écran se estes estiverem configurados para gerir diferentes servidores; para fazer isto, configure os gestores de ecrã de acordo, edite cada um dos seus scripts "init" em /etc/init.d, e desligue a verificação de um gestor de écran de omissão.
+Description-pt_BR.UTF-8: Gerenciador de sessão padrão:
+ Um gerenciador de sessão é um programa que provê capacidades de login gráfico para o 'X Window System'.
+ .
+ Somente um gerenciador de sessão pode gerenciar um dado servidor X, mas diversos pacotes de gerenciadores de sessão estão instalados. Por favor selecione qual gerenciador de sessão deverá ser executado por padrão.
+ .
+ Múltiplos gerenciadores de sessão podem ser executados simultaneamente se eles estão configurados para gerenciar servidores diferentes; para conseguir isso, configure os gerenciadores de sessão apropriadamente, edite cada um dos seus scripts de inicialização em /etc/init.d, e desabilite a checagem por um gerenciador de sessão padrão.
+Description-ru.UTF-8: Менеджер дисплеев по умолчанию:
+ Менеджер дисплеев -- это программа, которая обеспечивает возможность графического входа в систему для X Window System.
+ .
+ Данный X-сервер может обслуживать только один менеджер дисплеев, но установлено несколько пакетов менеджеров дисплеев. Пожалуйста, выберите менеджер дисплеев, который должен запускаться по умолчанию.
+ .
+ Несколько менеджеров дисплеев могут запускаться одновременно, если они настроены на обслуживание разных серверов; чтобы добиться этого,  настройте менеджеры дисплеев соответственно, отредактируйте их сценарии инициализации в /etc/init.d и отключите проверку менеджера дисплеев по умолчанию.
+Description-sk.UTF-8: Zvoľte predvoleného správcu obrazovky:
+ Správca obrazovky je program, ktorý ponúka grafické prihlásenie do systému X Window.
+ .
+ Máte nainštalovaných viac správcov obrazovky, ale iba jeden môže obsluhovať daný X server. Zvoľte si správcu, ktorý bude predvolený.
+ .
+ Súbežne môže byť spustených viac správcov obrazovky, ale iba v prípade viacero rozdielnych serverov. Pre dosiahnutie takéhoto nastavenia ich musíte správne nastaviť, upraviť ich spúšťacie skripty v /etc/init.d a zakázať kontrolu predvoleného správcu obrazovky.
+Description-sv.UTF-8: Standarddisplayhanterare:
+ En displayhanterare är det program som tillhandahåller grafiska inloggningsmöjligheter i X Window System.
+ .
+ Endast en displayhanterare kan hantera en angiven X-server, men flera displayhanterarpaket kan vara installerade. Välj vilken displayhanterare som skall köras som standard.
+ .
+ Flera displayhanterare kan köras samtidigt om de är konfigurerade att hantera olika servrar. För att uppnå detta ska du konfigurera displayhanterarnas init-skript under /etc/init.d, och inaktivera kontrollen efter en standarddisplayhanterare.
+Description-ta.UTF-8: முன்னிருப்பு காட்சி மேலாளர்:
+ காட்சி மேலாளர் என்பது வரைகலை உள்நுழைவு இயலுமையை எக்ஸ் விண்டோஸ் அமைப்புக்கு தரும் நிரலாகும்.
+ .
+ ஒரு கொடுக்கப் பட்ட X சேவையகத்தில் ஒரு காட்சி மேலாளர்தான் மேலாள இயலும். ஆனால் பல காட்சி மேலாளர்கள் நிறுவப் பட்டுள்ளன. எது முன்னிருப்பாக இருக்க வேண்டும் என தேர்ந்தெடுங்கள்
+ .
+ வெவ்வேறு சேவையகங்களை மேலாள வடிவமைத்தால் பல காட்சி மேலாளர்கள் ஒரே நேரத்தில் இயங்கக் கூடும். இதை செய்ய காட்சி மேலாளர்களை தகுந்தாற் போல வடிவமையுங்கள். அவற்றின் இனிட் சிறு நிரல்களை /etc/init.d இல் திருத்துங்கள். முன்னிருப்பு காட்சி மேலாளர் தேர்வை செயலிழக்கச் செய்யவும்.
+Description-zh_CN.UTF-8: 默认显示管理器：
+ 显示管理器是为 X 窗口系统提供图形界面登录模式的程序。
+ .
+ 一个给定的 X 服务器只能由一个显示管理器来管理，但是系统中已经安装了多个显示管理器软件包。请选择一个作为默认的显示管理器。
+ .
+ 如果多个显示管理器被配置为分别管理不同的 X 服务器，那么它们可以同时运行。要做到这一点，您要按照需求分别对各显示管理器进行设置，编辑它们在 /etc/init.d 目录下的 init 脚本，并且关闭对默认显示管理器的检查。
+

=== added file 'debian/gdm.upstart'
--- debian/gdm.upstart	1970-01-01 00:00:00 +0000
+++ debian/gdm.upstart	2011-03-10 14:39:08 +0000
@@ -0,0 +1,49 @@
+# gdm - GNOME Display Manager
+#
+# The display manager service manages the X servers running on the
+# system, providing login and auto-login services
+
+description	"GNOME Display Manager"
+author		"William Jon McCann <[e-mail]>"
+
+start on ((filesystem
+            and (started dbus
+            and (drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
+            or stopped udevtrigger)))
+          or runlevel PREVLEVEL=S)
+
+stop on runlevel [016]
+
+emits login-session-start
+emits desktop-session-start
+
+env XORGCONFIG=/etc/X11/xorg.conf
+
+script
+    if [ -n "$UPSTART_EVENTS" ]
+    then
+	[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/gdm" ] || { stop; exit 0; }
+
+        set -- `runlevel`
+        prev=$1
+        curr=$2
+
+        if [ "$curr" = S -o "$prev" = unknown ]
+        then
+            # Single-user mode
+            plymouth quit || :
+            exit 0
+        fi
+    fi
+
+    if [ -r /etc/default/locale ]; then
+	. /etc/default/locale
+	export LANG LANGUAGE
+    elif [ -r /etc/environment ]; then
+	. /etc/environment
+	export LANG LANGUAGE
+    fi
+    export XORGCONFIG
+
+    exec gdm-binary $CONFIG_FILE
+end script

=== added file 'debian/onboard.desktop'
--- debian/onboard.desktop	1970-01-01 00:00:00 +0000
+++ debian/onboard.desktop	2011-03-10 14:39:08 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Onboard Onscreen Keyboard
+Comment=Type without using a hardware keyboard
+TryExec=onboard
+Exec=onboard --size 500x180 -x 20 -y 10
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Accessibility;
+AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled
+X-Ubuntu-Gettext-Domain=gdm

=== added directory 'debian/patches'
=== added file 'debian/patches/02_x_server_location.patch'
--- debian/patches/02_x_server_location.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_x_server_location.patch	2011-03-10 14:39:08 +0000
@@ -0,0 +1,21 @@
+Description: Change the default X server location to /usr/bin/X. This avoids having to build-depend on xserver-xorg.
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=588848
+
+Index: gdm-2.32.0/configure.ac
+===================================================================
+--- gdm-2.32.0.orig/configure.ac	2010-09-27 19:05:57.000000000 +0200
++++ gdm-2.32.0/configure.ac	2010-12-07 15:03:45.297502001 +0100
+@@ -1161,12 +1161,9 @@
+    X_SERVER="/usr/bin/X"
+    X_CONFIG_OPTIONS="-audit 0"
+ else
+-   # what to do, what to do, this is wrong, but this just sets the
+-   # defaults, perhaps this user is cross compiling or some such
+-   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
++   X_PATH="/usr/bin"
+    X_SERVER_PATH="/usr/bin"
+    X_SERVER="/usr/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
+ fi
+ 
+ dnl ---------------------------------------------------------------------------

=== added file 'debian/patches/04_fix_external_program_directories.patch'
--- debian/patches/04_fix_external_program_directories.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_fix_external_program_directories.patch	2011-03-10 14:39:08 +0000
@@ -0,0 +1,54 @@
+Description: Fix location of external programs.
+
+Index: gdm-2.30.4/daemon/gdm-server.c
+===================================================================
+--- gdm-2.30.4.orig/daemon/gdm-server.c	2010-06-30 12:29:43.000000000 +0200
++++ gdm-2.30.4/daemon/gdm-server.c	2010-06-30 12:30:03.000000000 +0200
+@@ -131,7 +131,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 ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
+                                    server->priv->display_name);
+ 
+         g_debug ("GdmServer: Running helper %s", command);
+Index: gdm-2.30.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+===================================================================
+--- gdm-2.30.4.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-06-30 12:29:43.000000000 +0200
++++ gdm-2.30.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-06-30 12:30:03.000000000 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Type=Application
+ _Name=GNOME Settings Daemon
+-TryExec=@LIBEXECDIR@/gnome-settings-daemon
+-Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
++TryExec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon
++Exec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
+ OnlyShowIn=GNOME;
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-Autostart-Notify=true
+Index: gdm-2.30.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
+===================================================================
+--- gdm-2.30.4.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-06-16 18:32:38.000000000 +0200
++++ gdm-2.30.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-06-30 12:30:03.000000000 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+ Type=Application
+ _Name=PolicyKit Authentication Agent
+-Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
++Exec=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
+ OnlyShowIn=GNOME;
+Index: gdm-2.30.4/gui/simple-chooser/gdm-chooser-session.c
+===================================================================
+--- gdm-2.30.4.orig/gui/simple-chooser/gdm-chooser-session.c	2010-06-30 12:29:43.000000000 +0200
++++ gdm-2.30.4/gui/simple-chooser/gdm-chooser-session.c	2010-06-30 12:30:03.000000000 +0200
+@@ -131,7 +131,7 @@
+         ret = FALSE;
+ 
+         error = NULL;
+-        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
++        g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
+         if (error != NULL) {
+                 g_warning ("Error starting settings daemon: %s", error->message);
+                 g_error_free (error);

=== added file 'debian/patches/05_initial_server_on_vt7.patch'
--- debian/patches/05_initial_server_on_vt7.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05_initial_server_on_vt7.patch	2011-03-10 14:39:08 +0000
@@ -0,0 +1,38 @@
+Description: Force initial X server to go to tty7 instead of tty1. This is an Ugly Hack until we have a cleaner solution for getty not to tramp over a running X server on vt1.
+Author: Martin Pitt <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/396226
+
+Index: gdm-2.30.4/daemon/gdm-server.c
+===================================================================
+--- gdm-2.30.4.orig/daemon/gdm-server.c	2010-06-30 12:30:03.000000000 +0200
++++ gdm-2.30.4/daemon/gdm-server.c	2010-06-30 12:30:07.000000000 +0200
+@@ -640,6 +640,13 @@
+         g_debug ("GdmServer: Starting X server process: %s", freeme);
+         g_free (freeme);
+ 
++	/* write a stamp file, so that the first startup of the server can be
++	 * special-cased (initial server needs to go on vt7, since 1 to 6
++	 * usually get gettys after gdm startup, which interfere with X) */
++        int f = open ("/var/run/gdm/firstserver.stamp", O_CREAT|O_WRONLY|O_EXCL, 0666);
++        if (f >= 0)
++                close (f);
++
+         error = NULL;
+         ret = g_spawn_async_with_pipes (NULL,
+                                         argv,
+@@ -684,9 +691,14 @@
+ gdm_server_start (GdmServer *server)
+ {
+         gboolean res;
++        int firstserver;
++
++        /* 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;
+ 
+         /* fork X server process */
+-        res = gdm_server_spawn (server, NULL);
++        res = gdm_server_spawn (server, firstserver ? "vt7" : NULL);
+ 
+         return res;
+ }

=== added file 'debian/patches/06_run_xsession.d.patch'
--- debian/patches/06_run_xsession.d.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/06_run_xsession.d.patch	2011-03-10 14:39:08 +0000
@@ -0,0 +1,28 @@
+Description: Run /etc/X11/Xsession.d/.
+Author: Martin Pitt <[e-mail]>
+Origin: Ubuntu; /etc/X11/Xsession.d is a Debianism/Ubuntuism
+
+Index: gdm-2.32.0/data/Xsession.in
+===================================================================
+--- gdm-2.32.0.orig/data/Xsession.in	2010-08-27 23:45:29.000000000 +0200
++++ gdm-2.32.0/data/Xsession.in	2010-12-07 15:10:12.177502001 +0100
+@@ -162,6 +162,19 @@
+     done
+ fi
+ 
++# run /etc/X11/Xsession.d/
++OPTIONFILE=/etc/X11/Xsession.options
++USERXSESSION=$HOME/.xsession
++USERXSESSIONRC=$HOME/.xsessionrc
++ALTUSERXSESSION=$HOME/.Xsession
++if [ -d /etc/X11/Xsession.d ]; then
++    for i in `ls /etc/X11/Xsession.d/` ; do
++        if [ -r "/etc/X11/Xsession.d/$i"  -a -f "/etc/X11/Xsession.d/$i" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
++	    . "/etc/X11/Xsession.d/$i"
++        fi
++    done
++fi
++
+ if [ "x$command" = "xcustom" ] ; then
+   if [ -x "$HOME/.xsession" ]; then
+     command="$HOME/.xsession"

=== added file 'debian/patches/08_use_polkit_for_settings.patch'
--- debian/patches/08_use_polkit_for_settings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/08_use_polkit_for_settings.patch	2011-03-10 14:39:08 +0000
@@ -0,0 +1,337 @@
+Description: Add PolicyKit support to GDM settings D-Bus interface
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=587750
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299
+
+Index: gdm-2.32.0/common/gdm-settings.c
+===================================================================
+--- gdm-2.32.0.orig/common/gdm-settings.c	2010-08-27 16:54:37.000000000 +0200
++++ gdm-2.32.0/common/gdm-settings.c	2010-12-07 15:34:08.167502002 +0100
+@@ -36,6 +36,7 @@
+ #define DBUS_API_SUBJECT_TO_CHANGE
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
++#include <polkit/polkit.h>
+ 
+ #include "gdm-settings.h"
+ #include "gdm-settings-glue.h"
+@@ -110,6 +111,90 @@
+         return res;
+ }
+ 
++static void
++unlock_auth_cb (PolkitAuthority *authority,
++                GAsyncResult *result,
++                DBusGMethodInvocation *context)
++{
++        PolkitAuthorizationResult *auth_result;
++        GError  *error = NULL;
++
++        auth_result = polkit_authority_check_authorization_finish (authority, result, &error);
++
++        if (!auth_result)
++                dbus_g_method_return_error (context, error);
++        else {
++                dbus_g_method_return (context,
++                                      polkit_authorization_result_get_is_authorized (auth_result));
++        }
++    
++        if (auth_result)
++                g_object_unref (auth_result);
++        if (error)
++                g_error_free (error);
++}
++
++gboolean
++gdm_settings_unlock (GdmSettings *settings,
++                     DBusGMethodInvocation *context)
++{
++        polkit_authority_check_authorization (polkit_authority_get (),
++                                              polkit_system_bus_name_new (dbus_g_method_get_sender (context)),
++                                              "org.gnome.displaymanager.settings.write",
++                                              NULL,
++                                              POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++                                              NULL,
++                                              (GAsyncReadyCallback) unlock_auth_cb,
++                                              context);
++}
++
++typedef struct
++{
++        GdmSettings *settings;
++        DBusGMethodInvocation *context;
++        gchar *key, *value;
++} SetValueData;
++
++static void
++set_value_auth_cb (PolkitAuthority *authority,
++                   GAsyncResult *result,
++                   SetValueData *data)
++{
++        PolkitAuthorizationResult *auth_result;
++        GError  *error = NULL;
++
++        auth_result = polkit_authority_check_authorization_finish (authority, result, &error);
++
++        if (!auth_result)
++                dbus_g_method_return_error (data->context, error);
++        else {
++                if (polkit_authorization_result_get_is_authorized (auth_result)) {
++                        gboolean result;
++                    
++                        result = gdm_settings_backend_set_value (data->settings->priv->backend,
++                                                                 data->key,
++                                                                 data->value,
++                                                                 &error);
++                        if (result)
++                                dbus_g_method_return (data->context);
++                        else
++                                dbus_g_method_return_error (data->context, error);
++                }
++                else {
++                        error = g_error_new (DBUS_GERROR_REMOTE_EXCEPTION, 0, "Not authorized");
++                        dbus_g_method_return_error (data->context, error);
++                }
++        }
++    
++        if (auth_result)
++                g_object_unref (auth_result);
++        if (error)
++                g_error_free (error);
++        g_free (data->key);
++        g_free (data->value);
++        g_free (data);
++}
++
+ /*
+ dbus-send --system --print-reply --dest=org.gnome.DisplayManager /org/gnome/DisplayManager/Settings org.gnome.DisplayManager.Settings.SetValue string:"xdmcp/Enable" string:"false"
+ */
+@@ -118,26 +203,30 @@
+ gdm_settings_set_value (GdmSettings *settings,
+                         const char  *key,
+                         const char  *value,
+-                        GError     **error)
++                        DBusGMethodInvocation *context)
+ {
+-        GError  *local_error;
+-        gboolean res;
+-
++        SetValueData *data;
++    
+         g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE);
+         g_return_val_if_fail (key != NULL, FALSE);
+ 
+         g_debug ("Setting value %s", key);
+-
+-        local_error = NULL;
+-        res = gdm_settings_backend_set_value (settings->priv->backend,
+-                                              key,
+-                                              value,
+-                                              &local_error);
+-        if (! res) {
+-                g_propagate_error (error, local_error);
+-        }
+-
+-        return res;
++    
++        /* Authorize with PolicyKit */
++        data = g_malloc (sizeof(SetValueData));
++        data->settings = settings;
++        data->context = context;
++        data->key = g_strdup(key);
++        data->value = g_strdup(value);    
++        polkit_authority_check_authorization (polkit_authority_get (),
++                                              polkit_system_bus_name_new (dbus_g_method_get_sender (context)),
++                                              "org.gnome.displaymanager.settings.write",
++                                              NULL,
++                                              POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++                                              NULL,
++                                              (GAsyncReadyCallback) set_value_auth_cb,
++                                              data);
++        return TRUE;
+ }
+ 
+ static gboolean
+Index: gdm-2.32.0/common/gdm-settings.h
+===================================================================
+--- gdm-2.32.0.orig/common/gdm-settings.h	2010-08-27 16:54:37.000000000 +0200
++++ gdm-2.32.0/common/gdm-settings.h	2010-12-07 15:34:08.177502002 +0100
+@@ -23,6 +23,7 @@
+ #define __GDM_SETTINGS_H
+ 
+ #include <glib-object.h>
++#include <dbus/dbus-glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+@@ -70,10 +71,12 @@
+                                                                  const char  *key,
+                                                                  char       **value,
+                                                                  GError     **error);
++gboolean            gdm_settings_unlock                         (GdmSettings *settings,
++                                                                 DBusGMethodInvocation *context);
+ gboolean            gdm_settings_set_value                      (GdmSettings *settings,
+                                                                  const char  *key,
+                                                                  const char  *value,
+-                                                                 GError     **error);
++                                                                 DBusGMethodInvocation *context);
+ 
+ G_END_DECLS
+ 
+Index: gdm-2.32.0/common/gdm-settings.xml
+===================================================================
+--- gdm-2.32.0.orig/common/gdm-settings.xml	2010-08-27 16:54:37.000000000 +0200
++++ gdm-2.32.0/common/gdm-settings.xml	2010-12-07 15:34:08.177502002 +0100
+@@ -5,7 +5,12 @@
+       <arg name="key" direction="in" type="s"/>
+       <arg name="value" direction="out" type="s"/>
+     </method>
++    <method name="Unlock">
++      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
++      <arg name="is_unlocked" direction="out" type="b"/>
++    </method>
+     <method name="SetValue">
++      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+       <arg name="key" direction="in" type="s"/>
+       <arg name="value" direction="in" type="s"/>
+     </method>
+Index: gdm-2.32.0/configure.ac
+===================================================================
+--- gdm-2.32.0.orig/configure.ac	2010-12-07 15:34:08.047502002 +0100
++++ gdm-2.32.0/configure.ac	2010-12-07 15:34:08.177502002 +0100
+@@ -40,6 +40,7 @@
+ dnl ---------------------------------------------------------------------------
+ 
+ DBUS_GLIB_REQUIRED_VERSION=0.74
++POLKIT_GOBJECT_REQUIRED_VERSION=0.92
+ GLIB_REQUIRED_VERSION=2.22.0
+ GTK_REQUIRED_VERSION=2.20.0
+ PANGO_REQUIRED_VERSION=1.3.0
+@@ -60,6 +61,7 @@
+ 
+ PKG_CHECK_MODULES(COMMON,
+         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++        polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+         gobject-2.0 >= $GLIB_REQUIRED_VERSION
+         gio-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+@@ -68,6 +70,7 @@
+ 
+ PKG_CHECK_MODULES(DAEMON,
+         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++        polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION
+         gobject-2.0 >= $GLIB_REQUIRED_VERSION
+         gio-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+Index: gdm-2.32.0/data/gdm.conf.in
+===================================================================
+--- gdm-2.32.0.orig/data/gdm.conf.in	2010-09-15 20:58:11.000000000 +0200
++++ gdm-2.32.0/data/gdm.conf.in	2010-12-07 15:34:08.177502002 +0100
+@@ -34,8 +34,6 @@
+     <deny send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
+     <deny send_destination="org.gnome.DisplayManager"
+-          send_interface="org.gnome.DisplayManager.Settings"/>
+-    <deny send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Slave"/>
+     <deny send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Session"/>
+@@ -44,6 +42,10 @@
+     <allow send_destination="org.gnome.DisplayManager"
+            send_interface="org.freedesktop.DBus.Introspectable"/>
+ 
++    <!-- Controlled by PolicyKit -->
++    <allow send_destination="org.gnome.DisplayManager"
++           send_interface="org.gnome.DisplayManager.Settings"/>
++
+     <allow send_destination="org.gnome.DisplayManager"
+            send_interface="org.gnome.DisplayManager.Display"
+            send_member="GetId"/>
+Index: gdm-2.32.0/data/gdm.policy.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.32.0/data/gdm.policy.in	2010-12-07 15:34:08.000000000 +0100
+@@ -0,0 +1,18 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE policyconfig PUBLIC
++ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
++ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
++<policyconfig>
++  <vendor>The GNOME Project</vendor>
++  <vendor_url>http://www.gnome.org/</vendor_url>
++  <icon_name>gdm</icon_name>
++
++  <action id="org.gnome.displaymanager.settings.write">
++    <_description>Change login screen configuration</_description>
++    <_message>Privileges are required to change the login screen configuration.</_message>
++    <defaults>
++      <allow_inactive>no</allow_inactive>
++      <allow_active>auth_admin_keep</allow_active>
++    </defaults>
++  </action>
++</policyconfig>
+Index: gdm-2.32.0/data/Makefile.am
+===================================================================
+--- gdm-2.32.0.orig/data/Makefile.am	2010-09-16 01:44:56.000000000 +0200
++++ gdm-2.32.0/data/Makefile.am	2010-12-07 15:34:08.177502002 +0100
+@@ -46,6 +46,8 @@
+ schemas_in_files = gdm.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+ 
++@INTLTOOL_POLICY_RULE@
++
+ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
+ 	sed	-e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
+ 		-e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
+@@ -78,11 +80,18 @@
+ localealiasdir = $(datadir)/gdm
+ localealias_DATA = locale.alias
+ 
++polkitdir = $(datadir)/polkit-1/actions
++polkit_in_files = gdm.policy.in
++polkit_DATA = $(polkit_in_files:.policy.in=.policy)
++check:
++	$(POLKIT_POLICY_FILE_VALIDATE) $(polkit_DATA)
++
+ EXTRA_DIST =			\
+ 	$(schemas_in_files)	\
+ 	$(schemas_DATA)		\
+ 	$(dbusconf_in_files)	\
+ 	$(localealias_DATA)	\
++	$(polkit_in_files)	\
+ 	gdm.schemas.in.in	\
+ 	gdm.conf-custom.in 	\
+ 	Xsession.in 		\
+@@ -105,7 +114,8 @@
+ 	$(NULL)
+ 
+ DISTCLEANFILES =			\
+-	$(dbusconf_DATA)			\
++	$(dbusconf_DATA)		\
++	$(polkit_DATA)	 		\
+ 	gdm.schemas			\
+ 	$(NULL)
+ 
+Index: gdm-2.32.0/po/POTFILES.in
+===================================================================
+--- gdm-2.32.0.orig/po/POTFILES.in	2010-09-15 20:58:11.000000000 +0200
++++ gdm-2.32.0/po/POTFILES.in	2010-12-07 15:34:08.177502002 +0100
+@@ -49,6 +49,7 @@
+ daemon/simple-slave-main.c
+ daemon/test-session.c
+ daemon/xdmcp-chooser-slave-main.c
++data/gdm.policy.in
+ data/gdm.schemas.in.in
+ data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
+ data/greeter-autostart/gdm-simple-greeter.desktop.in.in
+Index: gdm-2.32.0/common/Makefile.am
+===================================================================
+--- gdm-2.32.0.orig/common/Makefile.am	2010-12-07 15:34:17.347502002 +0100
++++ gdm-2.32.0/common/Makefile.am	2010-12-07 15:34:42.007502002 +0100
+@@ -112,6 +112,7 @@
+ 	$(NULL)
+ 
+ libgdmcommon_la_LIBADD =		\
++	$(COMMON_LIBS)			\
+ 	$(NULL)
+ 
+ libgdmcommon_la_LDFLAGS = 	\

=== added file 'debian/patches/09_gdmserver_gconf_settings.patch'
--- debian/patches/09_gdmserver_gconf_settings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/09_gdmserver_gconf_settings.patch	2011-03-10 14:39:08 +0000
@@ -0,0 +1,469 @@
+Index: gdm-2.30.4/common/gdm-settings.c
+===================================================================
+--- gdm-2.30.4.orig/common/gdm-settings.c	2010-06-30 12:35:02.000000000 +0200
++++ gdm-2.30.4/common/gdm-settings.c	2010-06-30 12:35:06.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <signal.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <pwd.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -49,6 +50,9 @@
+ #define GDM_SETTINGS_DBUS_PATH GDM_DBUS_PATH "/Settings"
+ #define GDM_SETTINGS_DBUS_NAME "org.gnome.DisplayManager.Settings"
+ 
++#define GCONF_SOUND_EVENT_KEY "/desktop/gnome/sound/event_sounds"
++#define GCONF_FACE_BROWSER_DISABLE_KEY "/apps/gdm/simple-greeter/disable_user_list"
++
+ #define GDM_SETTINGS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SETTINGS, GdmSettingsPrivate))
+ 
+ struct GdmSettingsPrivate
+@@ -83,6 +87,190 @@
+         return ret;
+ }
+ 
++static void
++set_gdm_uid_child_setup ()
++{
++        struct passwd *pwent;
++        uid_t  gdm_uid;
++        uid_t  gdm_gid;
++
++        pwent = getpwnam (GDM_USERNAME);
++        // --shutdown take into account the resuid/resgid and HOME whereas
++        // --get --set take the euid/egid
++        setenv("HOME", pwent->pw_dir, 1);
++        gdm_uid = pwent->pw_uid;
++        gdm_gid = pwent->pw_gid;
++        setresgid (gdm_gid, gdm_gid, gdm_gid);
++        setresuid (gdm_uid, gdm_uid, gdm_uid);
++
++}
++
++static gboolean
++gdm_settings_get_gconf_value (gchar *gconf_key, gchar **value) {
++
++        GError  *error = NULL;
++        char    *shutdown_command[] = { "gconftool-2", "--shutdown", NULL };
++        char    *get_command[]  =  { "gconftool-2", "--direct", "-g", gconf_key, "--config-source", NULL, NULL };
++        gboolean res;
++        struct passwd *pwent;
++        gboolean success = FALSE;
++
++        pwent = getpwnam (GDM_USERNAME);
++        if G_UNLIKELY (pwent == NULL)
++                g_warning ("Can't access to 'gdm' user name in passwd");
++        else {
++                get_command[5] = g_strdup_printf("xml:readwrite:%s/.gconf", pwent->pw_dir);
++                res = g_spawn_sync (NULL,
++                                    shutdown_command,
++                                    NULL,
++                                    G_SPAWN_SEARCH_PATH,
++                                    (GSpawnChildSetupFunc)set_gdm_uid_child_setup,
++                                    NULL,
++                                    NULL,
++                                    NULL,
++                                    NULL,
++                                    &error);
++                if (!res) {
++                        if (error != NULL) {
++                                g_warning ("Unable to shutdown gconf: %s", error->message);
++                                g_error_free (error);
++                        }
++                        else
++                                g_warning ("Unable to shutdown gconf: unknown error");
++                }
++                else {
++                        res = g_spawn_sync (NULL,
++                                            get_command,
++                                            NULL,
++                                            G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
++                                            (GSpawnChildSetupFunc)set_gdm_uid_child_setup,
++                                            NULL,
++                                            value,
++                                            NULL,
++                                            NULL,
++                                            &error);
++                        if (!res) {
++                                 if (error != NULL) {
++                                         g_warning ("Unable to get event key to gconf: %s", error->message);
++                                         g_error_free (error);
++                                 }
++                                else
++                                         g_warning ("Unable to get event key to gconf: unknown error");
++                         }
++                        else {
++                                 if (error != NULL) {
++                                         g_warning ("Unable to get event key to gconf: %s", error->message);
++                                         g_error_free (error);
++                                 }
++                                 else {
++                                         g_debug ("gconftool call returning: %s", *value);
++                                         success = TRUE;
++                                 }
++                        }
++                }
++        }
++
++        return success;
++}
++
++
++
++static gboolean
++gdm_settings_get_bool_gconf_value (gchar *gconf_key, gboolean *enabled) {
++
++        gchar *value = NULL;
++        gboolean result = FALSE;
++
++        if (gdm_settings_get_gconf_value(gconf_key, &value)) {
++                result = TRUE;
++                if (strstr(value, "false") != NULL)
++                        *enabled = FALSE;
++                else if (strstr(value, "true") != NULL)
++                        *enabled = TRUE;
++                else
++                    result = FALSE;
++        }
++
++        if (value)
++                g_free (value);
++        return result;
++
++}
++
++static gboolean
++gdm_settings_set_gconf_value (gchar *gconf_key, gchar *type, gchar *value) {
++
++        GError  *error = NULL;
++        char    *shutdown_command[] = { "gconftool-2", "--shutdown", NULL };
++        char    *set_command[]  =  { "gconftool-2", "--direct", "-s", gconf_key, "--config-source", NULL, "-t", type, value, NULL };
++        gboolean res;
++        struct passwd *pwent;
++        gboolean success = FALSE;
++
++        pwent = getpwnam (GDM_USERNAME);
++        if G_UNLIKELY (pwent == NULL)
++                g_warning ("Can't access to 'gdm' user name in passwd");
++        else {
++                set_command[5] = g_strdup_printf("xml:readwrite:%s/.gconf", pwent->pw_dir);
++                res = g_spawn_sync (NULL,
++                                    shutdown_command,
++                                    NULL,
++                                    G_SPAWN_SEARCH_PATH,
++                                    (GSpawnChildSetupFunc)set_gdm_uid_child_setup,
++                                    NULL,
++                                    NULL,
++                                    NULL,
++                                    NULL,
++                                    &error);
++                if (!res) {
++                        if (error != NULL) {
++                                g_warning ("Unable to shutdown gconf: %s", error->message);
++                                g_error_free (error);
++                        }
++                        else
++                                g_warning ("Unable to shutdown gconf: unknown error");
++                }
++                else {
++                        res = g_spawn_async (NULL,
++                                             set_command,
++                                             NULL,
++                                             G_SPAWN_SEARCH_PATH
++                                             | G_SPAWN_STDOUT_TO_DEV_NULL
++                                             | G_SPAWN_STDERR_TO_DEV_NULL,
++                                             (GSpawnChildSetupFunc)set_gdm_uid_child_setup,
++                                             NULL,
++                                             NULL,
++                                             &error);
++                        if (!res) {
++                                if (error != NULL) {
++                                        g_warning ("Unable to set event key to gconf: %s", error->message);
++                                        g_error_free (error);
++                                 }
++                                 else
++                                        g_warning ("Unable to set event key to gconf: unknown error");
++                        }
++                        else
++                                 success = TRUE;
++                }
++        }
++
++        return success;
++}
++
++static gboolean
++gdm_settings_set_bool_gconf_value (gchar *gconf_key, gboolean enabled) {
++
++        gchar *value = g_strdup_printf ("%i", enabled);
++        gboolean result;
++
++        result = gdm_settings_set_gconf_value (gconf_key, "bool", value);
++
++        if (value)
++                g_free (value);
++        return result;
++}
++
++
+ /*
+ dbus-send --system --print-reply --dest=org.gnome.DisplayManager /org/gnome/DisplayManager/Settings org.gnome.DisplayManager.Settings.GetValue string:"xdmcp/Enable"
+ */
+@@ -111,6 +299,51 @@
+         return res;
+ }
+ 
++
++/*
++dbus-send --system --print-reply --dest=org.gnome.DisplayManager /org/gnome/DisplayManager/Settings org.gnome.DisplayManager.Settings.GetSoundEnabled
++*/
++
++gboolean
++gdm_settings_get_sound_enabled (GdmSettings *settings,
++                                gboolean    *enabled,
++                                GError     **error)
++{
++        gboolean res;
++        g_debug ("Trying to get sound");
++
++        g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE);
++
++        *enabled = FALSE;
++        res = gdm_settings_get_bool_gconf_value (GCONF_SOUND_EVENT_KEY, enabled);
++        if (res)
++                  g_debug ("get sound returned: %i", *enabled);
++
++        return TRUE;
++}
++
++
++/*
++dbus-send --system --print-reply --dest=org.gnome.DisplayManager /org/gnome/DisplayManager/Settings org.gnome.DisplayManager.Settings.GetFaceBrowserEnabled
++*/
++
++gboolean
++gdm_settings_get_face_browser_enabled (GdmSettings *settings,
++                                       gboolean    *enabled,
++                                       GError     **error)
++{
++        gboolean res;
++
++        g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE);
++
++        *enabled = TRUE;  
++        res = gdm_settings_get_bool_gconf_value (GCONF_FACE_BROWSER_DISABLE_KEY, enabled);
++        if (res)
++            *enabled = !*enabled;
++
++        return TRUE;
++}
++
+ static void
+ unlock_auth_cb (PolkitAuthority *authority,
+                 GAsyncResult *result,
+@@ -155,6 +388,12 @@
+         gchar *key, *value;
+ } SetValueData;
+ 
++typedef struct
++{
++        DBusGMethodInvocation *context;
++        gboolean enabled;
++} SetGConfBooleanData;
++
+ static void
+ set_value_auth_cb (PolkitAuthority *authority,
+                    GAsyncResult *result,
+@@ -229,6 +468,129 @@
+         return TRUE;
+ }
+ 
++static void
++set_sound_enabled_auth_cb (PolkitAuthority *authority,
++                           GAsyncResult *result,
++                           SetGConfBooleanData *data)
++{
++        PolkitAuthorizationResult *auth_result;
++        GError  *error = NULL;
++        
++        auth_result = polkit_authority_check_authorization_finish (authority, result, &error);
++
++        if (!auth_result)
++                dbus_g_method_return_error (data->context, error);
++        else {
++                if (polkit_authorization_result_get_is_authorized (auth_result)) {
++                        if (!gdm_settings_set_bool_gconf_value (GCONF_SOUND_EVENT_KEY, data->enabled))
++                                g_warning ("set new value for sound failed");
++                        dbus_g_method_return (data->context);
++                }
++                else {
++                        error = g_error_new (DBUS_GERROR_REMOTE_EXCEPTION, 0, "Not authorized");
++                        dbus_g_method_return_error (data->context, error);
++                }
++        }
++    
++        if (auth_result)
++                g_object_unref (auth_result);
++        if (error)
++                g_error_free (error);
++
++        g_free (data);
++}
++
++/*
++dbus-send --system --print-reply --dest=org.gnome.DisplayManager /org/gnome/DisplayManager/Settings org.gnome.DisplayManager.Settings.SetSoundEnabled boolean:false
++*/
++
++gboolean
++gdm_settings_set_sound_enabled (GdmSettings *settings,
++                                gboolean     enabled,
++                                DBusGMethodInvocation *context)
++{
++        SetGConfBooleanData *data;
++    
++        g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE);
++
++
++        g_debug ("Setting sound enabled to %s", enabled ? "true" : "false");
++    
++        /* Authorize with PolicyKit */
++        data = g_malloc (sizeof(SetGConfBooleanData));
++        data->context = context;
++        data->enabled = enabled;
++        polkit_authority_check_authorization (polkit_authority_get (),
++                                              polkit_system_bus_name_new (dbus_g_method_get_sender (context)),
++                                              "org.gnome.displaymanager.settings.write",
++                                              NULL,
++                                              POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++                                              NULL,
++                                              (GAsyncReadyCallback) set_sound_enabled_auth_cb,
++                                              data);
++        return TRUE;
++}
++
++static void
++set_face_browser_enabled_auth_cb (PolkitAuthority *authority,
++                                  GAsyncResult *result,
++                                  SetGConfBooleanData *data)
++{
++        PolkitAuthorizationResult *auth_result;
++        GError  *error = NULL;
++        
++        auth_result = polkit_authority_check_authorization_finish (authority, result, &error);
++
++        if (!auth_result)
++                dbus_g_method_return_error (data->context, error);
++        else {
++                if (polkit_authorization_result_get_is_authorized (auth_result)) {
++                        if (!gdm_settings_set_bool_gconf_value (GCONF_FACE_BROWSER_DISABLE_KEY, !data->enabled))
++                                g_warning ("set new value for face browser failed");
++                        dbus_g_method_return (data->context);
++                }
++                else {
++                        error = g_error_new (DBUS_GERROR_REMOTE_EXCEPTION, 0, "Not authorized");
++                        dbus_g_method_return_error (data->context, error);
++                }
++        }
++    
++        if (auth_result)
++                g_object_unref (auth_result);
++        if (error)
++                g_error_free (error);
++
++        g_free (data);
++}
++
++/*
++dbus-send --system --print-reply --dest=org.gnome.DisplayManager /org/gnome/DisplayManager/Settings org.gnome.DisplayManager.Settings.SetFaceBrowserEnabled boolean:true
++*/
++
++gboolean
++gdm_settings_set_face_browser_enabled (GdmSettings *settings,
++                                       gboolean     enabled,
++                                       DBusGMethodInvocation *context)
++{
++        SetGConfBooleanData *data;
++    
++        g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE);
++    
++        /* Authorize with PolicyKit */
++        data = g_malloc (sizeof(SetGConfBooleanData));
++        data->context = context;
++        data->enabled = enabled;
++        polkit_authority_check_authorization (polkit_authority_get (),
++                                              polkit_system_bus_name_new (dbus_g_method_get_sender (context)),
++                                              "org.gnome.displaymanager.settings.write",
++                                              NULL,
++                                              POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
++                                              NULL,
++                                              (GAsyncReadyCallback) set_face_browser_enabled_auth_cb,
++                                              data);
++        return TRUE;
++}
++
+ static gboolean
+ register_settings (GdmSettings *settings)
+ {
+Index: gdm-2.30.4/common/gdm-settings.h
+===================================================================
+--- gdm-2.30.4.orig/common/gdm-settings.h	2010-06-30 12:35:02.000000000 +0200
++++ gdm-2.30.4/common/gdm-settings.h	2010-06-30 12:35:06.000000000 +0200
+@@ -71,12 +71,24 @@
+                                                                  const char  *key,
+                                                                  char       **value,
+                                                                  GError     **error);
++gboolean            gdm_settings_get_sound_enabled              (GdmSettings *settings,
++                                                                 gboolean    *value,
++                                                                 GError     **error);
++gboolean            gdm_settings_get_face_browser_enabled       (GdmSettings *settings,
++                                                                 gboolean    *value,
++                                                                 GError     **error);
+ gboolean            gdm_settings_unlock                         (GdmSettings *settings,
+                                                                  DBusGMethodInvocation *context);
+ gboolean            gdm_settings_set_value                      (GdmSettings *settings,
+                                                                  const char  *key,
+                                                                  const char  *value,
+                                                                  DBusGMethodInvocation *context);
++gboolean            gdm_settings_set_sound_enabled              (GdmSettings *settings,
++                                                                 gboolean     value,
++                                                                 DBusGMethodInvocation *context);
++gboolean            gdm_settings_set_face_browser_enabled       (GdmSettings *settings,
++                                                                 gboolean     value,
++                                                                 DBusGMethodInvocation *context);
+ 
+ G_END_DECLS
+ 
+Index: gdm-2.30.4/common/gdm-settings.xml
+===================================================================
+--- gdm-2.30.4.orig/common/gdm-settings.xml	2010-06-30 12:35:02.000000000 +0200
++++ gdm-2.30.4/common/gdm-settings.xml	2010-06-30 12:35:06.000000000 +0200
+@@ -5,6 +5,12 @@
+       <arg name="key" direction="in" type="s"/>
+       <arg name="value" direction="out" type="s"/>
+     </method>
++    <method name="GetSoundEnabled">
++      <arg name="enabled" direction="out" type="b"/>
++    </method>
++    <method name="GetFaceBrowserEnabled">
++      <arg name="enabled" direction="out" type="b"/>
++    </method>
+     <method name="Unlock">
+       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+       <arg name="is_unlocked" direction="out" type="b"/>
+@@ -14,6 +20,14 @@
+       <arg name="key" direction="in" type="s"/>
+       <arg name="value" direction="in" type="s"/>
+     </method>
++    <method name="SetSoundEnabled">
++      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
++      <arg name="enabled" direction="in" type="b"/>
++    </method>
++    <method name="SetFaceBrowserEnabled">
++      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
++      <arg name="enabled" direction="in" type="b"/>
++    </method>
+     <signal name="ValueChanged">
+       <arg name="key" type="s"/>
+       <arg name="old_value" type="s"/>

=== added file 'debian/patches/09_gdmsetup.patch'
--- debian/patches/09_gdmsetup.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/09_gdmsetup.patch	2011-03-10 14:39:08 +0000
@@ -0,0 +1,4549 @@
+Description: Add GDM Setup
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=587750
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299
+
+Index: gdm-2.30.5/configure.ac
+===================================================================
+--- gdm-2.30.5.orig/configure.ac	2010-08-17 22:19:05.000000000 +0200
++++ gdm-2.30.5/configure.ac	2010-08-17 22:19:18.000000000 +0200
+@@ -118,6 +118,14 @@
+ AC_SUBST(UPOWER_CFLAGS)
+ AC_SUBST(UPOWER_LIBS)
+ 
++PKG_CHECK_MODULES(GDMSETUP,
++        dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
++        gtk+-2.0 >= $GTK_REQUIRED_VERSION
++	gmodule-2.0
++)
++AC_SUBST(GDMSETUP_CFLAGS)
++AC_SUBST(GDMSETUP_LIBS)
++
+ PKG_CHECK_MODULES(SIMPLE_GREETER,
+         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+@@ -1399,6 +1407,7 @@
+ daemon/Makefile
+ docs/Makefile
+ gui/Makefile
++gui/gdmsetup/Makefile
+ gui/simple-greeter/Makefile
+ gui/simple-greeter/libnotificationarea/Makefile
+ gui/simple-chooser/Makefile
+Index: gdm-2.30.5/gui/gdmsetup/gdm-sessions.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.5/gui/gdmsetup/gdm-sessions.c	2010-08-17 22:19:05.000000000 +0200
+@@ -0,0 +1,265 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright 2008 Red Hat, Inc,
++ *           2007 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * Written by : William Jon McCann <[e-mail]>
++ *              Ray Strode <[e-mail]>
++ */
++
++#include "config.h"
++
++#include <stdlib.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
++#include <errno.h>
++#include <dirent.h>
++#include <sys/stat.h>
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <glib/gstdio.h>
++
++#include "gdm-sessions.h"
++
++typedef struct _GdmSessionFile {
++        char    *id;
++        char    *path;
++        char    *translated_name;
++        char    *translated_comment;
++} GdmSessionFile;
++
++static GHashTable *gdm_available_sessions_map;
++
++static gboolean gdm_sessions_map_is_initialized = FALSE;
++
++/* adapted from gnome-menus desktop-entries.c */
++static gboolean
++key_file_is_relevant (GKeyFile     *key_file)
++{
++        GError    *error;
++        gboolean   no_display;
++        gboolean   hidden;
++        gboolean   tryexec_failed;
++        char      *tryexec;
++
++        error = NULL;
++        no_display = g_key_file_get_boolean (key_file,
++                                             G_KEY_FILE_DESKTOP_GROUP,
++                                             "NoDisplay",
++                                             &error);
++        if (error) {
++                no_display = FALSE;
++                g_error_free (error);
++        }
++
++        error = NULL;
++        hidden = g_key_file_get_boolean (key_file,
++                                         G_KEY_FILE_DESKTOP_GROUP,
++                                         "Hidden",
++                                         &error);
++        if (error) {
++                hidden = FALSE;
++                g_error_free (error);
++        }
++
++        tryexec_failed = FALSE;
++        tryexec = g_key_file_get_string (key_file,
++                                         G_KEY_FILE_DESKTOP_GROUP,
++                                         "TryExec",
++                                         NULL);
++        if (tryexec) {
++                char *path;
++
++                path = g_find_program_in_path (g_strstrip (tryexec));
++
++                tryexec_failed = (path == NULL);
++
++                g_free (path);
++                g_free (tryexec);
++        }
++
++        if (no_display || hidden || tryexec_failed) {
++                return FALSE;
++        }
++
++        return TRUE;
++}
++
++static void
++load_session_file (const char              *id,
++                   const char              *path)
++{
++        GKeyFile          *key_file;
++        GError            *error;
++        gboolean           res;
++        GdmSessionFile    *session;
++
++        key_file = g_key_file_new ();
++
++        error = NULL;
++        res = g_key_file_load_from_file (key_file, path, 0, &error);
++
++        if (!res) {
++                g_debug ("Failed to load \"%s\": %s\n", path, error->message);
++                g_error_free (error);
++                goto out;
++        }
++
++        if (! g_key_file_has_group (key_file, G_KEY_FILE_DESKTOP_GROUP)) {
++                goto out;
++        }
++
++        res = g_key_file_has_key (key_file, G_KEY_FILE_DESKTOP_GROUP, "Name", NULL);
++        if (! res) {
++                g_debug ("\"%s\" contains no \"Name\" key\n", path);
++                goto out;
++        }
++
++        if (!key_file_is_relevant (key_file)) {
++                g_debug ("\"%s\" is hidden or contains non-executable TryExec program\n", path);
++                goto out;
++        }
++
++        session = g_new0 (GdmSessionFile, 1);
++
++        session->id = g_strdup (id);
++        session->path = g_strdup (path);
++
++        session->translated_name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "Name", NULL, NULL);
++        session->translated_comment = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "Comment", NULL, NULL);
++
++        g_hash_table_insert (gdm_available_sessions_map,
++                             g_strdup (id),
++                             session);
++ out:
++        g_key_file_free (key_file);
++}
++
++static void
++collect_sessions_from_directory (const char *dirname)
++{
++        GDir       *dir;
++        const char *filename;
++
++        /* FIXME: add file monitor to directory */
++
++        dir = g_dir_open (dirname, 0, NULL);
++        if (dir == NULL) {
++                return;
++        }
++
++        while ((filename = g_dir_read_name (dir))) {
++                char *id;
++                char *full_path;
++
++                if (! g_str_has_suffix (filename, ".desktop")) {
++                        continue;
++                }
++                id = g_strndup (filename, strlen (filename) - strlen (".desktop"));
++
++                full_path = g_build_filename (dirname, filename, NULL);
++
++                load_session_file (id, full_path);
++
++                g_free (id);
++                g_free (full_path);
++        }
++
++        g_dir_close (dir);
++}
++
++static void
++collect_sessions (void)
++{
++        int         i;
++        const char *search_dirs[] = {
++                "/etc/X11/sessions/",
++                DMCONFDIR "/Sessions/",
++                DATADIR "/gdm/BuiltInSessions/",
++                DATADIR "/xsessions/",
++                NULL
++        };
++
++        if (gdm_available_sessions_map == NULL) {
++                gdm_available_sessions_map = g_hash_table_new_full (g_str_hash, g_str_equal,
++                                                                    g_free, g_free);
++        }
++
++        for (i = 0; search_dirs [i] != NULL; i++) {
++                collect_sessions_from_directory (search_dirs [i]);
++        }
++}
++
++char **
++gdm_get_all_sessions (void)
++{
++        GHashTableIter iter;
++        gpointer key, value;
++        GPtrArray *array;
++
++        if (!gdm_sessions_map_is_initialized) {
++                collect_sessions ();
++
++                gdm_sessions_map_is_initialized = TRUE;
++        }
++
++        array = g_ptr_array_new ();
++        g_hash_table_iter_init (&iter, gdm_available_sessions_map);
++        while (g_hash_table_iter_next (&iter, &key, &value)) {
++                GdmSessionFile *session;
++
++                session = (GdmSessionFile *) value;
++
++                g_ptr_array_add (array, g_strdup (session->id));
++        }
++        g_ptr_array_add (array, NULL);
++
++        return (char **) g_ptr_array_free (array, FALSE);
++}
++
++gboolean
++gdm_get_details_for_session (const char  *id,
++                             char       **name,
++                             char       **comment)
++{
++        GdmSessionFile *session;
++
++        if (!gdm_sessions_map_is_initialized) {
++                collect_sessions ();
++
++                gdm_sessions_map_is_initialized = TRUE;
++        }
++
++        session = (GdmSessionFile *) g_hash_table_lookup (gdm_available_sessions_map,
++                                                          id);
++
++        if (session == NULL) {
++                return FALSE;
++        }
++
++        if (name != NULL) {
++                *name = g_strdup (session->translated_name);
++        }
++
++        if (comment != NULL) {
++                *comment = g_strdup (session->translated_comment);
++        }
++
++        return TRUE;
++}
+Index: gdm-2.30.5/gui/gdmsetup/gdm-sessions.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.5/gui/gdmsetup/gdm-sessions.h	2010-08-17 22:19:05.000000000 +0200
+@@ -0,0 +1,38 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright 2008 Red Hat, Inc.
++ * Copyright 2007 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * Written by: Ray Strode
++ *             William Jon McCann
++ */
++
++#ifndef __GDM_SESSIONS_H
++#define __GDM_SESSIONS_H
++
++#include <glib.h>
++
++G_BEGIN_DECLS
++
++char **                gdm_get_all_sessions (void);
++gboolean               gdm_get_details_for_session (const char  *id,
++                                                    char       **name,
++                                                    char       **comment);
++
++G_END_DECLS
++
++#endif /* __GDM_SESSION_H */
+Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.5/gui/gdmsetup/gdmsetup.c	2010-08-17 22:19:05.000000000 +0200
+@@ -0,0 +1,717 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include <string.h>
++#include <stdlib.h>
++#include <gtk/gtk.h>
++#include <gdk/gdkkeysyms.h>
++#include <dbus/dbus-glib.h>
++#include <glib/gi18n.h>
++
++#include "gdm-user-manager.h"
++#include "gdm-sessions.h"
++
++#define MAX_USERS_IN_COMBO_BOX 20
++
++/* User interface */
++static GtkBuilder *ui;
++static GtkWidget *dialog, *unlock_button, *option_vbox;
++static GtkWidget *user_combo, *user_entry, *delay_spin;
++static GtkWidget *session_combo;
++static GtkWidget *auto_login_radio, *login_delay_box, *login_delay_check, *sound_enable_check, *face_browser_enable_check;
++
++/* Timer to delay application of configuration */
++static guint apply_timeout = 0;
++
++/* Flag to show when information is user_login_loaded */
++static gboolean user_login_loaded = FALSE;
++static gboolean session_loaded = FALSE;
++
++/* Flag to show when information is loaded */
++static gboolean locked = TRUE;
++
++/* True if the user selection method is a combo box, False if an entry */
++static gboolean user_list_is_combo = TRUE;
++
++/* User information */
++static GdmUserManager *user_manager;
++
++/* Proxy to GDM settings */
++static DBusGProxy *proxy = NULL;
++
++
++static gboolean
++get_sound_enabled ()
++{
++    gboolean value;
++    GError *error = NULL;
++    
++    if (!dbus_g_proxy_call (proxy, "GetSoundEnabled", &error,
++                            G_TYPE_INVALID,
++                            G_TYPE_BOOLEAN, &value, G_TYPE_INVALID)) {
++        g_warning ("Error calling GetSoundEnabled(): %s", error->message);
++        return FALSE;
++    }
++  
++    return value;
++}
++
++
++static gboolean
++set_sound_enabled (gboolean enabled)
++{
++    GError *error = NULL;
++    
++    dbus_g_proxy_call (proxy, "SetSoundEnabled", &error,
++                       G_TYPE_BOOLEAN, enabled, G_TYPE_INVALID,
++                       G_TYPE_INVALID);
++    if (error) {
++        g_warning ("Error calling SetSoundEnabled(%s): %s", enabled ? "TRUE" : "FALSE", error->message);
++        return FALSE;
++    }
++    
++    return TRUE;
++}
++
++
++static gboolean
++get_face_browser_enabled ()
++{
++    gboolean value;
++    GError *error = NULL;
++    
++    if (!dbus_g_proxy_call (proxy, "GetFaceBrowserEnabled", &error,
++                            G_TYPE_INVALID,
++                            G_TYPE_BOOLEAN, &value, G_TYPE_INVALID)) {
++        g_warning ("Error calling GetFaceBrowserEnabled(): %s", error->message);
++        return FALSE;
++    }
++  
++    return value;
++}
++
++
++static gboolean
++set_face_browser_enabled (gboolean enabled)
++{
++    GError *error = NULL;
++    
++    dbus_g_proxy_call (proxy, "SetFaceBrowserEnabled", &error,
++                       G_TYPE_BOOLEAN, enabled, G_TYPE_INVALID,
++                       G_TYPE_INVALID);
++    if (error) {
++        g_warning ("Error calling SetFaceBrowserEnabled(%s): %s", enabled ? "TRUE" : "FALSE", error->message);
++        return FALSE;
++    }
++    
++    return TRUE;
++}
++
++
++static gchar *
++get_value (const gchar *key, gchar *def)
++{
++    gchar *value;
++    GError *error = NULL;
++    
++    if (!dbus_g_proxy_call (proxy, "GetValue", &error,
++                            G_TYPE_STRING, key, G_TYPE_INVALID,
++                            G_TYPE_STRING, &value, G_TYPE_INVALID)) {
++        g_warning ("Error calling GetValue('%s'): %s", key, error->message);
++        return def;
++    }
++    
++    return value;
++}
++
++
++static gboolean
++set_value (const gchar *key, const gchar *value)
++{
++    GError *error = NULL;
++    
++    dbus_g_proxy_call (proxy, "SetValue", &error,
++                       G_TYPE_STRING, key,
++                       G_TYPE_STRING, value, G_TYPE_INVALID, G_TYPE_INVALID);
++    if (error) {
++        g_warning ("Error calling SetValue('%s', '%s'): %s", key, value, error->message);
++        return FALSE;
++    }
++    
++    return TRUE;
++}
++
++
++static gboolean
++get_boolean_value (const gchar *key, gboolean def)
++{
++    gchar *value;
++    gboolean result;
++    
++    value = get_value (key, NULL);
++    if (!value)
++        return def;
++    result = strcmp (value, "true") == 0;
++    g_free (value);
++    return result;
++}
++
++
++static gint
++get_integer_value (const gchar *key, gint def)
++{
++    gchar *value;
++    gint result;
++    char *end;
++    
++    value = get_value (key, NULL);
++    if (!value || value[0] == '\0')
++        result = def;
++    else {
++        result = strtol (value, &end, 10);
++        if (*end != '\0')
++            result = def;
++    }
++
++    if (value)
++        g_free (value);
++    return result;
++}
++
++
++static gboolean
++set_boolean_value (const gchar *key, gboolean value)
++{
++    return set_value (key, value ? "true" : "false");
++}
++
++
++static gboolean
++set_integer_value (const gchar *key, gint value)
++{
++    char value_string[1024];
++    snprintf(value_string, 1024, "%d", value);
++    return set_value (key, value_string);
++}
++
++
++static void
++update_config ()
++{
++    GtkTreeModel *model;
++    GtkTreeIter iter;
++    gchar *user = NULL;
++    gint delay = 0;
++    gboolean auto_login = FALSE, timed_login = FALSE, error = FALSE;
++    gchar *default_session = NULL;
++    
++    if (apply_timeout != 0) {
++        g_source_remove (apply_timeout);
++        apply_timeout = 0;
++    }
++
++    if (user_list_is_combo) {
++        model = gtk_combo_box_get_model (GTK_COMBO_BOX (user_combo));
++        if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (user_combo), &iter))
++            gtk_tree_model_get (model, &iter, 1, &user, -1);
++    }
++    else
++        user = g_strdup (gtk_entry_get_text (GTK_ENTRY (user_entry)));
++
++    model = gtk_combo_box_get_model (GTK_COMBO_BOX (session_combo));
++    if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (session_combo), &iter))
++        gtk_tree_model_get (model, &iter, 1, &default_session, -1);
++
++    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (auto_login_radio))) {
++        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (login_delay_check)))
++            timed_login = TRUE;
++        else
++            auto_login = TRUE;
++    }
++    
++    delay = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (delay_spin));
++
++    g_debug ("set user='%s', auto=%s, timed=%s, delay=%d, default_session=%s",
++             user,
++             auto_login ? "True" : "False",
++             timed_login ? "True" : "False", delay,
++             default_session);
++    
++    if (!set_boolean_value ("daemon/TimedLoginEnable", timed_login) ||
++        !set_boolean_value ("daemon/AutomaticLoginEnable", auto_login) ||
++        !set_value ("daemon/TimedLogin", user) ||
++        !set_value ("daemon/AutomaticLogin", user) ||    
++        !set_integer_value ("daemon/TimedLoginDelay", delay) ||
++        !set_value ("daemon/DefaultSession", default_session))
++        error = TRUE;
++
++    if (user)
++        g_free (user);
++}
++
++
++G_MODULE_EXPORT
++void
++gdm_capplet_response_cb (GtkWidget *widget, gint response_id)
++{
++    if (response_id != 1)
++        gtk_main_quit ();
++}
++
++
++static void
++unlock_response_cb (DBusGProxy     *proxy,
++                    DBusGProxyCall *call_id,
++                    void           *user_data)
++{
++    gboolean is_unlocked;
++    GError *error = NULL;
++    
++    dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_BOOLEAN, &is_unlocked, G_TYPE_INVALID);
++    if (error) {
++        g_warning ("Failed to unlock: %s", error->message);
++        g_error_free (error);
++        return;
++    }
++    
++    if (!is_unlocked)
++        return;
++    
++    locked = FALSE;
++    gtk_widget_set_sensitive (unlock_button, FALSE);
++    gtk_widget_set_sensitive (option_vbox, user_login_loaded && !locked);
++}
++
++
++G_MODULE_EXPORT
++void
++unlock_button_clicked_cb (GtkWidget *widget)
++{
++    dbus_g_proxy_begin_call (proxy, "Unlock", unlock_response_cb, NULL, NULL, G_TYPE_INVALID);
++}
++
++
++G_MODULE_EXPORT
++void
++login_delay_check_toggled_cb (GtkWidget *widget)
++{
++    gtk_widget_set_sensitive (delay_spin,
++                              gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (login_delay_check)));
++    
++    if (session_loaded && user_login_loaded)
++        update_config ();
++}
++
++
++G_MODULE_EXPORT
++void
++sound_enable_check_toggled_cb (GtkWidget *widget)
++{
++   set_sound_enabled (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
++}
++
++
++G_MODULE_EXPORT
++void
++face_browser_enable_check_toggled_cb (GtkWidget *widget)
++{
++   set_face_browser_enabled (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
++}
++
++
++static gboolean
++delayed_apply_cb ()
++{
++    update_config ();
++    return FALSE;
++}
++
++
++G_MODULE_EXPORT
++void
++apply_config_cb (GtkWidget *widget)
++{
++    if (session_loaded && user_login_loaded) {
++        if (apply_timeout != 0)
++            g_source_remove (apply_timeout);
++        apply_timeout = g_timeout_add (200, (GSourceFunc)delayed_apply_cb, NULL);
++    }
++}
++
++
++static void
++init_login_delay ()
++{
++    gint delay;
++    
++    if (get_boolean_value ("daemon/TimedLoginEnable", FALSE))
++        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (login_delay_check), TRUE);
++    
++    delay = get_integer_value ("daemon/TimedLoginDelay", 30);
++
++    g_debug ("init delay=%d", delay);
++
++    gtk_spin_button_set_value (GTK_SPIN_BUTTON (delay_spin), delay);
++}
++
++
++G_MODULE_EXPORT
++void
++automatic_login_toggle_cb (GtkWidget *automatic_login_toggle)    
++{
++    gboolean automatic_login;
++
++    automatic_login = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (automatic_login_toggle));
++    gtk_widget_set_sensitive (login_delay_box, automatic_login);
++    gtk_widget_set_sensitive (user_combo, automatic_login);
++    gtk_widget_set_sensitive (user_entry, automatic_login);
++    gtk_widget_set_sensitive (face_browser_enable_check, !automatic_login);
++
++    if (session_loaded && user_login_loaded)
++        update_config ();
++}
++
++
++G_MODULE_EXPORT
++void
++default_user_combo_box_changed_cb (void)
++{
++    if (session_loaded && user_login_loaded) {
++        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (auto_login_radio), TRUE);
++        update_config ();
++    }
++}
++
++G_MODULE_EXPORT
++void
++default_session_combo_box_changed_cb (void)
++{
++    if (session_loaded && user_login_loaded)
++        update_config ();
++}
++
++
++static void
++init_default_user (void)
++{
++    GtkTreeModel *model;
++    GtkTreeIter iter;
++    gboolean auto_login, timed_login, active;
++    gchar *user = NULL;
++    
++    auto_login = get_boolean_value ("daemon/AutomaticLoginEnable", FALSE);
++    timed_login = get_boolean_value ("daemon/TimedLoginEnable", FALSE);
++    
++    if (auto_login)
++        user = get_value ("daemon/AutomaticLogin", NULL);
++    if (user == NULL)
++        user = get_value ("daemon/TimedLogin", NULL);
++
++    g_debug ("init user='%s' auto=%s", user, auto_login || timed_login ? "True" : "False");
++
++    if (auto_login || timed_login)
++        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (auto_login_radio), TRUE);
++    
++    if (!user_list_is_combo) {
++        if (user != NULL)
++            gtk_entry_set_text (GTK_ENTRY (user_entry), user);
++    }
++    else {
++        model = gtk_combo_box_get_model (GTK_COMBO_BOX (user_combo));
++        active = gtk_tree_model_get_iter_first (model, &iter);
++        
++        /* If no user then use first available */
++        if (user == NULL) {
++            if (active)
++                gtk_combo_box_set_active_iter (GTK_COMBO_BOX (user_combo), &iter);
++        }
++        else {
++            while (user != NULL && active) {
++                gchar *u;
++                gboolean matched;
++            
++                gtk_tree_model_get (model, &iter, 1, &u, -1);
++                matched = strcmp (user, u) == 0;
++                g_free (u);
++                if (matched) {
++                    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (user_combo), &iter);
++                    break;
++                }
++            
++                active = gtk_tree_model_iter_next (model, &iter);
++            }
++        }
++    }
++    
++    g_free (user);
++}
++
++
++static void
++init_default_session (void)
++{
++    GtkTreeModel *model;
++    GtkTreeIter iter;
++    gboolean active;
++    gchar *default_session = NULL;
++
++    default_session = get_value ("daemon/DefaultSession", NULL);
++    g_debug ("Init default session found:'%s'", default_session);
++
++    model = gtk_combo_box_get_model (GTK_COMBO_BOX (session_combo));
++    active = gtk_tree_model_get_iter_first (model, &iter);
++
++    /* If no default session then use gnome one */
++    if (default_session == NULL || strlen(default_session) == 0)
++        default_session = g_strdup("gnome");
++
++    while (active) {
++        gchar *u;
++        gboolean matched;
++
++        gtk_tree_model_get (model, &iter, 1, &u, -1);
++        matched = strcmp (default_session, u) == 0;
++        g_free (u);
++        if (matched) {
++            gtk_combo_box_set_active_iter (GTK_COMBO_BOX (session_combo), &iter);
++            break;
++        }
++
++        active = gtk_tree_model_iter_next (model, &iter);
++    }
++    session_loaded = TRUE;
++
++    g_free (default_session);
++}
++
++
++static void add_user (GdmUser *user)
++{
++    GtkListStore *model;
++    GtkTreeIter iter;
++    GString *label;
++    const gchar *home_user_dir;
++    gchar *encryption_path;
++    gchar *encryption_content;
++    GFile *encryption_file;
++    GString *encryption_mount;
++    gboolean using_encryption = FALSE;
++
++    /* don't enable autologin for user having encrypted home dir
++       there are some corner case if gdmsetup isn't run as root and another user
++       than the current one is using encrypted dir: you can't check for them if
++       they access to it. The solution is the server to refuse the change then
++       (too late in the cycle for such changes). */
++    home_user_dir = gdm_user_get_home_directory (user);
++    encryption_path = g_build_filename (home_user_dir, ".ecryptfs", "Private.mnt", NULL);
++    encryption_file = g_file_new_for_path (encryption_path);
++    if (g_file_load_contents (encryption_file, NULL, &encryption_content, NULL, NULL, NULL)) {
++        if (g_str_has_suffix (encryption_content, "\n"))
++            encryption_content[strlen(encryption_content)-1] = '\0';
++        encryption_mount = g_string_new(encryption_content);
++        if (strcmp (encryption_mount->str, home_user_dir) == 0)
++            using_encryption = TRUE;
++        g_string_free (encryption_mount, TRUE);
++    }
++    if (encryption_file)
++        g_object_unref (encryption_file);
++    g_free (encryption_path);
++
++    if (using_encryption) {
++        g_debug ("%s is using an encrypted home, not listing him for autologin", gdm_user_get_real_name (user));
++        return;
++    }
++
++    model = GTK_LIST_STORE (gtk_builder_get_object (ui, "login_user_model"));
++    gtk_list_store_append (model, &iter);
++    label = g_string_new("");
++    g_string_printf (label, "%s (%s)", gdm_user_get_real_name (user), gdm_user_get_user_name (user));
++    gtk_list_store_set (model, &iter,
++                        0, label->str,
++                        1, gdm_user_get_user_name (user),
++                        -1);
++    g_string_free (label, TRUE);
++}
++
++
++static void add_session (gchar *session_id, gchar *name, gchar *comment)
++{
++    GtkListStore *model;
++    GtkTreeIter iter;
++    GString *label;    
++
++    model = GTK_LIST_STORE (gtk_builder_get_object (ui, "session_model"));
++    gtk_list_store_append (model, &iter);
++    label = g_string_new("");
++    g_string_printf (label, "%s", name);
++    gtk_list_store_set (model, &iter,
++                        0, label->str,
++                        1, session_id,
++                        -1);
++    g_string_free (label, TRUE);
++}
++
++
++static void
++users_loaded_cb(GdmUserManager *manager)
++{
++    GSList *users, *item;
++
++    users = gdm_user_manager_list_users (user_manager);
++    
++    if (g_slist_length (users) > MAX_USERS_IN_COMBO_BOX) {
++        user_list_is_combo = FALSE;
++        gtk_widget_hide (user_combo);
++        gtk_widget_show (user_entry);
++    }
++    else {
++        for (item = users; item; item = item->next)
++            add_user ((GdmUser *) item->data);
++    }
++
++    init_default_user ();
++
++    user_login_loaded = TRUE;
++    gtk_widget_set_sensitive (option_vbox, user_login_loaded && !locked);
++}
++
++
++static void
++user_added_cb (GdmUserManager *manager, GdmUser *user)
++{
++    if (session_loaded && user_login_loaded)
++        add_user (user);
++}
++
++
++static void
++load_sessions_cb(void)
++{
++    gchar     **session_ids;
++    int        i;
++
++    session_ids = gdm_get_all_sessions ();
++
++    for (i = 0; session_ids[i] != NULL; i++) {
++        gchar *name;
++        gchar *comment;
++        if (!gdm_get_details_for_session (session_ids[i],
++                                          &name, &comment)) {
++            continue;
++        }
++        add_session (session_ids[i], name, comment);
++            g_free (name);
++            g_free (comment);
++    }
++    g_strfreev (session_ids);
++
++    init_default_session();
++}
++
++
++static void
++split_text (const gchar *text, const gchar *prefix_label_name, const gchar *suffix_label_name)
++{
++    gchar **tokens;
++    GtkWidget *prefix_label, *suffix_label;
++    
++    prefix_label = GTK_WIDGET (gtk_builder_get_object (ui, prefix_label_name));
++    suffix_label = GTK_WIDGET (gtk_builder_get_object (ui, suffix_label_name));
++    
++    tokens = g_strsplit (text, "%s", 2);
++    if (tokens[0] != NULL && tokens[1] != NULL) {
++        if (tokens[0][0] != '\0')
++            gtk_label_set_text (GTK_LABEL (prefix_label), g_strstrip (tokens[0]));
++        else
++            gtk_widget_hide (prefix_label);
++        if (tokens[1][0] != '\0')
++            gtk_label_set_text (GTK_LABEL (suffix_label), g_strstrip (tokens[1]));
++        else
++            gtk_widget_hide (suffix_label);
++    }
++    g_strfreev (tokens);
++}
++
++
++int main (int argc, char **argv)
++{
++    GtkCellRenderer *renderer;
++    DBusGConnection *connection;
++    GError *error = NULL;
++    
++    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
++    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++    textdomain (GETTEXT_PACKAGE);
++
++    gtk_init (&argc, &argv);
++    
++    connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++    if (error) {
++        g_warning ("Failed to get system bus: %s", error->message);
++        return 1;
++    }
++    proxy = dbus_g_proxy_new_for_name (connection,
++                                       "org.gnome.DisplayManager",
++                                       "/org/gnome/DisplayManager/Settings",
++                                       "org.gnome.DisplayManager.Settings");
++
++    ui = gtk_builder_new ();
++    gtk_builder_add_from_file (ui, UIDIR "/gdmsetup.ui", &error);
++    if (error) {
++        g_warning ("Failed to load UI: %s", error->message);
++        return 1;
++    }
++    dialog = GTK_WIDGET (gtk_builder_get_object (ui, "gdm_capplet"));
++    unlock_button = GTK_WIDGET (gtk_builder_get_object (ui, "unlock_button"));
++    option_vbox = GTK_WIDGET (gtk_builder_get_object (ui, "gdm_capplet_vbox"));
++    user_combo = GTK_WIDGET (gtk_builder_get_object (ui, "default_user_combo_box"));
++    session_combo = GTK_WIDGET (gtk_builder_get_object (ui, "default_session_combo_box"));
++    user_entry = GTK_WIDGET (gtk_builder_get_object (ui, "default_user_entry"));
++    delay_spin = GTK_WIDGET (gtk_builder_get_object (ui, "login_delay_spin"));
++    auto_login_radio = GTK_WIDGET (gtk_builder_get_object (ui, "automatic_login_radio"));
++    login_delay_box = GTK_WIDGET (gtk_builder_get_object (ui, "login_delay_box"));
++    login_delay_check = GTK_WIDGET (gtk_builder_get_object (ui, "login_delay_check"));
++    sound_enable_check = GTK_WIDGET (gtk_builder_get_object (ui, "sound_enable_check"));
++    face_browser_enable_check = GTK_WIDGET (gtk_builder_get_object (ui, "face_browser_enable_check"));
++
++    if (g_file_test ("/usr/share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop", G_FILE_TEST_EXISTS))
++        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sound_enable_check), get_sound_enabled ());
++    else
++        gtk_widget_hide (GTK_WIDGET (sound_enable_check));
++
++    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (face_browser_enable_check), get_face_browser_enabled ());
++  
++    gtk_builder_connect_signals (ui, NULL);
++
++    /* Translators: Label for choosing which user to log in as. '%s' is replaced with an input field. */
++    split_text (_("Log in as %s automatically"), "user_prefix_label", "user_suffix_label");
++    /* Translators: Label for choosing the login delay. '%s' is replaced with an input field. */
++    split_text (_("Allow %s seconds for anyone else to log in first"), "delay_prefix_label", "delay_suffix_label");
++    /* Translators: Label for choosing the default session. '%s' is replaced with an input field. */
++    split_text (_("Select %s as default session"), "session_prefix_label", "session_suffix_label");
++    
++    init_login_delay ();
++    load_sessions_cb();
++
++    renderer = gtk_cell_renderer_text_new ();
++    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (user_combo), renderer, TRUE);
++    gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (user_combo), renderer, "text", 0);
++
++    renderer = gtk_cell_renderer_text_new ();
++    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE);
++    gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0);
++
++    user_manager = gdm_user_manager_ref_default ();
++    g_signal_connect (user_manager, "users-loaded", G_CALLBACK (users_loaded_cb), NULL);
++    g_signal_connect (user_manager, "user-added", G_CALLBACK (user_added_cb), NULL);
++    
++    gtk_widget_hide (user_entry);
++
++    gtk_widget_set_sensitive (option_vbox, FALSE);
++    gtk_widget_show (dialog);
++
++    gtk_main ();
++    
++    return 0;
++}
+Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.desktop.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.5/gui/gdmsetup/gdmsetup.desktop.in	2010-08-17 22:19:05.000000000 +0200
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++_Name=Login Screen
++_Comment=Configure login screen behavior
++Exec=gdmsetup
++Icon=gdm-setup
++StartupNotify=true
++Terminal=false
++Type=Application
++Categories=GNOME;GTK;Settings;System;
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=gdm
++X-GNOME-Bugzilla-Component=general
+Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.ui
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.5/gui/gdmsetup/gdmsetup.ui	2010-08-17 22:19:05.000000000 +0200
+@@ -0,0 +1,345 @@
++<?xml version="1.0"?>
++<interface>
++  <requires lib="gtk+" version="2.16"/>
++  <!-- interface-naming-policy project-wide -->
++  <object class="GtkListStore" id="login_user_model">
++    <columns>
++      <!-- column-name label -->
++      <column type="gchararray"/>
++      <!-- column-name user -->
++      <column type="gchararray"/>
++      <!-- column-name icon -->
++      <column type="GdkPixbuf"/>
++    </columns>
++  </object>
++  <object class="GtkListStore" id="session_model">
++    <columns>
++      <!-- column-name user -->
++      <column type="gchararray"/>
++      <!-- column-name session_id -->
++      <column type="gchararray"/>
++      <!-- column-name icon -->
++      <column type="GdkPixbuf"/>
++    </columns>
++  </object>
++  <object class="GtkDialog" id="gdm_capplet">
++    <property name="border_width">5</property>
++    <property name="title" translatable="yes" comments="Title of login screen settings dialog">Login Screen Settings</property>
++    <property name="resizable">False</property>
++    <property name="window_position">center</property>
++    <property name="icon_name">gdm-setup</property>
++    <property name="type_hint">normal</property>
++    <property name="has_separator">False</property>
++    <signal name="response" handler="gdm_capplet_response_cb"/>
++    <child internal-child="vbox">
++      <object class="GtkVBox" id="dialog-vbox1">
++        <property name="visible">True</property>
++        <property name="spacing">12</property>
++        <child>
++          <object class="GtkVBox" id="gdm_capplet_vbox">
++            <property name="visible">True</property>
++            <property name="spacing">18</property>
++            <child>
++              <object class="GtkLabel" id="intro_label">
++                <property name="visible">True</property>
++                <property name="xalign">0</property>
++                <property name="label" translatable="yes" comments="Description above login option radio buttons">When the computer starts up:</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkVBox" id="vbox3">
++                <property name="visible">True</property>
++                <property name="spacing">12</property>
++                <child>
++                  <object class="GtkCheckButton" id="sound_enable_check">
++                    <property name="label" translatable="yes">Play login sound</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="draw_indicator">True</property>
++                    <signal name="toggled" handler="sound_enable_check_toggled_cb"/>
++                  </object>
++                  <packing>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkCheckButton" id="face_browser_enable_check">
++                    <property name="label" translatable="yes">Show list of users</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="draw_indicator">True</property>
++                    <signal name="toggled" handler="face_browser_enable_check_toggled_cb"/>
++                  </object>
++                  <packing>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkRadioButton" id="manual_login_radio">
++                    <property name="label" translatable="yes" comments="Radio option to set login screen to prompt for user">_Show the screen for choosing who will log in</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="use_underline">True</property>
++                    <property name="active">True</property>
++                    <property name="draw_indicator">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="position">2</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkVBox" id="vbox4">
++                    <property name="visible">True</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <object class="GtkHBox" id="hbox1">
++                        <property name="visible">True</property>
++                        <property name="spacing">6</property>
++                        <child>
++                          <object class="GtkRadioButton" id="automatic_login_radio">
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="draw_indicator">True</property>
++                            <property name="group">manual_login_radio</property>
++                            <signal name="toggled" handler="automatic_login_toggle_cb"/>
++                            <child>
++                              <object class="GtkLabel" id="user_prefix_label">
++                                <property name="visible">True</property>
++                                <property name="label">_Log in as</property>
++                                <property name="use_underline">True</property>
++                              </object>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkComboBox" id="default_user_combo_box">
++                            <property name="visible">True</property>
++                            <property name="sensitive">False</property>
++                            <property name="model">login_user_model</property>
++                            <signal name="changed" handler="default_user_combo_box_changed_cb"/>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkEntry" id="default_user_entry">
++                            <property name="visible">True</property>
++                            <property name="sensitive">False</property>
++                            <property name="can_focus">True</property>
++                            <property name="invisible_char">&#x2022;</property>
++                            <signal name="changed" handler="apply_config_cb"/>
++                          </object>
++                          <packing>
++                            <property name="position">2</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkLabel" id="user_suffix_label">
++                            <property name="visible">True</property>
++                            <property name="label">automatically</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="position">3</property>
++                          </packing>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkAlignment" id="alignment1">
++                        <property name="visible">True</property>
++                        <property name="left_padding">16</property>
++                        <child>
++                          <object class="GtkHBox" id="login_delay_box">
++                            <property name="visible">True</property>
++                            <property name="sensitive">False</property>
++                            <property name="spacing">6</property>
++                            <child>
++                              <object class="GtkCheckButton" id="login_delay_check">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="receives_default">False</property>
++                                <property name="draw_indicator">True</property>
++                                <signal name="toggled" handler="login_delay_check_toggled_cb"/>
++                                <child>
++                                  <object class="GtkLabel" id="delay_prefix_label">
++                                    <property name="visible">True</property>
++                                    <property name="label">_Allow</property>
++                                    <property name="use_underline">True</property>
++                                  </object>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkSpinButton" id="login_delay_spin">
++                                <property name="visible">True</property>
++                                <property name="sensitive">False</property>
++                                <property name="can_focus">True</property>
++                                <property name="invisible_char">&#x2022;</property>
++                                <property name="adjustment">adjustment1</property>
++                                <signal name="value_changed" handler="apply_config_cb"/>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkLabel" id="delay_suffix_label">
++                                <property name="visible">True</property>
++                                <property name="label">seconds for anyone else to log in first</property>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
++                          </object>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="position">3</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkHBox" id="hbox2">
++                    <property name="visible">True</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <object class="GtkLabel" id="session_prefix_label">
++                        <property name="visible">True</property>
++                        <property name="label">Use</property>
++                        <property name="use_underline">True</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkComboBox" id="default_session_combo_box">
++                        <property name="visible">True</property>
++                        <property name="model">session_model</property>
++                        <signal name="changed" handler="default_session_combo_box_changed_cb"/>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkLabel" id="session_suffix_label">
++                        <property name="visible">True</property>
++                        <property name="label">as default session</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="position">2</property>
++                      </packing>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="position">4</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="position">4</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="position">1</property>
++          </packing>
++        </child>
++        <child internal-child="action_area">
++          <object class="GtkHButtonBox" id="dialog-action_area1">
++            <property name="visible">True</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="unlock_button">
++                <property name="label" translatable="yes">_Unlock</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="image">image1</property>
++                <property name="use_underline">True</property>
++                <signal name="clicked" handler="unlock_button_clicked_cb"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="close_button">
++                <property name="label">gtk-close</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++    <action-widgets>
++      <action-widget response="1">unlock_button</action-widget>
++      <action-widget response="-7">close_button</action-widget>
++    </action-widgets>
++  </object>
++  <object class="GtkImage" id="image1">
++    <property name="visible">True</property>
++    <property name="stock">gtk-dialog-authentication</property>
++  </object>
++  <object class="GtkSizeGroup" id="combo_size_group"/>
++  <object class="GtkSizeGroup" id="radio_size_group"/>
++  <object class="GtkAdjustment" id="adjustment1">
++    <property name="lower">1</property>
++    <property name="upper">600</property>
++    <property name="step_increment">1</property>
++  </object>
++</interface>
+Index: gdm-2.30.5/gui/gdmsetup/gdm-user.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.5/gui/gdmsetup/gdm-user.c	2010-08-17 22:19:05.000000000 +0200
+@@ -0,0 +1,1172 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2004-2005 James M. Cape <[e-mail]>.
++ * Copyright (C) 2007-2008 William Jon McCann <[e-mail]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <config.h>
++
++#include <float.h>
++#include <string.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
++#include <glib/gi18n.h>
++#include <gio/gio.h>
++#include <gtk/gtk.h>
++
++#include "gdm-user-manager.h"
++#include "gdm-user-private.h"
++
++#define GDM_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_USER, GdmUserClass))
++#define GDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDM_TYPE_USER))
++#define GDM_USER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), GDM_TYPE_USER, GdmUserClass))
++
++#define GLOBAL_FACEDIR    DATADIR "/faces"
++#define MAX_ICON_SIZE     128
++#define MAX_FILE_SIZE     65536
++#define MINIMAL_UID       100
++#define RELAX_GROUP       TRUE
++#define RELAX_OTHER       TRUE
++
++enum {
++        PROP_0,
++        PROP_MANAGER,
++        PROP_REAL_NAME,
++        PROP_USER_NAME,
++        PROP_UID,
++        PROP_HOME_DIR,
++        PROP_SHELL,
++        PROP_LOGIN_FREQUENCY,
++};
++
++enum {
++        ICON_CHANGED,
++        SESSIONS_CHANGED,
++        LAST_SIGNAL
++};
++
++struct _GdmUser {
++        GObject         parent;
++
++        GdmUserManager *manager;
++
++        uid_t           uid;
++        char           *user_name;
++        char           *real_name;
++        char           *home_dir;
++        char           *shell;
++        GList          *sessions;
++        gulong          login_frequency;
++
++        GFileMonitor   *icon_monitor;
++};
++
++typedef struct _GdmUserClass
++{
++        GObjectClass parent_class;
++
++        void (* icon_changed)     (GdmUser *user);
++        void (* sessions_changed) (GdmUser *user);
++} GdmUserClass;
++
++static void gdm_user_finalize     (GObject      *object);
++
++static guint signals[LAST_SIGNAL] = { 0 };
++
++G_DEFINE_TYPE (GdmUser, gdm_user, G_TYPE_OBJECT)
++
++static int
++session_compare (const char *a,
++                 const char *b)
++{
++        if (a == NULL) {
++                return 1;
++        } else if (b == NULL) {
++                return -1;
++        }
++
++        return strcmp (a, b);
++}
++
++void
++_gdm_user_add_session (GdmUser    *user,
++                       const char *ssid)
++{
++        GList *li;
++
++        g_return_if_fail (GDM_IS_USER (user));
++        g_return_if_fail (ssid != NULL);
++
++        li = g_list_find_custom (user->sessions, ssid, (GCompareFunc)session_compare);
++        if (li == NULL) {
++                g_debug ("GdmUser: adding session %s", ssid);
++                user->sessions = g_list_prepend (user->sessions, g_strdup (ssid));
++                g_signal_emit (user, signals[SESSIONS_CHANGED], 0);
++        } else {
++                g_debug ("GdmUser: session already present: %s", ssid);
++        }
++}
++
++void
++_gdm_user_remove_session (GdmUser    *user,
++                          const char *ssid)
++{
++        GList *li;
++
++        g_return_if_fail (GDM_IS_USER (user));
++        g_return_if_fail (ssid != NULL);
++
++        li = g_list_find_custom (user->sessions, ssid, (GCompareFunc)session_compare);
++        if (li != NULL) {
++                g_debug ("GdmUser: removing session %s", ssid);
++                g_free (li->data);
++                user->sessions = g_list_delete_link (user->sessions, li);
++                g_signal_emit (user, signals[SESSIONS_CHANGED], 0);
++        } else {
++                g_debug ("GdmUser: session not found: %s", ssid);
++        }
++}
++
++guint
++gdm_user_get_num_sessions (GdmUser    *user)
++{
++        return g_list_length (user->sessions);
++}
++
++GList *
++gdm_user_get_sessions (GdmUser *user)
++{
++        return user->sessions;
++}
++
++static void
++_gdm_user_set_login_frequency (GdmUser *user,
++                               gulong   login_frequency)
++{
++        user->login_frequency = login_frequency;
++        g_object_notify (G_OBJECT (user), "login-frequency");
++}
++
++static void
++gdm_user_set_property (GObject      *object,
++                       guint         param_id,
++                       const GValue *value,
++                       GParamSpec   *pspec)
++{
++        GdmUser *user;
++
++        user = GDM_USER (object);
++
++        switch (param_id) {
++        case PROP_MANAGER:
++                user->manager = g_value_get_object (value);
++                g_assert (user->manager);
++                break;
++        case PROP_LOGIN_FREQUENCY:
++                _gdm_user_set_login_frequency (user, g_value_get_ulong (value));
++                break;
++        default:
++                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
++                break;
++        }
++}
++
++static void
++gdm_user_get_property (GObject    *object,
++                       guint       param_id,
++                       GValue     *value,
++                       GParamSpec *pspec)
++{
++        GdmUser *user;
++
++        user = GDM_USER (object);
++
++        switch (param_id) {