r35287 - in /desktop/unstable/gdm3/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jun 9 15:35:10 UTC 2012
Author: joss
Date: Sat Jun 9 15:35:10 2012
New Revision: 35287
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35287
Log:
* Force disable systemd support.
* 06_first_vt.patch, 17_switch_on_finish.patch: refreshed.
* 07_libexec-paths.patch: use the binary path as provided by g-s-d.pc.
* 10_gdm3_pam.patch: handle the bucket of FAIL that is hardcoding the
service name in various places since split authentication was
introduced.
* 18_parametrize_create_display.patch,
19_static_transient_display.patch, 20_switch_kill_greeter.patch,
21_static_display_purge.patch: adapt to systemd/multiseat changes.
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/control.in
desktop/unstable/gdm3/debian/patches/06_first_vt.patch
desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch
desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch
desktop/unstable/gdm3/debian/patches/17_switch_on_finish.patch
desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch
desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch
desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch
desktop/unstable/gdm3/debian/patches/21_static_display_purge.patch
desktop/unstable/gdm3/debian/rules
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sat Jun 9 15:35:10 2012
@@ -77,6 +77,15 @@
* Add the metacity default to gsettings too.
* Require a metacity version which supports gsettings.
* Get rid of anything related to GConf.
+ * Force disable systemd support.
+ * 06_first_vt.patch, 17_switch_on_finish.patch: refreshed.
+ * 07_libexec-paths.patch: use the binary path as provided by g-s-d.pc.
+ * 10_gdm3_pam.patch: handle the bucket of FAIL that is hardcoding the
+ service name in various places since split authentication was
+ introduced.
+ * 18_parametrize_create_display.patch,
+ 19_static_transient_display.patch, 20_switch_kill_greeter.patch,
+ 21_static_display_purge.patch: adapt to systemd/multiseat changes.
-- Laurent Bigonville <bigon at debian.org> Fri, 23 Mar 2012 11:36:02 +0100
Modified: desktop/unstable/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/control.in?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gdm3/debian/control.in [utf-8] Sat Jun 9 15:35:10 2012
@@ -20,6 +20,7 @@
libaccountsservice-dev (>= 0.6.12),
gnome-settings-daemon-dev (>= 2.91.2),
gnome-settings-daemon (>= 2.91.2),
+ libck-connector-dev,
libnss3-dev (>= 3.11.1),
libx11-dev,
libxau-dev,
Modified: desktop/unstable/gdm3/debian/patches/06_first_vt.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/06_first_vt.patch?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/06_first_vt.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/06_first_vt.patch [utf-8] Sat Jun 9 15:35:10 2012
@@ -1,9 +1,9 @@
It's almost the same tty manager of gdm 2.20, except we don't support Sun VTs,
only Linux and FreeBSD.
-Index: gdm-3.0.4/common/gdm-settings-keys.h
+Index: gdm-3.4.1/common/gdm-settings-keys.h
===================================================================
---- gdm-3.0.4.orig/common/gdm-settings-keys.h 2011-05-31 16:28:03.000000000 +0200
-+++ gdm-3.0.4/common/gdm-settings-keys.h 2011-06-06 11:20:01.927523114 +0200
+--- gdm-3.4.1.orig/common/gdm-settings-keys.h 2012-04-14 20:52:00.000000000 +0200
++++ gdm-3.4.1/common/gdm-settings-keys.h 2012-06-09 15:53:17.011212473 +0200
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
#define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
#define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
@@ -12,13 +12,13 @@
#define GDM_KEY_DEBUG "debug/Enable"
-Index: gdm-3.0.4/daemon/gdm-server.c
+Index: gdm-3.4.1/daemon/gdm-server.c
===================================================================
---- gdm-3.0.4.orig/daemon/gdm-server.c 2011-05-31 16:52:04.000000000 +0200
-+++ gdm-3.0.4/daemon/gdm-server.c 2011-06-06 11:20:33.539677601 +0200
-@@ -48,6 +48,9 @@
- #include "gdm-common.h"
- #include "gdm-signal-handler.h"
+--- gdm-3.4.1.orig/daemon/gdm-server.c 2012-04-14 20:52:00.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-server.c 2012-06-09 15:53:17.011212473 +0200
+@@ -54,6 +54,9 @@
+ #include "gdm-settings-direct.h"
+ #include "gdm-settings-keys.h"
+#include "gdm-settings-direct.h"
+#include "gdm-settings-keys.h"
@@ -26,7 +26,7 @@
#include "gdm-server.h"
extern char **environ;
-@@ -673,6 +676,213 @@ gdm_server_spawn (GdmServer *server,
+@@ -751,6 +754,213 @@ gdm_server_spawn (GdmServer *server,
return ret;
}
@@ -240,7 +240,7 @@
/**
* gdm_server_start:
* @disp: Pointer to a GdmDisplay structure
-@@ -684,10 +894,14 @@ gboolean
+@@ -762,10 +972,14 @@ gboolean
gdm_server_start (GdmServer *server)
{
gboolean res;
@@ -256,10 +256,10 @@
return res;
}
-Index: gdm-3.0.4/data/gdm.schemas.in.in
+Index: gdm-3.4.1/data/gdm.schemas.in.in
===================================================================
---- gdm-3.0.4.orig/data/gdm.schemas.in.in 2011-05-31 16:28:03.000000000 +0200
-+++ gdm-3.0.4/data/gdm.schemas.in.in 2011-06-06 11:20:01.931523138 +0200
+--- gdm-3.4.1.orig/data/gdm.schemas.in.in 2012-04-14 20:52:00.000000000 +0200
++++ gdm-3.4.1/data/gdm.schemas.in.in 2012-06-09 15:53:17.011212473 +0200
@@ -47,6 +47,11 @@
<signature>i</signature>
<default>30</default>
Modified: desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/07_libexec-paths.patch [utf-8] Sat Jun 9 15:35:10 2012
@@ -1,10 +1,10 @@
GNOME #645918
-Index: gdm-3.2.1.1/daemon/gdm-server.c
+Index: gdm-3.4.1/daemon/gdm-server.c
===================================================================
---- gdm-3.2.1.1.orig/daemon/gdm-server.c 2011-12-17 03:25:47.000000000 +0100
-+++ gdm-3.2.1.1/daemon/gdm-server.c 2011-12-17 03:27:51.248986991 +0100
-@@ -134,7 +134,7 @@ _gdm_server_query_ck_for_display_device
+--- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-09 15:53:17.011212473 +0200
++++ gdm-3.4.1/daemon/gdm-server.c 2012-06-09 15:54:36.031598779 +0200
+@@ -142,7 +142,7 @@ _gdm_server_query_ck_for_display_device
g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
error = NULL;
@@ -13,24 +13,24 @@
server->priv->display_name);
g_debug ("GdmServer: Running helper %s", command);
-Index: gdm-3.2.1.1/gui/simple-chooser/gdm-chooser-session.c
+Index: gdm-3.4.1/gui/simple-chooser/gdm-chooser-session.c
===================================================================
---- gdm-3.2.1.1.orig/gui/simple-chooser/gdm-chooser-session.c 2011-10-19 17:41:52.000000000 +0200
-+++ gdm-3.2.1.1/gui/simple-chooser/gdm-chooser-session.c 2011-12-17 03:27:51.248986991 +0100
+--- gdm-3.4.1.orig/gui/simple-chooser/gdm-chooser-session.c 2011-09-04 20:44:17.000000000 +0200
++++ gdm-3.4.1/gui/simple-chooser/gdm-chooser-session.c 2012-06-09 16:06:24.735063457 +0200
@@ -131,7 +131,7 @@ start_settings_daemon (GdmChooserSession
ret = FALSE;
error = NULL;
- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+ g_spawn_command_line_async (GSD_LIBEXECDIR "/gnome-settings-daemon", &error);
++ g_spawn_command_line_async (GSD_BINARY, &error);
if (error != NULL) {
g_warning ("Error starting settings daemon: %s", error->message);
g_error_free (error);
-Index: gdm-3.2.1.1/configure.ac
+Index: gdm-3.4.1/configure.ac
===================================================================
---- gdm-3.2.1.1.orig/configure.ac 2011-12-17 03:24:25.000000000 +0100
-+++ gdm-3.2.1.1/configure.ac 2011-12-17 03:49:29.831335428 +0100
-@@ -68,6 +68,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
+--- gdm-3.4.1.orig/configure.ac 2012-06-09 15:52:59.475126744 +0200
++++ gdm-3.4.1/configure.ac 2012-06-09 16:44:13.078152829 +0200
+@@ -67,6 +67,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
FONTCONFIG_REQUIRED_VERSION=2.5.0
UPOWER_REQUIRED_VERSION=0.9.0
ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
@@ -38,7 +38,7 @@
NSS_REQUIRED_VERSION=3.11.1
EXTRA_COMPILE_WARNINGS(yes)
-@@ -203,6 +204,33 @@ LIBGDMGREETER_GIR_INCLUDES="GLib-2.0 GOb
+@@ -187,6 +188,31 @@ LIBGDMGREETER_GIR_INCLUDES="GLib-2.0 GOb
AC_SUBST(LIBGDMGREETER_GIR_INCLUDES)
dnl ---------------------------------------------------------------------------
@@ -48,12 +48,10 @@
+PKG_CHECK_MODULES(GSD,
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+)
-+GSD_LIBEXECDIR=`pkg-config --variable=libexecdir gnome-settings-daemon`
-+AC_SUBST(GSD_LIBEXECDIR)
-+AC_DEFINE_UNQUOTED([GSD_LIBEXECDIR], "$GSD_LIBEXECDIR", [Path to the GNOME settings daemon])
++GSD_BINARY=`pkg-config --variable=binary gnome-settings-daemon`
++AC_SUBST(GSD_BINARY)
+
-+
-+dnl This should be done with pkg-config, but ConsoleKit and PolicyKit don’t
++dnl This should be done with pkg-config, but ConsoleKit doesn’t
+dnl ship .pc files
+dnl Because of that we only handle the case where libexecdir is the same
+dnl (e.g. Red Hat), and the case where libexecdir = pkglibdir (e.g. Debian)
@@ -63,7 +61,7 @@
+ AC_MSG_RESULT($libexecdir)
+ CK_LIBEXECDIR="$libexecdir"
+else
-+ AC_MSG_RESULT("$libdir/Consolekit, $libdir/policykit-1-gnome, $libdir/gnome-session")
++ AC_MSG_RESULT("$libdir/Consolekit")
+ CK_LIBEXECDIR="$libdir/ConsoleKit"
+fi
+AC_SUBST(CK_LIBEXECDIR)
@@ -72,10 +70,10 @@
dnl - Configuration file stuff
dnl ---------------------------------------------------------------------------
-Index: gdm-3.2.1.1/daemon/Makefile.am
+Index: gdm-3.4.1/daemon/Makefile.am
===================================================================
---- gdm-3.2.1.1.orig/daemon/Makefile.am 2011-10-19 17:41:52.000000000 +0200
-+++ gdm-3.2.1.1/daemon/Makefile.am 2011-12-17 03:27:51.256987029 +0100
+--- gdm-3.4.1.orig/daemon/Makefile.am 2012-04-14 20:52:00.000000000 +0200
++++ gdm-3.4.1/daemon/Makefile.am 2012-06-09 16:43:11.457851581 +0200
@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
-DGDMCONFDIR=\"$(gdmconfdir)\" \
-DLIBDIR=\"$(libdir)\" \
@@ -84,3 +82,15 @@
-DLOGDIR=\"$(logdir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+Index: gdm-3.4.1/gui/simple-chooser/Makefile.am
+===================================================================
+--- gdm-3.4.1.orig/gui/simple-chooser/Makefile.am 2011-09-04 20:44:17.000000000 +0200
++++ gdm-3.4.1/gui/simple-chooser/Makefile.am 2012-06-09 16:17:50.334415186 +0200
+@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
+ -DSBINDIR=\""$(sbindir)"\" \
+ -DPIXMAPDIR=\""$(pixmapdir)"\" \
+ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
++ -DGSD_BINARY="\"$(GSD_BINARY)\"" \
+ $(GTK_CFLAGS) \
+ $(XLIB_CFLAGS) \
+ $(XDMCP_CFLAGS) \
Modified: desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/10_gdm3_pam.patch [utf-8] Sat Jun 9 15:35:10 2012
@@ -1,7 +1,7 @@
-Index: gdm-3.2.1.1/daemon/gdm-simple-slave.c
+Index: gdm-3.4.1/daemon/gdm-simple-slave.c
===================================================================
---- gdm-3.2.1.1.orig/daemon/gdm-simple-slave.c 2011-12-17 03:58:58.000000000 +0100
-+++ gdm-3.2.1.1/daemon/gdm-simple-slave.c 2011-12-17 14:52:37.177845880 +0100
+--- gdm-3.4.1.orig/daemon/gdm-simple-slave.c 2012-06-09 16:44:24.794210103 +0200
++++ gdm-3.4.1/daemon/gdm-simple-slave.c 2012-06-09 16:44:24.862210431 +0200
@@ -740,7 +740,7 @@ start_autologin_conversation_if_necessar
g_debug ("GdmSimpleSlave: Starting automatic login conversation");
@@ -11,7 +11,7 @@
}
static void
-@@ -1067,7 +1067,7 @@ on_greeter_begin_auto_login (GdmGreeterS
+@@ -1070,7 +1070,7 @@ on_greeter_begin_auto_login (GdmGreeterS
return;
}
gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
@@ -20,11 +20,11 @@
username);
}
-Index: gdm-3.2.1.1/configure.ac
+Index: gdm-3.4.1/configure.ac
===================================================================
---- gdm-3.2.1.1.orig/configure.ac 2011-12-17 03:49:29.000000000 +0100
-+++ gdm-3.2.1.1/configure.ac 2011-12-17 14:51:10.101420180 +0100
-@@ -535,6 +535,21 @@ else
+--- gdm-3.4.1.orig/configure.ac 2012-06-09 16:44:13.078152829 +0200
++++ gdm-3.4.1/configure.ac 2012-06-09 16:44:24.862210431 +0200
+@@ -522,6 +522,21 @@ else
fi
AC_SUBST(PAM_PREFIX)
@@ -46,10 +46,10 @@
have_pam=no
AC_CHECK_LIB(pam, pam_start, have_pam=yes)
-Index: gdm-3.2.1.1/gui/simple-greeter/extensions/unified/Makefile.am
+Index: gdm-3.4.1/gui/simple-greeter/extensions/unified/Makefile.am
===================================================================
---- gdm-3.2.1.1.orig/gui/simple-greeter/extensions/unified/Makefile.am 2011-10-19 17:41:52.000000000 +0200
-+++ gdm-3.2.1.1/gui/simple-greeter/extensions/unified/Makefile.am 2011-12-17 14:56:51.051087003 +0100
+--- gdm-3.4.1.orig/gui/simple-greeter/extensions/unified/Makefile.am 2012-06-09 16:43:11.457851581 +0200
++++ gdm-3.4.1/gui/simple-greeter/extensions/unified/Makefile.am 2012-06-09 16:44:24.862210431 +0200
@@ -1,5 +1,5 @@
NULL =
-PAM_SERVICE_NAME = gdm
@@ -57,3 +57,84 @@
extensiondir = $(GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR)/unified
extension_DATA = page.ui
+Index: gdm-3.4.1/daemon/Makefile.am
+===================================================================
+--- gdm-3.4.1.orig/daemon/Makefile.am 2012-06-09 16:43:11.457851581 +0200
++++ gdm-3.4.1/daemon/Makefile.am 2012-06-09 16:44:24.866210456 +0200
+@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
+ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ -DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
++ -DGDM_PAM_DOMAIN="\"$(GDM_PAM_DOMAIN)\"" \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DAEMON_CFLAGS) \
+ $(XLIB_CFLAGS) \
+Index: gdm-3.4.1/daemon/gdm-greeter-server.c
+===================================================================
+--- gdm-3.4.1.orig/daemon/gdm-greeter-server.c 2012-06-09 16:43:11.457851581 +0200
++++ gdm-3.4.1/daemon/gdm-greeter-server.c 2012-06-09 16:45:39.662576078 +0200
+@@ -253,7 +253,7 @@ translate_outgoing_service_name (GdmGree
+ const char *service_name)
+ {
+ #ifndef ENABLE_SPLIT_AUTHENTICATION
+- if (strcmp (service_name, "gdm") == 0 && greeter_server->priv->using_legacy_service_name) {
++ if (strcmp (service_name, GDM_PAM_DOMAIN) == 0 && greeter_server->priv->using_legacy_service_name) {
+ return "gdm-password";
+ }
+ #endif
+@@ -268,7 +268,7 @@ translate_incoming_service_name (GdmGree
+ #ifndef ENABLE_SPLIT_AUTHENTICATION
+ if (strcmp (service_name, "gdm-password") == 0) {
+ g_debug ("GdmGreeterServer: Adjusting pam service from '%s' to 'gdm' for legacy compatibility", service_name);
+- service_name = "gdm";
++ service_name = GDM_PAM_DOMAIN;
+ greeter_server->priv->using_legacy_service_name = TRUE;
+ } else if (g_str_has_prefix (service_name, "gdm-") && strcmp (service_name, "gdm-autologin") != 0) {
+ g_debug ("GdmGreeterServer: Rejecting pam service '%s' for legacy compatibility", service_name);
+Index: gdm-3.4.1/daemon/test-session.c
+===================================================================
+--- gdm-3.4.1.orig/daemon/test-session.c 2012-06-09 16:43:11.457851581 +0200
++++ gdm-3.4.1/daemon/test-session.c 2012-06-09 16:44:24.866210456 +0200
+@@ -279,7 +279,7 @@ main (int argc,
+ username = argv[1];
+ }
+
+- gdm_session_start_conversation (GDM_SESSION (session), "gdm");
++ gdm_session_start_conversation (GDM_SESSION (session), "gdm3");
+
+ g_signal_connect (session,
+ "conversation-started",
+Index: gdm-3.4.1/gui/simple-greeter/Makefile.am
+===================================================================
+--- gdm-3.4.1.orig/gui/simple-greeter/Makefile.am 2012-06-09 16:46:56.766953047 +0200
++++ gdm-3.4.1/gui/simple-greeter/Makefile.am 2012-06-09 16:47:06.959002879 +0200
+@@ -19,6 +19,7 @@ AM_CPPFLAGS = \
+ -DSBINDIR=\""$(sbindir)"\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
++ -DGDM_PAM_DOMAIN="\"$(GDM_PAM_DOMAIN)\"" \
+ $(UPOWER_CFLAGS) \
+ -DGDM_SIMPLE_GREETER_PLUGINS_DIR="\"$(GDM_SIMPLE_GREETER_PLUGINS_DIR)\""\
+ $(DISABLE_DEPRECATED_CFLAGS) \
+Index: gdm-3.4.1/gui/simple-greeter/gdm-greeter-login-window.c
+===================================================================
+--- gdm-3.4.1.orig/gui/simple-greeter/gdm-greeter-login-window.c 2012-04-14 20:52:00.000000000 +0200
++++ gdm-3.4.1/gui/simple-greeter/gdm-greeter-login-window.c 2012-06-09 16:49:09.279600877 +0200
+@@ -756,7 +756,7 @@ begin_other_verification (GdmGreeterLogi
+ if (find_extension_with_service_name (login_window, "gdm-password") != NULL) {
+ begin_single_service_verification (login_window, "gdm-password");
+ } else {
+- begin_single_service_verification (login_window, "gdm");
++ begin_single_service_verification (login_window, GDM_PAM_DOMAIN);
+ }
+ }
+
+@@ -988,7 +988,7 @@ handle_stopped_conversation (GdmGreeterL
+ * FIXME: we need to get this policy out of the source code
+ */
+ if (strcmp (service_name, "gdm-password") == 0 ||
+- strcmp (service_name, "gdm") == 0) {
++ strcmp (service_name, GDM_PAM_DOMAIN) == 0) {
+ g_debug ("GdmGreeterLoginWindow: main conversation failed, starting over");
+ restart_conversations (login_window);
+ reset_dialog_after_messages (login_window, MODE_SELECTION);
Modified: desktop/unstable/gdm3/debian/patches/17_switch_on_finish.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/17_switch_on_finish.patch?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/17_switch_on_finish.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/17_switch_on_finish.patch [utf-8] Sat Jun 9 15:35:10 2012
@@ -27,10 +27,10 @@
daemon/gdm-transient-display.c | 1 +
5 files changed, 86 insertions(+), 0 deletions(-)
-diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
-index abedc0b..84b4925 100644
---- a/daemon/gdm-display.c
-+++ b/daemon/gdm-display.c
+Index: gdm-3.4.1/daemon/gdm-display.c
+===================================================================
+--- gdm-3.4.1.orig/daemon/gdm-display.c 2012-04-14 20:52:00.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-display.c 2012-06-09 16:50:53.460110189 +0200
@@ -66,6 +66,7 @@ struct GdmDisplayPrivate
GdmDisplayAccessFile *access_file;
@@ -47,7 +47,7 @@
PROP_SLAVE_COMMAND,
};
-@@ -134,6 +136,14 @@ gdm_display_get_status (GdmDisplay *display)
+@@ -134,6 +136,14 @@ gdm_display_get_status (GdmDisplay *disp
return display->priv->status;
}
@@ -62,7 +62,7 @@
static GdmDisplayAccessFile *
_create_access_file_for_user (GdmDisplay *display,
const char *username,
-@@ -824,6 +834,30 @@ _gdm_display_set_is_local (GdmDisplay *display,
+@@ -834,6 +844,30 @@ _gdm_display_set_is_local (GdmDisplay
}
static void
@@ -93,7 +93,7 @@
_gdm_display_set_slave_command (GdmDisplay *display,
const char *command)
{
-@@ -866,6 +900,9 @@ gdm_display_set_property (GObject *object,
+@@ -876,6 +910,9 @@ gdm_display_set_property (GObject
case PROP_IS_LOCAL:
_gdm_display_set_is_local (self, g_value_get_boolean (value));
break;
@@ -103,7 +103,7 @@
case PROP_SLAVE_COMMAND:
_gdm_display_set_slave_command (self, g_value_get_string (value));
break;
-@@ -914,6 +951,9 @@ gdm_display_get_property (GObject *object,
+@@ -924,6 +961,9 @@ gdm_display_get_property (GObject
case PROP_IS_LOCAL:
g_value_set_boolean (value, self->priv->is_local);
break;
@@ -113,26 +113,26 @@
case PROP_SLAVE_COMMAND:
g_value_set_string (value, self->priv->slave_command);
break;
-@@ -1086,6 +1126,14 @@ gdm_display_class_init (GdmDisplayClass *klass)
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
- g_object_class_install_property (object_class,
+@@ -1093,6 +1133,14 @@ gdm_display_class_init (GdmDisplayClass
+ NULL,
+ NULL,
+ TRUE,
++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
++
++ g_object_class_install_property (object_class,
+ PROP_SWITCH_ON_FINISH,
+ g_param_spec_boolean ("switch-on-finish",
+ NULL,
+ NULL,
+ TRUE,
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-+
-+ g_object_class_install_property (object_class,
- PROP_SLAVE_COMMAND,
- g_param_spec_string ("slave-command",
- "slave command",
-diff --git a/daemon/gdm-display.h b/daemon/gdm-display.h
-index 607ea1d..e3aa860 100644
---- a/daemon/gdm-display.h
-+++ b/daemon/gdm-display.h
-@@ -88,6 +88,7 @@ GQuark gdm_display_error_quark (void);
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+ g_object_class_install_property (object_class,
+Index: gdm-3.4.1/daemon/gdm-display.h
+===================================================================
+--- gdm-3.4.1.orig/daemon/gdm-display.h 2012-04-14 20:52:00.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-display.h 2012-06-09 16:50:53.460110189 +0200
+@@ -88,6 +88,7 @@ GQuark gdm_display_error_qu
GType gdm_display_get_type (void);
int gdm_display_get_status (GdmDisplay *display);
@@ -140,7 +140,7 @@
time_t gdm_display_get_creation_time (GdmDisplay *display);
char * gdm_display_get_user_auth (GdmDisplay *display);
-@@ -140,6 +141,9 @@ gboolean gdm_display_remove_user_authorization (GdmDisplay *disp
+@@ -140,6 +141,9 @@ gboolean gdm_display_remove_u
gboolean gdm_display_set_slave_bus_name (GdmDisplay *display,
const char *name,
GError **error);
@@ -150,10 +150,10 @@
G_END_DECLS
-diff --git a/daemon/gdm-display.xml b/daemon/gdm-display.xml
-index a92e37f..d3ce4a4 100644
---- a/daemon/gdm-display.xml
-+++ b/daemon/gdm-display.xml
+Index: gdm-3.4.1/daemon/gdm-display.xml
+===================================================================
+--- gdm-3.4.1.orig/daemon/gdm-display.xml 2012-04-14 20:52:00.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-display.xml 2012-06-09 16:50:53.460110189 +0200
@@ -35,6 +35,9 @@
<method name="SetSlaveBusName">
<arg name="name" direction="in" type="s"/>
@@ -164,12 +164,12 @@
<method name="GetTimedLoginDetails">
<arg name="enabled" direction="out" type="b"/>
<arg name="username" direction="out" type="s"/>
-diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
-index 2dc0323..9fd6579 100644
---- a/daemon/gdm-slave.c
-+++ b/daemon/gdm-slave.c
-@@ -1438,6 +1438,31 @@ session_unlock (GdmSlave *slave,
- return TRUE;
+Index: gdm-3.4.1/daemon/gdm-slave.c
+===================================================================
+--- gdm-3.4.1.orig/daemon/gdm-slave.c 2012-04-14 20:52:38.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-slave.c 2012-06-09 16:50:53.464110212 +0200
+@@ -1751,6 +1751,31 @@ session_unlock (GdmSlave *slave,
+ #endif
}
+static void
@@ -200,7 +200,7 @@
gboolean
gdm_slave_switch_to_user_session (GdmSlave *slave,
const char *username)
-@@ -1468,6 +1493,11 @@ gdm_slave_switch_to_user_session (GdmSlave *slave,
+@@ -1781,6 +1806,11 @@ gdm_slave_switch_to_user_session (GdmSla
g_debug ("GdmSlave: unable to unlock session: %s", ssid_to_activate);
}
@@ -212,11 +212,11 @@
ret = TRUE;
out:
-diff --git a/daemon/gdm-transient-display.c b/daemon/gdm-transient-display.c
-index dd33547..01813f7 100644
---- a/daemon/gdm-transient-display.c
-+++ b/daemon/gdm-transient-display.c
-@@ -210,6 +210,7 @@ gdm_transient_display_new (int display_number)
+Index: gdm-3.4.1/daemon/gdm-transient-display.c
+===================================================================
+--- gdm-3.4.1.orig/daemon/gdm-transient-display.c 2011-10-21 06:13:08.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-transient-display.c 2012-06-09 16:50:53.464110212 +0200
+@@ -159,6 +159,7 @@ gdm_transient_display_new (int display_n
object = g_object_new (GDM_TYPE_TRANSIENT_DISPLAY,
"x11-display-number", display_number,
"x11-display-name", x11_display,
@@ -224,5 +224,3 @@
NULL);
g_free (x11_display);
---
-1.7.5.1
Modified: desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/18_parametrize_create_display.patch [utf-8] Sat Jun 9 15:35:10 2012
@@ -16,21 +16,21 @@
Updated for changes in gdm 3.2.
-Index: gdm-3.2.1.1/daemon/gdm-local-display-factory.c
+Index: gdm-3.4.1/daemon/gdm-local-display-factory.c
===================================================================
---- gdm-3.2.1.1.orig/daemon/gdm-local-display-factory.c 2011-10-19 17:41:52.000000000 +0200
-+++ gdm-3.2.1.1/daemon/gdm-local-display-factory.c 2011-12-17 15:07:18.170152831 +0100
-@@ -64,7 +64,8 @@ static void gdm_local_display_factor
- static void gdm_local_display_factory_init (GdmLocalDisplayFactory *factory);
+--- gdm-3.4.1.orig/daemon/gdm-local-display-factory.c 2012-06-09 17:01:30.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-local-display-factory.c 2012-06-09 17:17:04.007788210 +0200
+@@ -73,7 +73,8 @@ static void gdm_local_display_factor
static void gdm_local_display_factory_finalize (GObject *object);
--static GdmDisplay *create_display (GdmLocalDisplayFactory *factory);
-+static GdmDisplay *create_display (GdmLocalDisplayFactory *factory,
+ static GdmDisplay *create_display (GdmLocalDisplayFactory *factory,
+- const char *seat_id);
++ const char *seat_id,
+ GType type);
static gpointer local_display_factory_object = NULL;
-@@ -275,9 +276,9 @@ gdm_local_display_factory_create_product
+@@ -301,9 +302,9 @@ gdm_local_display_factory_create_product
}
static void
@@ -43,34 +43,44 @@
{
int status;
GdmDisplayStore *store;
-@@ -300,7 +301,7 @@ on_static_display_status_changed (GdmDis
+@@ -320,7 +321,7 @@ on_static_display_status_changed (GdmDis
+
+ status = gdm_display_get_status (display);
+
+- g_debug ("GdmLocalDisplayFactory: static display status changed: %d", status);
++ g_debug ("GdmLocalDisplayFactory: display status changed: %d", status);
+ switch (status) {
+ case GDM_DISPLAY_FINISHED:
+ /* remove the display number from factory->priv->displays
+@@ -329,7 +330,7 @@ on_static_display_status_changed (GdmDis
gdm_display_store_remove (store, display);
/* reset num failures */
factory->priv->num_failures = 0;
-- create_display (factory);
-+ create_display (factory, GDM_TYPE_STATIC_DISPLAY);
+- create_display (factory, seat_id);
++ create_display (factory, seat_id, GDM_TYPE_STATIC_DISPLAY);
break;
case GDM_DISPLAY_FAILED:
/* leave the display number in factory->priv->displays
-@@ -313,7 +314,7 @@ on_static_display_status_changed (GdmDis
+@@ -342,7 +343,7 @@ on_static_display_status_changed (GdmDis
/* FIXME: should monitor hardware changes to
try again when seats change */
} else {
-- create_display (factory);
-+ create_display (factory, GDM_TYPE_STATIC_DISPLAY);
+- create_display (factory, seat_id);
++ create_display (factory, seat_id, GDM_TYPE_STATIC_DISPLAY);
}
break;
case GDM_DISPLAY_UNMANAGED:
-@@ -329,25 +330,26 @@ on_static_display_status_changed (GdmDis
- }
+@@ -379,7 +380,8 @@ lookup_by_seat_id (const char *id,
static GdmDisplay *
--create_display (GdmLocalDisplayFactory *factory)
-+create_display (GdmLocalDisplayFactory *factory,
+ create_display (GdmLocalDisplayFactory *factory,
+- const char *seat_id)
++ const char *seat_id,
+ GType type)
{
- GdmDisplay *display;
- guint32 num;
+ GdmDisplayStore *store;
+ GdmDisplay *display;
+@@ -396,17 +398,17 @@ create_display (GdmLocalDisplayFactory *
num = take_next_display_number (factory);
@@ -79,14 +89,13 @@
-#else
- display = gdm_static_display_new (num);
-#endif
-+ if (type == GDM_TYPE_STATIC_DISPLAY) {
-+ display = gdm_static_display_new (num);
-+ } else {
-+ g_assert_not_reached ();
-+ }
++ if (type == GDM_TYPE_STATIC_DISPLAY) {
++ display = gdm_static_display_new (num);
++ } else {
++ g_assert_not_reached ();
++ }
- /* FIXME: don't hardcode seat1? */
- g_object_set (display, "seat-id", CK_SEAT1_PATH, NULL);
+ g_object_set (display, "seat-id", seat_id, NULL);
g_signal_connect (display,
"notify::status",
@@ -95,12 +104,30 @@
factory);
store_display (factory, num, display);
-@@ -374,7 +376,7 @@ gdm_local_display_factory_start (GdmDisp
- ret = TRUE;
+@@ -490,7 +492,7 @@ static gboolean gdm_local_display_factor
+ }
- /* FIXME: use seat configuration */
-- display = create_display (factory);
-+ display = create_display (factory, GDM_TYPE_STATIC_DISPLAY);
- if (display == NULL) {
- ret = FALSE;
+ dbus_message_iter_get_basic (&sub2, &seat);
+- create_display (factory, seat);
++ create_display (factory, seat, GDM_TYPE_STATIC_DISPLAY);
+
+ dbus_message_iter_next (&sub);
}
+@@ -524,7 +526,7 @@ on_seat_signal (DBusConnection *connecti
+ } else {
+
+ if (strcmp (dbus_message_get_member (message), "SeatNew") == 0) {
+- create_display (factory, seat);
++ create_display (factory, seat, GDM_TYPE_STATIC_DISPLAY);
+ } else {
+ delete_display (factory, seat);
+ }
+@@ -594,7 +596,7 @@ gdm_local_display_factory_start (GdmDisp
+ #endif
+
+ /* On ConsoleKit just create Seat1, and that's it. */
+- display = create_display (factory, CK_SEAT1_PATH);
++ display = create_display (factory, CK_SEAT1_PATH, GDM_TYPE_STATIC_DISPLAY);
+
+ return display != NULL;
+ }
Modified: desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/19_static_transient_display.patch [utf-8] Sat Jun 9 15:35:10 2012
@@ -20,11 +20,11 @@
daemon/gdm-local-display-factory.c | 43 +++++++++++++++++------------------
1 files changed, 21 insertions(+), 22 deletions(-)
-Index: gdm-3.2.1.1/daemon/gdm-local-display-factory.c
+Index: gdm-3.4.1/daemon/gdm-local-display-factory.c
===================================================================
---- gdm-3.2.1.1.orig/daemon/gdm-local-display-factory.c 2011-12-17 15:07:18.170152831 +0100
-+++ gdm-3.2.1.1/daemon/gdm-local-display-factory.c 2011-12-17 15:08:40.678556203 +0100
-@@ -199,21 +199,7 @@ gdm_local_display_factory_create_transie
+--- gdm-3.4.1.orig/daemon/gdm-local-display-factory.c 2012-06-09 17:17:04.007788210 +0200
++++ gdm-3.4.1/daemon/gdm-local-display-factory.c 2012-06-09 17:20:47.564881097 +0200
+@@ -224,21 +224,8 @@ gdm_local_display_factory_create_transie
ret = FALSE;
@@ -34,8 +34,8 @@
-
- display = gdm_transient_display_new (num);
-
-- /* FIXME: don't hardcode seat1? */
-- g_object_set (display, "seat-id", CK_SEAT1_PATH, NULL);
+ seat_id = get_seat_of_transient_display (factory);
+- g_object_set (display, "seat-id", seat_id, NULL);
-
- store_display (factory, num, display);
-
@@ -43,11 +43,11 @@
- display = NULL;
- goto out;
- }
-+ display = create_display (factory, GDM_TYPE_TRANSIENT_DISPLAY);
++ display = create_display (factory, seat_id, GDM_TYPE_TRANSIENT_DISPLAY);
if (! gdm_display_get_id (display, id, NULL)) {
display = NULL;
-@@ -222,9 +208,6 @@ gdm_local_display_factory_create_transie
+@@ -247,9 +234,6 @@ gdm_local_display_factory_create_transie
ret = TRUE;
out:
@@ -57,14 +57,17 @@
return ret;
}
-@@ -276,13 +259,22 @@ gdm_local_display_factory_create_product
+@@ -302,14 +286,26 @@ gdm_local_display_factory_create_product
}
static void
+switch_to_login_session (GdmLocalDisplayFactory *factory)
+{
++ const char *seat_id;
++
+ /* FIXME: look for existing login session before starting a new one */
-+ create_display (factory, GDM_TYPE_TRANSIENT_DISPLAY);
++ seat_id = get_seat_of_transient_display (factory);
++ create_display (factory, seat_id, GDM_TYPE_TRANSIENT_DISPLAY);
+}
+
+static void
@@ -76,50 +79,49 @@
+ gboolean switch_on_finish;
GdmDisplayStore *store;
int num;
+ char *seat_id = NULL;
+ GType type;
num = -1;
gdm_display_get_x11_display_number (display, &num, NULL);
-@@ -291,6 +283,8 @@ on_display_status_changed (GdmDisplay
- store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
+@@ -320,6 +316,8 @@ on_display_status_changed (GdmDisplay
+ g_object_get (display, "seat-id", &seat_id, NULL);
status = gdm_display_get_status (display);
+ switch_on_finish = gdm_display_get_switch_on_finish (display);
+ type = G_OBJECT_TYPE (display);
- g_debug ("GdmLocalDisplayFactory: static display status changed: %d", status);
+ g_debug ("GdmLocalDisplayFactory: display status changed: %d", status);
switch (status) {
-@@ -301,7 +295,12 @@ on_display_status_changed (GdmDisplay
+@@ -330,7 +328,12 @@ on_display_status_changed (GdmDisplay
gdm_display_store_remove (store, display);
/* reset num failures */
factory->priv->num_failures = 0;
-- create_display (factory, GDM_TYPE_STATIC_DISPLAY);
+- create_display (factory, seat_id, GDM_TYPE_STATIC_DISPLAY);
+
+ if (switch_on_finish) {
-+ switch_to_login_session (factory);
-+ } else if (type == GDM_TYPE_STATIC_DISPLAY) {
-+ create_display (factory, type);
-+ }
++ switch_to_login_session (factory);
++ } else if (type == GDM_TYPE_STATIC_DISPLAY) {
++ create_display (factory, seat_id, type);
++ }
break;
case GDM_DISPLAY_FAILED:
/* leave the display number in factory->priv->displays
-@@ -314,7 +313,7 @@ on_display_status_changed (GdmDisplay
+@@ -343,7 +346,7 @@ on_display_status_changed (GdmDisplay
/* FIXME: should monitor hardware changes to
try again when seats change */
} else {
-- create_display (factory, GDM_TYPE_STATIC_DISPLAY);
-+ create_display (factory, type);
+- create_display (factory, seat_id, GDM_TYPE_STATIC_DISPLAY);
++ create_display (factory, seat_id, type);
}
break;
case GDM_DISPLAY_UNMANAGED:
-@@ -340,8 +339,8 @@ create_display (GdmLocalDisplayFactory *
+@@ -400,6 +403,8 @@ create_display (GdmLocalDisplayFactory *
- if (type == GDM_TYPE_STATIC_DISPLAY) {
- display = gdm_static_display_new (num);
-- } else {
-- g_assert_not_reached ();
-+ } else if (type == GDM_TYPE_TRANSIENT_DISPLAY) {
-+ display = gdm_transient_display_new (num);
- }
-
- /* FIXME: don't hardcode seat1? */
+ if (type == GDM_TYPE_STATIC_DISPLAY) {
+ display = gdm_static_display_new (num);
++ } else if (type == GDM_TYPE_TRANSIENT_DISPLAY) {
++ display = gdm_transient_display_new (num);
+ } else {
+ g_assert_not_reached ();
+ }
Modified: desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch [utf-8] Sat Jun 9 15:35:10 2012
@@ -25,11 +25,11 @@
Updated for gdm 3.2.
-Index: gdm-3.2.1.1/configure.ac
+Index: gdm-3.4.1/configure.ac
===================================================================
---- gdm-3.2.1.1.orig/configure.ac 2011-12-17 14:59:44.000000000 +0100
-+++ gdm-3.2.1.1/configure.ac 2011-12-17 15:15:46.560638226 +0100
-@@ -308,6 +308,11 @@ AC_ARG_WITH(at-spi-registryd-directory,
+--- gdm-3.4.1.orig/configure.ac 2012-06-09 16:50:38.000000000 +0200
++++ gdm-3.4.1/configure.ac 2012-06-09 17:21:38.957132366 +0200
+@@ -295,6 +295,11 @@ AC_ARG_WITH(at-spi-registryd-directory,
AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory
AC_SUBST(AT_SPI_REGISTRYD_DIR)
@@ -41,8 +41,8 @@
# Allow configuration of default PATH
#
withval=""
-@@ -970,6 +975,14 @@ AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$
- AC_SUBST(WITH_CONSOLE_KIT)
+@@ -989,6 +994,14 @@ AC_SUBST(SYSTEMD_X_SERVER)
+ AC_DEFINE_UNQUOTED(SYSTEMD_X_SERVER,"$SYSTEMD_X_SERVER",[Path to systemd X server wrapper])
dnl ---------------------------------------------------------------------------
+dnl - Check for vt switch support
@@ -56,36 +56,43 @@
dnl - Check for D-Bus
dnl ---------------------------------------------------------------------------
-Index: gdm-3.2.1.1/daemon/gdm-server.c
+Index: gdm-3.4.1/daemon/gdm-server.c
===================================================================
---- gdm-3.2.1.1.orig/daemon/gdm-server.c 2011-12-17 03:27:51.000000000 +0100
-+++ gdm-3.2.1.1/daemon/gdm-server.c 2011-12-17 15:17:31.601151747 +0100
-@@ -55,6 +55,12 @@
+--- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-09 15:54:36.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-server.c 2012-06-09 17:30:34.399750009 +0200
+@@ -61,6 +61,12 @@
extern char **environ;
+#ifdef WITH_VT_SWITCH_WORKAROUND
-+#define X_SERVER_COMMAND_LINE X_SERVER " -br -verbose -logverbose 7"
++#define X_SERVER_OPTIONS " -br -verbose"
+#else
-+#define X_SERVER_COMMAND_LINE X_SERVER " -br -verbose -logverbose 7 -novtswitch"
++#define X_SERVER_OPTIONS " -br -verbose -novtswitch"
+#endif
+
#define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate))
/* These are the servstat values, also used as server
-@@ -1141,7 +1147,7 @@ gdm_server_init (GdmServer *server)
- server->priv = GDM_SERVER_GET_PRIVATE (server);
+@@ -317,13 +323,13 @@ gdm_server_init_command (GdmServer *serv
+ goto fallback;
+ }
- server->priv->pid = -1;
-- server->priv->command = g_strdup (X_SERVER " -br -verbose -logverbose 7");
-+ server->priv->command = g_strdup (X_SERVER_COMMAND_LINE);
- server->priv->log_dir = g_strdup (LOGDIR);
+- server->priv->command = g_strdup_printf (SYSTEMD_X_SERVER " -br -verbose%s", logverbose);
++ server->priv->command = g_strconcat (SYSTEMD_X_SERVER, X_SERVER_OPTIONS, logverbose, NULL);
+ return;
- add_ready_handler (server);
-Index: gdm-3.2.1.1/daemon/gdm-simple-slave.c
+ fallback:
+ #endif
+
+- server->priv->command = g_strdup_printf (X_SERVER " -br -verbose%s", logverbose);
++ server->priv->command = g_strconcat (X_SERVER, X_SERVER_OPTIONS, logverbose, NULL);
+ }
+
+ static gboolean
+Index: gdm-3.4.1/daemon/gdm-simple-slave.c
===================================================================
---- gdm-3.2.1.1.orig/daemon/gdm-simple-slave.c 2011-12-17 14:52:37.000000000 +0100
-+++ gdm-3.2.1.1/daemon/gdm-simple-slave.c 2011-12-17 15:19:17.717670531 +0100
+--- gdm-3.4.1.orig/daemon/gdm-simple-slave.c 2012-06-09 16:44:24.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-simple-slave.c 2012-06-09 17:21:38.961132394 +0200
@@ -487,15 +487,21 @@ start_session_timeout (GdmSimpleSlave *s
if (migrated) {
destroy_session (slave);
Modified: desktop/unstable/gdm3/debian/patches/21_static_display_purge.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/21_static_display_purge.patch?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/21_static_display_purge.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/21_static_display_purge.patch [utf-8] Sat Jun 9 15:35:10 2012
@@ -1,21 +1,21 @@
-Index: gdm-3.0.4/daemon/gdm-local-display-factory.c
+Index: gdm-3.4.1/daemon/gdm-local-display-factory.c
===================================================================
---- gdm-3.0.4.orig/daemon/gdm-local-display-factory.c 2011-06-15 20:11:51.447173935 +0200
-+++ gdm-3.0.4/daemon/gdm-local-display-factory.c 2011-06-15 20:12:01.719224122 +0200
-@@ -299,8 +299,6 @@ on_display_status_changed (GdmDisplay
+--- gdm-3.4.1.orig/daemon/gdm-local-display-factory.c 2012-06-09 17:20:47.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-local-display-factory.c 2012-06-09 17:32:13.684235405 +0200
+@@ -331,8 +331,6 @@ on_display_status_changed (GdmDisplay
if (switch_on_finish) {
- switch_to_login_session (factory);
-- } else if (type == GDM_TYPE_STATIC_DISPLAY) {
-- create_display (factory, type);
- }
+ switch_to_login_session (factory);
+- } else if (type == GDM_TYPE_STATIC_DISPLAY) {
+- create_display (factory, seat_id, type);
+ }
break;
case GDM_DISPLAY_FAILED:
-Index: gdm-3.0.4/daemon/gdm-static-display.c
+Index: gdm-3.4.1/daemon/gdm-static-display.c
===================================================================
---- gdm-3.0.4.orig/daemon/gdm-static-display.c 2011-06-15 20:47:16.413562347 +0200
-+++ gdm-3.0.4/daemon/gdm-static-display.c 2011-06-15 20:52:18.311038265 +0200
-@@ -98,21 +98,13 @@ gdm_static_display_manage (GdmDisplay *d
+--- gdm-3.4.1.orig/daemon/gdm-static-display.c 2011-10-21 06:13:08.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-static-display.c 2012-06-09 17:31:32.568034385 +0200
+@@ -93,21 +93,13 @@ gdm_static_display_manage (GdmDisplay *d
static gboolean
gdm_static_display_finish (GdmDisplay *display)
{
Modified: desktop/unstable/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/rules?rev=35287&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/rules [utf-8] (original)
+++ desktop/unstable/gdm3/debian/rules [utf-8] Sat Jun 9 15:35:10 2012
@@ -30,6 +30,7 @@
--with-pam-domain=gdm3 \
--with-lang-file=/etc/default/locale \
--disable-introspection \
+ --without-systemd \
--disable-split-authentication
ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
More information about the pkg-gnome-commits
mailing list