r35420 - in /desktop/unstable/gdm3/debian: changelog patches/05_debug_xserver_core.patch patches/06_first_vt.patch patches/20_switch_kill_greeter.patch patches/90_config_comments.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Jun 24 10:47:54 UTC 2012
Author: joss
Date: Sun Jun 24 10:47:53 2012
New Revision: 35420
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35420
Log:
* 05_debug_xserver_core.patch: new patch. Add an option to get the X
server to dump core. Closes: #651693.
* 06_first_vt.patch, 20_switch_kill_greeter.patch: refreshed.
* 90_config_comments.patch: more comments with useful options.
Added:
desktop/unstable/gdm3/debian/patches/05_debug_xserver_core.patch
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/patches/06_first_vt.patch
desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch
desktop/unstable/gdm3/debian/patches/90_config_comments.patch
desktop/unstable/gdm3/debian/patches/series
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=35420&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sun Jun 24 10:47:53 2012
@@ -3,6 +3,10 @@
* Fix typo in dconf-tools dependency version.
* Use --no-create-home and --quiet for addgroup/adduser calls.
Closes: #675809.
+ * 05_debug_xserver_core.patch: new patch. Add an option to get the X
+ server to dump core. Closes: #651693.
+ * 06_first_vt.patch, 20_switch_kill_greeter.patch: refreshed.
+ * 90_config_comments.patch: more comments with useful options.
-- Josselin Mouette <joss at debian.org> Fri, 22 Jun 2012 20:03:48 +0200
Added: desktop/unstable/gdm3/debian/patches/05_debug_xserver_core.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/05_debug_xserver_core.patch?rev=35420&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/05_debug_xserver_core.patch (added)
+++ desktop/unstable/gdm3/debian/patches/05_debug_xserver_core.patch [utf-8] Sun Jun 24 10:47:53 2012
@@ -1,0 +1,68 @@
+Index: gdm-3.4.1/common/gdm-settings-keys.h
+===================================================================
+--- 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-24 12:17:06.893470649 +0200
+@@ -34,6 +34,7 @@ G_BEGIN_DECLS
+ #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
+
+ #define GDM_KEY_DEBUG "debug/Enable"
++#define GDM_KEY_XSERVER_CORE "debug/XserverDumpCore"
+
+ #define GDM_KEY_INCLUDE "greeter/Include"
+ #define GDM_KEY_EXCLUDE "greeter/Exclude"
+Index: gdm-3.4.1/daemon/gdm-server.c
+===================================================================
+--- 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-24 12:17:06.893470649 +0200
+@@ -274,6 +274,7 @@ gdm_server_init_command (GdmServer *serv
+ {
+ gboolean debug = FALSE;
+ const char *logverbose;
++ const char *dumpcore;
+
+ if (server->priv->command != NULL) {
+ return;
+@@ -284,6 +285,11 @@ gdm_server_init_command (GdmServer *serv
+ logverbose = " -logverbose 7";
+ else
+ logverbose = "";
++ gdm_settings_direct_get_boolean (GDM_KEY_XSERVER_CORE, &debug);
++ if (debug)
++ dumpcore = " -core";
++ else
++ dumpcore = "";
+
+ #ifdef WITH_SYSTEMD
+
+@@ -314,13 +320,13 @@ gdm_server_init_command (GdmServer *serv
+ goto fallback;
+ }
+
+- server->priv->command = g_strdup_printf (SYSTEMD_X_SERVER " -br -verbose%s", logverbose);
++ server->priv->command = g_strdup_printf (SYSTEMD_X_SERVER " -br -verbose%s%s", logverbose, dumpcore);
+ return;
+
+ fallback:
+ #endif
+
+- server->priv->command = g_strdup_printf (X_SERVER " -br -verbose%s", logverbose);
++ server->priv->command = g_strdup_printf (X_SERVER " -br -verbose%s%s", logverbose, dumpcore);
+ }
+
+ static gboolean
+Index: gdm-3.4.1/data/gdm.schemas.in.in
+===================================================================
+--- 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-24 12:17:06.893470649 +0200
+@@ -53,6 +53,11 @@
+ <signature>b</signature>
+ <default>false</default>
+ </schema>
++ <schema>
++ <key>debug/XserverDumpCore</key>
++ <signature>b</signature>
++ <default>false</default>
++ </schema>
+
+ <schema>
+ <key>security/DisallowTCP</key>
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=35420&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] Sun Jun 24 10:47:53 2012
@@ -2,8 +2,8 @@
only Linux and FreeBSD.
Index: gdm-3.4.1/common/gdm-settings-keys.h
===================================================================
---- 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
+--- gdm-3.4.1.orig/common/gdm-settings-keys.h 2012-06-24 12:07:19.474598830 +0200
++++ gdm-3.4.1/common/gdm-settings-keys.h 2012-06-24 12:14:55.712829345 +0200
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
#define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
#define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
@@ -11,22 +11,12 @@
+#define GDM_KEY_FIRST_VT "daemon/FirstVT"
#define GDM_KEY_DEBUG "debug/Enable"
-
+ #define GDM_KEY_XSERVER_CORE "debug/XserverDumpCore"
Index: gdm-3.4.1/daemon/gdm-server.c
===================================================================
---- 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"
-+
- #include "gdm-server.h"
-
- extern char **environ;
-@@ -751,6 +754,213 @@ gdm_server_spawn (GdmServer *server,
+--- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-24 12:13:58.432549303 +0200
++++ gdm-3.4.1/daemon/gdm-server.c 2012-06-24 12:15:25.840976650 +0200
+@@ -757,6 +757,213 @@ gdm_server_spawn (GdmServer *server,
return ret;
}
@@ -240,7 +230,7 @@
/**
* gdm_server_start:
* @disp: Pointer to a GdmDisplay structure
-@@ -762,10 +972,14 @@ gboolean
+@@ -768,10 +975,14 @@ gboolean
gdm_server_start (GdmServer *server)
{
gboolean res;
@@ -258,8 +248,8 @@
Index: gdm-3.4.1/data/gdm.schemas.in.in
===================================================================
---- 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
+--- gdm-3.4.1.orig/data/gdm.schemas.in.in 2012-06-24 12:05:24.770038144 +0200
++++ gdm-3.4.1/data/gdm.schemas.in.in 2012-06-24 12:14:55.712829345 +0200
@@ -47,6 +47,11 @@
<signature>i</signature>
<default>30</default>
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=35420&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] Sun Jun 24 10:47:53 2012
@@ -27,8 +27,8 @@
Index: gdm-3.4.1/configure.ac
===================================================================
---- gdm-3.4.1.orig/configure.ac 2012-06-20 22:51:49.238631694 +0200
-+++ gdm-3.4.1/configure.ac 2012-06-20 23:53:51.276827820 +0200
+--- gdm-3.4.1.orig/configure.ac 2012-06-24 12:19:55.000000000 +0200
++++ gdm-3.4.1/configure.ac 2012-06-24 12:20:21.822423624 +0200
@@ -298,6 +298,11 @@ AC_ARG_WITH(at-spi-registryd-directory,
AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory
AC_SUBST(AT_SPI_REGISTRYD_DIR)
@@ -58,9 +58,9 @@
Index: gdm-3.4.1/daemon/gdm-server.c
===================================================================
---- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-20 22:51:49.094631001 +0200
-+++ gdm-3.4.1/daemon/gdm-server.c 2012-06-20 22:54:34.247438386 +0200
-@@ -61,6 +61,12 @@
+--- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-24 12:19:55.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-server.c 2012-06-24 12:22:25.023025885 +0200
+@@ -58,6 +58,12 @@
extern char **environ;
@@ -73,26 +73,26 @@
#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
-@@ -317,13 +323,13 @@ gdm_server_init_command (GdmServer *serv
+@@ -320,13 +326,13 @@ gdm_server_init_command (GdmServer *serv
goto fallback;
}
-- 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);
+- server->priv->command = g_strdup_printf (SYSTEMD_X_SERVER " -br -verbose%s%s", logverbose, dumpcore);
++ server->priv->command = g_strconcat (SYSTEMD_X_SERVER, X_SERVER_OPTIONS, logverbose, dumpcore, NULL);
return;
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);
+- server->priv->command = g_strdup_printf (X_SERVER " -br -verbose%s%s", logverbose, dumpcore);
++ server->priv->command = g_strconcat (X_SERVER, X_SERVER_OPTIONS, logverbose, dumpcore, NULL);
}
static gboolean
Index: gdm-3.4.1/daemon/gdm-simple-slave.c
===================================================================
---- gdm-3.4.1.orig/daemon/gdm-simple-slave.c 2012-06-20 22:51:49.198631511 +0200
-+++ gdm-3.4.1/daemon/gdm-simple-slave.c 2012-06-21 00:02:19.755313645 +0200
+--- gdm-3.4.1.orig/daemon/gdm-simple-slave.c 2012-06-24 12:19:55.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-simple-slave.c 2012-06-24 12:20:21.826423627 +0200
@@ -487,15 +487,21 @@ start_session_timeout (GdmSimpleSlave *s
if (migrated) {
destroy_session (slave);
Modified: desktop/unstable/gdm3/debian/patches/90_config_comments.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/90_config_comments.patch?rev=35420&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/90_config_comments.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/90_config_comments.patch [utf-8] Sun Jun 24 10:47:53 2012
@@ -1,15 +1,39 @@
-Index: gdm-3.0.0/data/gdm.conf-custom.in
+Index: gdm-3.4.1/data/gdm.conf-custom.in
===================================================================
---- gdm-3.0.0.orig/data/gdm.conf-custom.in 2011-04-28 21:22:22.330925966 +0200
-+++ gdm-3.0.0/data/gdm.conf-custom.in 2011-04-28 21:22:44.299033369 +0200
-@@ -1,6 +1,10 @@
+--- gdm-3.4.1.orig/data/gdm.conf-custom.in 2011-09-04 20:44:17.000000000 +0200
++++ gdm-3.4.1/data/gdm.conf-custom.in 2012-06-24 12:29:21.425061588 +0200
+@@ -1,14 +1,34 @@
# GDM configuration storage
+#
+# See /usr/share/gdm/gdm.schemas for a list of available options.
[daemon]
-+# AutomaticLoginEnable = false
-+# AutomaticLogin =
++# Enabling automatic login
++# AutomaticLoginEnable = true
++# AutomaticLogin = user1
++
++# Enabling timed login
++# TimedLoginEnable = true
++# TimedLogin = user1
++# TimedLoginDelay = 10
++
++# Reserving more VTs for test consoles (default is 7)
++# FirstVT = 9
[security]
+ [xdmcp]
+
+ [greeter]
++# Only include selected logins in the greeter
++# IncludeAll = false
++# Include = user1,user2
+
+ [chooser]
+
+ [debug]
++# More verbose logs
++# Enable = true
+
++# Let the X server dump core if it crashes
++# XserverDumpCore = true
Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=35420&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sun Jun 24 10:47:53 2012
@@ -1,4 +1,5 @@
02_xnest-wrapper.patch
+05_debug_xserver_core.patch
06_first_vt.patch
07_libexec-paths.patch
08_frequent-users_greeter.patch
More information about the pkg-gnome-commits
mailing list