Merge lp:~noskcaj/gnome-session/3.16 into lp:~ubuntu-desktop/gnome-session/ubuntu

[Jackson Doak]

Merge from debian 3.16

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-20 01:27:38 +0000
+++ debian/changelog	2015-06-05 20:00:45 +0000
@@ -1,3 +1,64 @@
+gnome-session (3.16.0-1ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control.in:
+      + Recommend session-migration
+      + don't depend on xwayland
+      + Remove gnome-shell circular dep to ease uprades
+    - Split ubuntu-session out of gnome-session.
+    - Add upstart user session
+    - debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm:
+       Moved registering gnome-session binary as a session manager to
+       gnome-session-bin package
+    - don't install defaults.list (installed by desktop-file-utils in ubuntu):
+      debian/gnome-session-common.dirs and gnome-session-common.install
+    - 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 session
+       + 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
+    - 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/53_add_sessionmigration.patch, debian/control:
+      recommends and launch the session-migration if present at the start of
+      the session. This sync tool is running different session migration
+      scripts that can be provided in various desktop packages.
+    - 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/103_kill_the_fail_whale.patch: Kill the Fail Whale as it
+      tends to be more annoying than helpful
+    - debian/gnome-session-bin.user-session.upstart: Disable acceleration check
+      when launching a GNOME Flashback (Metacity) session.
+    - Split wayland session into gnome-session-wayland
+      + control.in: add gnome-session-wayland package and depend on xwayland
+      + gnome-session-wayland.install: install wayland session
+
+ -- Jackson Doak <[e-mail]>  Fri, 05 Jun 2015 20:08:47 +1000
+
+gnome-session (3.16.0-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Adds new --disable-acceleration-check option (closes: #771513).
+  * Drop 0001-configure.ac-Add-support-for-new-versions-of-systemd.patch,
+    applied upstream.
+  * Upstream has disabled support for consolekit even on non-systemd
+    systems with this release. We follow upstream and do not enable it
+    forcefully. Please file a bug if you think this change is wrong.
+    - Drop libdbus-glib-1-dev build-dependency, it is now only used by
+      consolekit support code.
+    - Drop consolekit recommends from gnome-session-bin.
+  * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Dmitry Shachnev <[e-mail]>  Tue, 26 May 2015 17:34:09 +0300
+
 gnome-session (3.14.0-3ubuntu2) wily; urgency=medium
 
   * debian/50-ubuntu.conf:
@@ -3019,3 +3080,4 @@
   * Initial Release.
 
  -- Jim Pick <[e-mail]>  Mon, 16 Mar 1998 15:27:43 -0800
+

=== modified file 'debian/control'
--- debian/control	2015-05-18 12:40:04 +0000
+++ debian/control	2015-06-05 20:00:45 +0000
@@ -7,8 +7,8 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Michael Biebl <[e-mail]>
-Standards-Version: 3.9.5
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Dmitry Shachnev <[e-mail]>, Michael Biebl <[e-mail]>
+Standards-Version: 3.9.6
 Build-Depends: cdbs (>= 0.4.41),
                dh-autoreconf,
                debhelper (>= 8),
@@ -17,7 +17,6 @@
                intltool (>= 0.40.6),
                libglib2.0-dev (>= 2.39.90),
                libgtk-3-dev (>= 2.90.7),
-               libdbus-glib-1-dev (>= 0.76),
                libjson-glib-dev (>= 0.10),
                libgnome-desktop-3-dev (>= 3.9.91),
                libsm-dev,
@@ -111,9 +110,9 @@
          dbus-x11,
          gsettings-desktop-schemas,
          upower (>= 0.9.0),
-Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
+Recommends: libpam-systemd [linux-any]
 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
-Breaks: gdm (<< 3.8)
+Breaks: gdm3 (<< 3.8)
 Description: GNOME Session Manager - Minimal runtime
  The GNOME Session Manager is in charge of starting the core components
  of the GNOME desktop, and applications that should be launched at

=== modified file 'debian/control.in'
--- debian/control.in	2015-05-18 12:40:04 +0000
+++ debian/control.in	2015-06-05 20:00:45 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Build-Depends: cdbs (>= 0.4.41),
                dh-autoreconf,
                debhelper (>= 8),
@@ -13,7 +13,6 @@
                intltool (>= 0.40.6),
                libglib2.0-dev (>= 2.39.90),
                libgtk-3-dev (>= 2.90.7),
-               libdbus-glib-1-dev (>= 0.76),
                libjson-glib-dev (>= 0.10),
                libgnome-desktop-3-dev (>= 3.9.91),
                libsm-dev,
@@ -107,9 +106,9 @@
          dbus-x11,
          gsettings-desktop-schemas,
          upower (>= 0.9.0),
-Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
+Recommends: libpam-systemd [linux-any]
 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
-Breaks: gdm (<< 3.8)
+Breaks: gdm3 (<< 3.8)
 Description: GNOME Session Manager - Minimal runtime
  The GNOME Session Manager is in charge of starting the core components
  of the GNOME desktop, and applications that should be launched at

=== removed file 'debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch'
--- debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch	2015-05-18 12:40:04 +0000
+++ debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-From a9d7b5dc95c5fa52453fe7c2fe1be2163e4d93ca Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <[e-mail]>
-Date: Tue, 10 Feb 2015 16:34:38 +0000
-Subject: [PATCH] configure.ac: Add support for new versions of systemd
-
-(cherry picked from commit 3474df12baedcdf09743cdff60e59b4b78539601)
----
- configure.ac | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6485d57..9b95b26 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,8 +121,11 @@ AC_ARG_ENABLE([systemd],
-               [enable_systemd=auto])
- 
- PKG_CHECK_MODULES(SYSTEMD,
--                  [gio-unix-2.0 libsystemd-login >= 183 libsystemd-daemon libsystemd-journal],
--                  [have_systemd=yes], [have_systemd=no])
-+                  [gio-unix-2.0 libsystemd >= 209],
-+                  [have_systemd=yes],
-+                  [PKG_CHECK_MODULES([SYSTEMD],
-+                                     [gio-unix-2.0 libsystemd-login >= 183 libsystemd-daemon libsystemd-journal],
-+                                     [have_systemd=yes],[have_systemd=no])])
- 
- AC_MSG_CHECKING([whether to use systemd])
- 
--- 
-2.1.4
-

=== modified file 'debian/patches/103_kill_the_fail_whale.patch'
--- debian/patches/103_kill_the_fail_whale.patch	2015-03-10 05:14:29 +0000
+++ debian/patches/103_kill_the_fail_whale.patch	2015-06-05 20:00:45 +0000
@@ -1,22 +1,23 @@
-Index: gnome-session-3.14.0/gnome-session/gsm-fail-whale.c
+Index: gnome-session-3.15.92/gnome-session/gsm-fail-whale.c
 ===================================================================
---- gnome-session-3.14.0.orig/gnome-session/gsm-fail-whale.c
-+++ gnome-session-3.14.0/gnome-session/gsm-fail-whale.c
-@@ -18,6 +18,8 @@
- 
- #include <config.h>
+--- gnome-session-3.15.92.orig/gnome-session/gsm-fail-whale.c
++++ gnome-session-3.15.92/gnome-session/gsm-fail-whale.c
+@@ -21,6 +21,8 @@
+ #include <signal.h>
+ #include <stdlib.h>
  
 +#include <stdlib.h>
 +
  #include <glib/gi18n.h>
  #include <glib/gstdio.h>
  
-@@ -28,18 +30,7 @@ gsm_fail_whale_dialog_we_failed  (gboole
+@@ -37,25 +39,6 @@ gsm_fail_whale_dialog_we_failed  (gboole
                                    gboolean            allow_logout,
                                    GsmShellExtensions *extensions)
  {
 -        gint i;
 -        gchar *argv[5];
+-        GPid  pid;
 -
 -        i = 0;
 -        argv[i++] = LIBEXECDIR "/gnome-session-failed";
@@ -27,8 +28,14 @@
 -        if (extensions != NULL && gsm_shell_extensions_n_extensions (extensions) > 0)
 -                argv[i++] = "--extensions";
 -        argv[i++] = NULL;
- 
--        g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
+-
+-        if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL)) {
+-                exit (1);
+-        }
+-
+-        g_child_watch_add (pid,
+-                           (GChildWatchFunc)on_fail_whale_failed,
+-                           NULL);
 +        g_critical ("We failed, but the fail whale is dead. Sorry....");
 +        exit (1);
  }

=== modified file 'debian/patches/22_support_autostart_delay.patch'
--- debian/patches/22_support_autostart_delay.patch	2013-06-25 15:09:48 +0000
+++ debian/patches/22_support_autostart_delay.patch	2015-06-05 20:00:45 +0000
@@ -5,9 +5,11 @@
 Author: Chris Coulson <[e-mail]>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
 
---- a/gnome-session/gsm-app.c
-+++ b/gnome-session/gsm-app.c
-@@ -252,6 +252,7 @@
+Index: gnome-session-3.15.3/gnome-session/gsm-app.c
+===================================================================
+--- gnome-session-3.15.3.orig/gnome-session/gsm-app.c
++++ gnome-session-3.15.3/gnome-session/gsm-app.c
+@@ -310,6 +310,7 @@ gsm_app_class_init (GsmAppClass *klass)
          klass->impl_provides = NULL;
          klass->impl_get_provides = NULL;
          klass->impl_is_running = NULL;
@@ -15,7 +17,7 @@
  
          g_object_class_install_property (object_class,
                                           PROP_PHASE,
-@@ -456,7 +457,10 @@
+@@ -513,7 +514,10 @@ gboolean
  gsm_app_stop (GsmApp  *app,
                GError **error)
  {
@@ -27,8 +29,8 @@
  }
  
  void
-@@ -467,6 +471,18 @@
-         g_signal_emit (app, signals[REGISTERED], 0);
+@@ -524,6 +528,18 @@ gsm_app_registered (GsmApp *app)
+         return GSM_APP_GET_CLASS (app)->impl_stop (app, error);
  }
  
 +int
@@ -46,9 +48,11 @@
  void
  gsm_app_exited (GsmApp *app,
                  guchar  exit_code)
---- a/gnome-session/gsm-app.h
-+++ b/gnome-session/gsm-app.h
-@@ -66,6 +66,7 @@
+Index: gnome-session-3.15.3/gnome-session/gsm-app.h
+===================================================================
+--- gnome-session-3.15.3.orig/gnome-session/gsm-app.h
++++ gnome-session-3.15.3/gnome-session/gsm-app.h
+@@ -64,6 +64,7 @@ struct _GsmAppClass
                                                         GError    **error);
          gboolean    (*impl_stop)                      (GsmApp     *app,
                                                         GError    **error);
