debian/changelog | 8 ++++++--
debian/local/xvfb-run | 6 +++---
2 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 554fbb20e7792d0207f485af9842f8714abc941c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Sep 29 16:11:13 2008 +0200
xvfb-run: append to $ERRORFILE instead of truncating it
Otherwise the error output from Xvfb is deleted when we run 'xauth remove'.
diff --git a/debian/changelog b/debian/changelog
index ce84323..0e39d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xorg-server (2:1.4.2-7) UNRELEASED; urgency=low
still not free. SGI has since released their code under FreeB, but that
doesn't necessarily apply to contributions from other people. Hopefully
this can be cleared up soon, though.
+ * xvfb-run: append to $ERRORFILE instead of truncating it, so the error
+ output from Xvfb is not deleted when we run 'xauth remove'.
-- Julien Cristau <[EMAIL PROTECTED]> Fri, 19 Sep 2008 17:38:00 +0200
diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index 5bbd886..c85f86a 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -84,7 +84,7 @@ find_free_servernum() {
# Clean up files
clean_up() {
if [ -e "$AUTHFILE" ]; then
- XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
+ XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
fi
if [ -n "$XVFB_RUN_TMPDIR" ]; then
if ! rm -r "$XVFB_RUN_TMPDIR"; then
@@ -158,8 +158,8 @@ fi
# Start Xvfb.
MCOOKIE=$(mcookie)
XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \
- >"$ERRORFILE" 2>&1
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >"$ERRORFILE" \
+ >>"$ERRORFILE" 2>&1
+XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
2>&1 &
XVFBPID=$!
sleep "$STARTWAIT"
commit fc895bca5eb03bd1269b01509af396c6edb74266
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Sep 29 15:48:27 2008 +0200
Slightly reword the changelog entry
diff --git a/debian/changelog b/debian/changelog
index f54acd7..ce84323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ xorg-server (2:1.4.2-7) UNRELEASED; urgency=low
* Update debian/copyright to the SGI Free Software License B, version 2.0.
It now mirrors the free X11 license used by X.Org.
http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html
- Not closing bug#211765 for now, because GL/glx/glxext.c and
+ * Not closing bug#211765 for now, because GL/glx/glxext.c and
hw/dmx/glxProxy/glxext.c are covered by the GLX Public License, which is
- still not free.
+ still not free. SGI has since released their code under FreeB, but that
+ doesn't necessarily apply to contributions from other people. Hopefully
+ this can be cleared up soon, though.
-- Julien Cristau <[EMAIL PROTECTED]> Fri, 19 Sep 2008 17:38:00 +0200
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
