* Merge with Debian. Remaining changes: - debian/control.in: + gnome-session - Recommend nautilus and either unity, unity-2d or gnome-shell - Only suggest gnome-session-fallback (we don't want it to be installed by default) - Drop the Recommends on gnome-power-manager, the code gnome-session uses has moved to gnome-settings-daemon + gnome-session-fallback - Recommend cups-pk-helper for gnome-session-fallback so that System Settings>Printers works - debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm: Moved registering gnome-session binary as a session manager to gnome-session-bin package - debian/postinst, postrm: set the default lightdm session as ubuntu if none already set - don't install defaults.list (installed by desktop-file-utils in ubuntu): debian/gnome-session-common.dirs and gnome-session-common.install - add debian/gnome-session-common.gsettings-override: set ubuntu as the default session if nothing is provided - debian/55gnome-session_gnomerc: Use POSIX string substitutions (shell internal) instead of external basename and cut for startup speed. - debian/patches/20_hide_nodisplay.patch: Don't show applications in the Sessions properties dialog that have NoDisplay=true. - debian/patches/21_up_start_on_demand.patch: Don't call dkp_client_new() until actually needed. This blocks for some time whilst DK-Power is started, if it wasn't running already (which is the case during auto-login). This can delay the whole session from starting. - debian/patches/22_support_autostart_delay.patch: Bugzilla patch to support adding a delay to autostart apps, using a "X-GNOME-Autostart-Delay" key in the desktop file - debian/patches/50_ubuntu_sessions.patch: + Add Ubuntu & Ubuntu 2D sessions + Add GNOME Classic (Without Effects session). Use notify-osd for notifications, but don't add it to RequiredComponents since notify-osd doesn't have an autostart .desktop file + gnome-shell.desktop adds --session=gnome now that the "ubuntu" session is the default. Use TryExec to test if gnome-shell is installed. - debian/patches/51_remove_session_saving_from_gui.patch: add GNOME_SESSION_SAVE environment variable for people wanting to use the save session still, knowing that it can break your system if used unwisely (LP: #771896) - debian/patches/52_xdg_current_desktop.patch: Set XDG_CURRENT_DESKTOP inside gnome-session based on a new key 'DesktopName' in gnome-session .desktop files. - debian/patches/80_new_upstream_session_dialog.patch: Bugzilla patch to change the session dialog. (Deactivated, see bug 807503) - debian/patches/95_dbus_request_shutdown.patch: Add "RequestShutdown" and "RequestReboot" DBus methods to allow other applications to shutdown or reboot the machine via the session manager. - debian/patches/96_no_catch_sigsegv.patch: Don't register a handler for SIGSEGV. We want Apport to catch these crashes so that users can submit useful crash reports. - debian/patches/101_screen_lock_on_suspend.patch: Use the same logic as gnome-power-manager for deciding the "screen lock on suspend" policy. This restores the Jaunty behaviour rather than just using the screensaver settings, which is surprising for users. This patch is deactivated for now, we'll see with the new screensaver and screen locking experience what to do (not rebased on gsettings as well) - debian/patches/103_kill_the_fail_whale.patch: seems that the fail whale try to come back and resist from his removal refreshed the patch to ensure it's killed and won't come back ever ever again. - 104_dont_show_fallback_warning.patch: Disable GNOME Fallback warning. It doesn't really explain anything and assumes that there aren't people that want to run Fallback. - debian/patches/105_hide_session_startup_help.patch: Hide Help button on Startup Applications dialog, as it is broken and the help documentation hasn't been written for 3.x yet.