@@ -56,17 +60,19 @@
          gboolean    (*impl_provides)                  (GsmApp     *app,
                                                         const char *service);
          char **     (*impl_get_provides)              (GsmApp     *app);
-@@ -121,6 +122,7 @@
- gboolean         gsm_app_has_autostart_condition        (GsmApp     *app,
-                                                          const char *condition);
- void             gsm_app_registered                     (GsmApp     *app);
+@@ -119,6 +120,7 @@ char           **gsm_app_get_provides
+ gboolean         gsm_app_get_registered                 (GsmApp     *app);
+ void             gsm_app_set_registered                 (GsmApp     *app,
+                                                          gboolean  registered);
 +int              gsm_app_peek_autostart_delay           (GsmApp     *app);
  
- /* exported to bus */
- gboolean         gsm_app_get_app_id                     (GsmApp     *app,
---- a/gnome-session/gsm-autostart-app.c
-+++ b/gnome-session/gsm-autostart-app.c
-@@ -22,6 +22,7 @@
+ G_END_DECLS
+ 
+Index: gnome-session-3.15.3/gnome-session/gsm-autostart-app.c
+===================================================================
+--- gnome-session-3.15.3.orig/gnome-session/gsm-autostart-app.c
++++ gnome-session-3.15.3/gnome-session/gsm-autostart-app.c
+@@ -20,6 +20,7 @@
  #include <config.h>
  
  #include <ctype.h>
@@ -74,7 +80,7 @@
  #include <string.h>
  #include <sys/wait.h>
  #include <errno.h>
-@@ -70,6 +71,7 @@
+@@ -68,6 +69,7 @@ struct _GsmAutostartAppPrivate {
          char                 *condition_string;
          gboolean              condition;
          gboolean              autorestart;
@@ -82,7 +88,7 @@
  
          GFileMonitor         *condition_monitor;
          guint                 condition_notify_id;
-@@ -110,6 +112,7 @@
+@@ -105,6 +107,7 @@ gsm_autostart_app_init (GsmAutostartApp
          app->priv->pid = -1;
          app->priv->condition_monitor = NULL;
          app->priv->condition = FALSE;
@@ -90,7 +96,7 @@
  }
  
  static gboolean
-@@ -665,6 +668,20 @@
+@@ -678,6 +681,20 @@ load_desktop_file (GsmAutostartApp  *app
                                                                     "AutostartCondition");
          setup_condition_monitor (app);
  
@@ -111,7 +117,7 @@
          g_object_set (app,
                        "phase", phase,
                        "startup-id", startup_id,
-@@ -1361,6 +1378,14 @@
+@@ -1347,6 +1364,14 @@ gsm_autostart_app_get_app_id (GsmApp *ap
          }
  }
  
@@ -126,7 +132,7 @@
  static gboolean
  gsm_autostart_app_initable_init (GInitable *initable,
                                   GCancellable *cancellable,
-@@ -1408,6 +1433,7 @@
+@@ -1394,6 +1419,7 @@ gsm_autostart_app_class_init (GsmAutosta
          app_class->impl_has_autostart_condition = gsm_autostart_app_has_autostart_condition;
          app_class->impl_get_app_id = gsm_autostart_app_get_app_id;
          app_class->impl_get_autorestart = gsm_autostart_app_get_autorestart;
@@ -134,9 +140,11 @@
  
          g_object_class_install_property (object_class,
                                           PROP_DESKTOP_FILENAME,
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -424,7 +424,8 @@
+Index: gnome-session-3.15.3/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-3.15.3.orig/gnome-session/gsm-manager.c
++++ gnome-session-3.15.3/gnome-session/gsm-manager.c
+@@ -420,7 +420,8 @@ app_condition_changed (GsmApp     *app,
                  } else {
                          g_debug ("GsmManager: stopping app %s", gsm_app_peek_id (app));
  
@@ -146,7 +154,7 @@
                          error = NULL;
                          res = gsm_app_stop (app, &error);
                          if (! res) {
-@@ -724,10 +725,36 @@
+@@ -741,10 +742,36 @@ on_phase_timeout (GsmManager *manager)
  }
  
  static gboolean
@@ -183,7 +191,7 @@
          if (gsm_app_peek_phase (app) != manager->priv->phase) {
                  goto out;
          }
-@@ -745,6 +772,18 @@
+@@ -762,6 +789,18 @@ _start_app (const char *id,
                  goto out;
          }
  
@@ -202,7 +210,7 @@
          if (!start_app_or_warn (manager, app))
                  goto out;
  
-@@ -1554,11 +1593,12 @@
+@@ -1376,11 +1415,12 @@ _debug_app_for_phase (const char *id,
                  return FALSE;
          }
  
@@ -217,9 +225,11 @@
  
          return FALSE;
  }
---- a/gnome-session/gsm-autostart-app.h
-+++ b/gnome-session/gsm-autostart-app.h
-@@ -72,6 +72,7 @@
+Index: gnome-session-3.15.3/gnome-session/gsm-autostart-app.h
+===================================================================
+--- gnome-session-3.15.3.orig/gnome-session/gsm-autostart-app.h
++++ gnome-session-3.15.3/gnome-session/gsm-autostart-app.h
+@@ -70,6 +70,7 @@ void    gsm_autostart_app_add_provides
  #define GSM_AUTOSTART_APP_DBUS_PATH_KEY   "X-GNOME-DBus-Path"
  #define GSM_AUTOSTART_APP_DBUS_ARGS_KEY   "X-GNOME-DBus-Start-Arguments"
  #define GSM_AUTOSTART_APP_DISCARD_KEY     "X-GNOME-Autostart-discard-exec"

=== modified file 'debian/patches/95_dbus_request_shutdown.patch'
--- debian/patches/95_dbus_request_shutdown.patch	2014-10-31 04:29:34 +0000
+++ debian/patches/95_dbus_request_shutdown.patch	2015-06-05 20:00:45 +0000
@@ -2,12 +2,15 @@
 other applications to shutdown or reboot the machine via the session manager
 Author: Chris Coulson <[e-mail]>
 
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -3116,6 +3116,48 @@
+Index: gnome-session-3.15.3/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-3.15.3.orig/gnome-session/gsm-manager.c
++++ gnome-session-3.15.3/gnome-session/gsm-manager.c
+@@ -2433,6 +2433,47 @@ request_logout (GsmManager           *ma
+         end_phase (manager);
  }
  
- gboolean
++gboolean
 +gsm_manager_request_shutdown (GsmManager *manager,
 +                              GError    **error)
 +{
@@ -39,37 +42,38 @@
 +        if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
 +                g_set_error (error,
 +                             GSM_MANAGER_ERROR,
-+                             GSM_MANAGER_ERROR_NOT_IN_RUNNING,
++                            GSM_MANAGER_ERROR_NOT_IN_RUNNING,
 +                             "RequestReboot interface is only available during the Running phase");
 +                return FALSE;
 +        }
-+
 +        request_reboot (manager);
 +
 +        return TRUE;
 +}
 +
-+gboolean
- gsm_manager_shutdown (GsmManager            *manager,
-                       DBusGMethodInvocation *context)
- {
---- a/gnome-session/gsm-manager.h
-+++ b/gnome-session/gsm-manager.h
-@@ -159,7 +159,10 @@
-                                                                 guint                  flags,
-                                                                 gboolean              *is_inhibited,
-                                                                 GError                *error);
--
+ static gboolean
+ gsm_manager_shutdown (GsmExportedManager    *skeleton,
+                       GDBusMethodInvocation *invocation,
+Index: gnome-session-3.15.3/gnome-session/gsm-manager.h
+===================================================================
+--- gnome-session-3.15.3.orig/gnome-session/gsm-manager.h
++++ gnome-session-3.15.3/gnome-session/gsm-manager.h
+@@ -122,6 +122,10 @@ void                _gsm_manager_set_act
+ gboolean            gsm_manager_logout                         (GsmManager     *manager,
+                                                                 guint           logout_mode,
+                                                                 GError        **error);
 +gboolean            gsm_manager_request_shutdown               (GsmManager     *manager,
 +                                                                GError        **error);
 +gboolean            gsm_manager_request_reboot                 (GsmManager     *manager,
-+                                                                GError        **error);  
- gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
-                                                                 DBusGMethodInvocation *context);
- gboolean            gsm_manager_reboot                         (GsmManager     *manager,
---- a/gnome-session/org.gnome.SessionManager.xml
-+++ b/gnome-session/org.gnome.SessionManager.xml
-@@ -348,6 +348,23 @@
++                                                                GError        **error);
+ 
+ gboolean            gsm_manager_set_phase                      (GsmManager     *manager,
+                                                                 GsmManagerPhase phase);
+Index: gnome-session-3.15.3/gnome-session/org.gnome.SessionManager.xml
+===================================================================
+--- gnome-session-3.15.3.orig/gnome-session/org.gnome.SessionManager.xml
++++ gnome-session-3.15.3/gnome-session/org.gnome.SessionManager.xml
+@@ -342,6 +342,23 @@
        </doc:doc>
      </method>
  

=== removed file 'debian/patches/git_add_disable_acceleration_option.patch'
--- debian/patches/git_add_disable_acceleration_option.patch	2015-03-20 06:41:37 +0000
+++ debian/patches/git_add_disable_acceleration_option.patch	1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-From d44fe3181c82f4739fc37b745f6f0ac7b6f36efa Mon Sep 17 00:00:00 2001
-From: Mike DePaulo <[e-mail]>
-Date: Sun, 9 Nov 2014 10:53:49 -0500
-Subject: [PATCH] Add new commandline option - disable-acceleration-check
-
-Some other lines were moved around so that debug logging will work
-at the time of acceleration check.
----
- gnome-session/main.c | 78 ++++++++++++++++++++++++++++------------------------
- 1 file changed, 42 insertions(+), 36 deletions(-)
-
-diff --git a/gnome-session/main.c b/gnome-session/main.c
-index fce5e86..f591a4a 100644
---- a/gnome-session/main.c
-+++ b/gnome-session/main.c
-@@ -55,6 +55,7 @@ static gboolean failsafe = FALSE;
- static gboolean show_version = FALSE;
- static gboolean debug = FALSE;
- static gboolean please_fail = FALSE;
-+static gboolean disable_acceleration_check = FALSE;
- 
- static DBusGProxy *bus_proxy = NULL;
- 
-@@ -307,6 +308,7 @@ main (int argc, char **argv)
-                 { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL },
-                 /* Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong */
-                 { "whale", 0, 0, G_OPTION_ARG_NONE, &please_fail, N_("Show the fail whale dialog for testing"), NULL },
-+                { "disable-acceleration-check", 0, 0, G_OPTION_ARG_NONE, &disable_acceleration_check, N_("Disable hardware acceleration check"), NULL },
-                 { NULL, 0, 0, 0, NULL, NULL, NULL }
-         };
- 
-@@ -315,25 +317,6 @@ main (int argc, char **argv)
-                 gsm_util_init_error (TRUE, "%s", error->message);
-         }
- 
--        /* Check GL, if it doesn't work out then force software fallback */
--        if (!check_gl (&error)) {
--                gl_failed = TRUE;
--
--                g_debug ("hardware acceleration check failed: %s",
--                         error? error->message : "");
--                g_clear_error (&error);
--                if (g_getenv ("LIBGL_ALWAYS_SOFTWARE") == NULL) {
--                        g_setenv ("LIBGL_ALWAYS_SOFTWARE", "1", TRUE);
--                        if (!check_gl (&error)) {
--                                g_warning ("software acceleration check failed: %s",
--                                           error? error->message : "");
--                                g_clear_error (&error);
--                        } else {
--                                gl_failed = FALSE;
--                        }
--                }
--        }
--
-         bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-         textdomain (GETTEXT_PACKAGE);
-@@ -349,11 +332,6 @@ main (int argc, char **argv)
- 
-         g_option_context_free (options);
- 
--        if (show_version) {
--                g_print ("%s %s\n", argv [0], VERSION);
--                exit (0);
--        }
--
-         /* Rebind stdout/stderr to the journal explicitly, so that
-          * journald picks ups the nicer "gnome-session" as the program
-          * name instead of whatever shell script GDM happened to use.
-@@ -370,21 +348,49 @@ main (int argc, char **argv)
-         }
- #endif
- 
--        if (gl_failed) {
--                gsm_fail_whale_dialog_we_failed (FALSE, TRUE, NULL);
--                gsm_main ();
--                exit (1);
--        }
--
--        if (please_fail) {
--                gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
--                gsm_main ();
--                exit (1);
--        }
--
-         gdm_log_init ();
-         gdm_log_set_debug (debug);
- 
-+        if (disable_acceleration_check) {
-+                g_debug ("hardware acceleration check is disabled");
-+        } else {
-+                /* Check GL, if it doesn't work out then force software fallback */
-+                if (!check_gl (&error)) {
-+                        gl_failed = TRUE;
-+
-+                        g_debug ("hardware acceleration check failed: %s",
-+                                 error? error->message : "");
-+                        g_clear_error (&error);
-+                        if (g_getenv ("LIBGL_ALWAYS_SOFTWARE") == NULL) {
-+                                g_setenv ("LIBGL_ALWAYS_SOFTWARE", "1", TRUE);
-+                                if (!check_gl (&error)) {
-+                                        g_warning ("software acceleration check failed: %s",
-+                                                   error? error->message : "");
-+                                        g_clear_error (&error);
-+                                } else {
-+                                        gl_failed = FALSE;
-+                                }
-+                        }
-+                }
-+        }
-+
-+        if (show_version) {
-+                g_print ("%s %s\n", argv [0], VERSION);
-+                exit (0);
-+        }
-+
-+        if (gl_failed) {
-+                gsm_fail_whale_dialog_we_failed (FALSE, TRUE, NULL);
-+                gsm_main ();
-+                exit (1);
-+        }
-+
-+        if (please_fail) {
-+                gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
-+                gsm_main ();
-+                exit (1);
-+        }
-+
-         /* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
-          * older versions of GDM,  other display managers, and startx,
-          * set a fallback value if we don't find it set.
--- 
-1.9.1
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-05-18 12:40:04 +0000
+++ debian/patches/series	2015-06-05 20:00:45 +0000
@@ -6,5 +6,3 @@
 53_add_sessionmigration.patch
 95_dbus_request_shutdown.patch
 103_kill_the_fail_whale.patch
-git_add_disable_acceleration_option.patch
-0001-configure.ac-Add-support-for-new-versions-of-systemd.patch