r43851 - in /desktop/unstable/gdm3/debian: changelog patches/94_retain_xorg_log.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Sat Nov  8 19:57:55 2014
New Revision: 43851

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43851
Log:
Bring back Xorg.N.log at the X maintainers' request, so that their bug script can read it (Closes: #765771)

Added:
    desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    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=43851&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Sat Nov  8 19:57:55 2014
@@ -1,3 +1,11 @@
+gdm3 (3.14.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Bring back Xorg.N.log at the X maintainers' request, so that their
+    bug script can read it (Closes: #765771)
+
+ -- Simon McVittie <smcv at debian.org>  Sat, 08 Nov 2014 17:11:39 +0000
+
 gdm3 (3.14.1-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch?rev=43851&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch	(added)
+++ desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch	[utf-8] Sat Nov  8 19:57:55 2014
@@ -0,0 +1,30 @@
+From: Simon McVittie <smcv at debian.org>
+Subject: reinstate Xorg.N.log at Xorg maintainers' request
+Date: Sat, 08 Nov 2014 17:10:47 +0000
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765771
+Forwarded: no
+
+diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
+index ccb26a3..537f9db 100644
+--- a/daemon/gdm-server.c
++++ b/daemon/gdm-server.c
+@@ -299,12 +299,14 @@ gdm_server_init_command (GdmServer *server)
+         }
+ 
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+-        /* For systemd, we don't have a log file but instead log to stdout,
+-           so set it to the xserver's built-in default verbosity */
++        /* For systemd, we log to stdout (which is the Journal),
++           so set it to the same verbosity we use for -logverbose.
++           In Debian we want to log to Xorg.N.log in addition,
++           so we do not turn that off like GNOME upstream do. */
+         if (debug)
+-            verbosity = "7 -logfile /dev/null";
++            verbosity = "7";
+         else
+-            verbosity = "3 -logfile /dev/null";
++            verbosity = "3";
+ #endif
+ 
+         if (g_access (SYSTEMD_X_SERVER, X_OK) < 0) {

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=43851&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series	[utf-8] Sat Nov  8 19:57:55 2014
@@ -8,3 +8,4 @@
 91_dconf_database_path.patch
 92_systemd_unit.patch
 93_disable_gvfs.patch
+94_retain_xorg_log.patch