r35439 - 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
Mon Jun 25 18:17:13 UTC 2012
Author: joss
Date: Mon Jun 25 18:17:13 2012
New Revision: 35439
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35439
Log:
* 05_debug_xserver_core.patch: patch from upstream git. Make the X
server dump core when debugging is enabled. Closes: #651693.
* 02_xnest_wrapper.patch: disabled.
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/patches/05_debug_xserver_core.patch
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=35439&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Mon Jun 25 18:17:13 2012
@@ -3,11 +3,12 @@
* Fix typo in dconf-tools dependency version. Closes: #678961.
* 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.
+ * 05_debug_xserver_core.patch: patch from upstream git. Make the X
+ server dump core when debugging is enabled. Closes: #651693.
* 06_first_vt.patch, 20_switch_kill_greeter.patch: refreshed.
* 90_config_comments.patch: more comments with useful options.
* Add references to patches.
+ * 02_xnest_wrapper.patch: disabled.
-- Josselin Mouette <joss at debian.org> Fri, 22 Jun 2012 20:03:48 +0200
Modified: 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=35439&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/05_debug_xserver_core.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/05_debug_xserver_core.patch [utf-8] Mon Jun 25 18:17:13 2012
@@ -1,71 +1,55 @@
-Debian #651693
-GNOME #678717
+From c22350c575dc2f52dd9d36882caba3355430332b Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 25 Jun 2012 17:58:47 +0000
+Subject: server: pass -core to Xorg when debug enabled
-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
+This aids in debugging problems.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=678717
+---
+diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
+index 6f2a939..ad990ab 100644
+--- a/daemon/gdm-server.c
++++ b/daemon/gdm-server.c
+@@ -278,17 +278,18 @@ static void
+ gdm_server_init_command (GdmServer *server)
{
gboolean debug = FALSE;
- const char *logverbose;
-+ const char *dumpcore;
+- const char *logverbose;
++ const char *debug_options;
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 = "";
+ }
+
+ gdm_settings_direct_get_boolean (GDM_KEY_DEBUG, &debug);
+- if (debug)
+- logverbose = " -logverbose 7";
+- else
+- logverbose = "";
++ if (debug) {
++ debug_options = " -logverbose 7 -core ";
++ } else {
++ debug_options = "";
++ }
#ifdef WITH_SYSTEMD
-@@ -314,13 +320,13 @@ gdm_server_init_command (GdmServer *serv
+@@ -319,13 +320,13 @@ gdm_server_init_command (GdmServer *server)
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);
++ server->priv->command = g_strdup_printf (SYSTEMD_X_SERVER " -br -verbose%s", debug_options);
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);
++ server->priv->command = g_strdup_printf (X_SERVER " -br -verbose%s", debug_options);
}
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>
+--
+cgit v0.9.0.2
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=35439&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] Mon Jun 25 18:17:13 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-06-24 12:07:19.474598830 +0200
-+++ gdm-3.4.1/common/gdm-settings-keys.h 2012-06-24 12:14:55.712829345 +0200
+--- gdm-3.4.1.orig/common/gdm-settings-keys.h 2012-06-25 20:10:49.108971142 +0200
++++ gdm-3.4.1/common/gdm-settings-keys.h 2012-06-25 20:13:02.993625666 +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,12 +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-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,
+--- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-25 20:12:59.685609512 +0200
++++ gdm-3.4.1/daemon/gdm-server.c 2012-06-25 20:13:02.993625666 +0200
+@@ -752,6 +752,213 @@ gdm_server_spawn (GdmServer *server,
return ret;
}
@@ -230,7 +230,7 @@
/**
* gdm_server_start:
* @disp: Pointer to a GdmDisplay structure
-@@ -768,10 +975,14 @@ gboolean
+@@ -763,10 +970,14 @@ gboolean
gdm_server_start (GdmServer *server)
{
gboolean res;
@@ -248,8 +248,8 @@
Index: gdm-3.4.1/data/gdm.schemas.in.in
===================================================================
---- 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
+--- gdm-3.4.1.orig/data/gdm.schemas.in.in 2012-06-25 20:10:49.108971142 +0200
++++ gdm-3.4.1/data/gdm.schemas.in.in 2012-06-25 20:13:02.997625695 +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=35439&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] Mon Jun 25 18:17:13 2012
@@ -27,8 +27,8 @@
Index: gdm-3.4.1/configure.ac
===================================================================
---- 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
+--- gdm-3.4.1.orig/configure.ac 2012-06-25 20:13:29.000000000 +0200
++++ gdm-3.4.1/configure.ac 2012-06-25 20:13:36.625790083 +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,8 +58,8 @@
Index: gdm-3.4.1/daemon/gdm-server.c
===================================================================
---- 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
+--- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-25 20:13:23.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-server.c 2012-06-25 20:16:00.830495076 +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
-@@ -320,13 +326,13 @@ gdm_server_init_command (GdmServer *serv
+@@ -315,13 +321,13 @@ gdm_server_init_command (GdmServer *serv
goto fallback;
}
-- 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);
+- server->priv->command = g_strdup_printf (SYSTEMD_X_SERVER " -br -verbose%s", debug_options);
++ server->priv->command = g_strconcat (SYSTEMD_X_SERVER, X_SERVER_OPTIONS, debug_options, NULL);
return;
fallback:
#endif
-- 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);
+- server->priv->command = g_strdup_printf (X_SERVER " -br -verbose%s", debug_options);
++ server->priv->command = g_strconcat (X_SERVER, X_SERVER_OPTIONS, debug_options, 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-24 12:19:55.000000000 +0200
-+++ gdm-3.4.1/daemon/gdm-simple-slave.c 2012-06-24 12:20:21.826423627 +0200
+--- gdm-3.4.1.orig/daemon/gdm-simple-slave.c 2012-06-25 20:13:27.000000000 +0200
++++ gdm-3.4.1/daemon/gdm-simple-slave.c 2012-06-25 20:13:36.629790114 +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=35439&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] Mon Jun 25 18:17:13 2012
@@ -1,8 +1,8 @@
Index: gdm-3.4.1/data/gdm.conf-custom.in
===================================================================
---- 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-3.4.1.orig/data/gdm.conf-custom.in 2012-06-25 20:10:46.276957297 +0200
++++ gdm-3.4.1/data/gdm.conf-custom.in 2012-06-25 20:16:44.598709033 +0200
+@@ -1,14 +1,32 @@
# GDM configuration storage
+#
+# See /usr/share/gdm/gdm.schemas for a list of available options.
@@ -32,8 +32,7 @@
[chooser]
[debug]
+-
+# More verbose logs
++# Additionally lets the X server dump core if it crashes
+# 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=35439&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Mon Jun 25 18:17:13 2012
@@ -1,4 +1,4 @@
-02_xnest-wrapper.patch
+#02_xnest-wrapper.patch
05_debug_xserver_core.patch
06_first_vt.patch
07_libexec-paths.patch
More information about the pkg-gnome-commits
mailing list