debian/changelog | 7 +++++++
debian/xserver-xorg-core.bug.script | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit a91b836c5a0a54642fca7fb6fab552ccfaadac69
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Aug 2 10:31:15 2016 +0200
Adjust bug script to look for log files in $HOME/.local/share/xorg in
addition to /var/log
When Xorg runs unprivileged it logs to $HOME, so try to handle that case.
diff --git a/debian/changelog b/debian/changelog
index 26f41bf..f797919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-2) UNRELEASED; urgency=medium
+
+ * Adjust bug script to look for log files in $HOME/.local/share/xorg in
+ addition to /var/log, to handle unprivileged Xorg.
+
+ -- Julien Cristau <jcris...@debian.org> Tue, 02 Aug 2016 10:30:00 +0200
+
xorg-server (2:1.18.4-1) unstable; urgency=medium
* New upstream stable release.
diff --git a/debian/xserver-xorg-core.bug.script
b/debian/xserver-xorg-core.bug.script
index c78ce6e..ad39d00 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -111,11 +111,11 @@ fi
echo
-XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null)
+XORG_LOGS=$(ls -dt /var/log/Xorg.*.log $HOME/.local/share/xorg/Xorg.*.log
2>/dev/null)
if [ -n "$XORG_LOGS" ]; then
pecho "Xorg X server log files on system:"
- ls -dlrt /var/log/Xorg.*.log 2>/dev/null
+ ls -dlrt /var/log/Xorg.*.log $HOME/.local/share/xorg/Xorg.*.log 2>/dev/null
echo
for LOG in $XORG_LOGS; do
if [ -f "$LOG" ]; then
