debian/changelog | 6 ++++++
debian/local/xvfb-run | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 7edde320afdf5cdab183a3067e38155b553e3bb0
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Oct 11 11:13:05 2017 +0300
xvfb-run: Keep redirecting stderr to stdout, autopkgtests need it.
diff --git a/debian/changelog b/debian/changelog
index 00e7e46..1f6e744 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.19.4-1ubuntu2) artful; urgency=medium
+
+ * xvfb-run: Keep redirecting stderr to stdout, autopkgtests need it.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Wed, 11 Oct 2017 11:12:57 +0300
+
xorg-server (2:1.19.4-1ubuntu1) artful; urgency=medium
* Merge from Debian.
diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index 3a18596..6ee5c8a 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -181,7 +181,7 @@ done
# Start the command and save its exit status.
set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
+DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
RETVAL=$?
set -e
