The branch, build-main has been updated via 057048d2f62841894c39a2ca00cd5a62a529d02f (commit) from afa555fcfdb84dcc005a38f7b0644813dde1e625 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8493262..9ac7b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,10 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low - Move xfonts-base from Recommends: field to Depends: field (bin:package x2goserver). + [ Jürgen Hötzel ] + * New upstream version (4.0.1.7): + - Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305). + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 28 Jul 2013 13:37:12 +0200 x2goserver (4.0.1.6-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index bca44f1..bd855c4 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -189,14 +189,14 @@ if [ "$cmd" == "TERMINAL" ]; then fi fi -EXEC=`which $cmd` +EXEC=`type -P $cmd` EXEC_WRAPPER="" BNAME=`basename "$EXEC"` if [ "$BNAME" == "rdesktop" ] then IMEXIT="true" - if which padsp >/dev/null; then + if type padsp >/dev/null; then EXEC_WRAPPER="padsp" args=" -r sound:local" fi hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).