--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider this:
unblock gdm3/3.14.1-2
It partially reverts some upstream logging changes for the Xorg instance
started by gdm3. I've tested this on a systemd laptop and in a sysvinit VM.
Current behaviour in testing:
* with systemd as pid 1: Xorg messages go to the Journal
* with sysvinit as pid 1: Xorg messages go to /dev/null
Behaviour of my upload:
* with systemd as pid 1: messages go to the Journal and /var/log/Xorg.$N.log
* with sysvinit as pid 1: messages go to /var/log/Xorg.$N.log only
where $N is a display number.
diffstat for gdm3-3.14.1 gdm3-3.14.1
changelog | 8 ++++++++
patches/94_retain_xorg_log.patch | 30 ++++++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 39 insertions(+)
diff -Nru gdm3-3.14.1/debian/changelog gdm3-3.14.1/debian/changelog
--- gdm3-3.14.1/debian/changelog 2014-10-19 18:57:34.000000000 +0100
+++ gdm3-3.14.1/debian/changelog 2014-11-08 17:13:09.000000000 +0000
@@ -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@debian.org> Sat, 08 Nov 2014 17:11:39 +0000
+
gdm3 (3.14.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru gdm3-3.14.1/debian/patches/94_retain_xorg_log.patch gdm3-3.14.1/debian/patches/94_retain_xorg_log.patch
--- gdm3-3.14.1/debian/patches/94_retain_xorg_log.patch 1970-01-01 01:00:00.000000000 +0100
+++ gdm3-3.14.1/debian/patches/94_retain_xorg_log.patch 2014-11-08 17:11:33.000000000 +0000
@@ -0,0 +1,30 @@
+From: Simon McVittie <smcv@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) {
diff -Nru gdm3-3.14.1/debian/patches/series gdm3-3.14.1/debian/patches/series
--- gdm3-3.14.1/debian/patches/series 2014-09-19 22:28:12.000000000 +0100
+++ gdm3-3.14.1/debian/patches/series 2014-11-08 17:09:23.000000000 +0000
@@ -8,3 +8,4 @@
91_dconf_database_path.patch
92_systemd_unit.patch
93_disable_gvfs.patch
+94_retain_xorg_log.patch
--- End Message ---
--- Begin Message ---
On 08/11/14 20:56, Simon McVittie wrote:
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider this:
unblock gdm3/3.14.1-2
It partially reverts some upstream logging changes for the Xorg instance
started by gdm3. I've tested this on a systemd laptop and in a sysvinit VM.
Current behaviour in testing:
* with systemd as pid 1: Xorg messages go to the Journal
* with sysvinit as pid 1: Xorg messages go to /dev/null
Behaviour of my upload:
* with systemd as pid 1: messages go to the Journal and /var/log/Xorg.$N.log
* with sysvinit as pid 1: messages go to /var/log/Xorg.$N.log only
where $N is a display number.
Thanks, unblocked.
Emilio
--- End Message ---