xorg-server: Changes to 'debian-unstable'
debian/local/xvfb-run | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f70e3108868184ed1c742aab397d9636ef107c47
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Apr 4 23:11:56 2012 +0200
xvfb-run: fix bashism
dash's trap doesn't accept SIGUSR1. Both dash and bash are happy with
USR1, so use that.
diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index b708e63..445dd48 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -160,8 +160,8 @@ add :$SERVERNUM $XAUTHPROTO $MCOOKIE
EOF
# handle SIGUSR1 so Xvfb knows to send a signal when it's ready to accept
# connections
- trap : SIGUSR1
- (trap '' SIGUSR1; XAUTHORITY=$AUTHFILE exec Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" 2>&1) &
+ trap : USR1
+ (trap '' USR1; XAUTHORITY=$AUTHFILE exec Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" 2>&1) &
XVFBPID=$!
wait || :
Reply to: