The branch, master has been updated via 8f3a378b553e214b6324653dcb6e335c40cd9ca8 (commit) via 098a7c11bb7acc86471d83417159d85743741343 (commit) from b7c112fcb0f1855cbd11df6fbafee19a1e89019d (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 ----------------------------------------------------------------- commit 8f3a378b553e214b6324653dcb6e335c40cd9ca8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 25 01:05:12 2011 +0200 split off x2goserver.features feature.d script from x2gofeature, remove placeholder commit 098a7c11bb7acc86471d83417159d85743741343 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 25 01:01:07 2011 +0200 Add x2gofeature man page. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gofeature | 10 ++-------- x2goserver/share/x2gofeature.d/.placeholder | 1 - .../share/x2gofeature.d/x2goserver.features | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 x2goserver/share/x2gofeature.d/.placeholder copy x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features => x2goserver/share/x2gofeature.d/x2goserver.features (95%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 46fd40a..19438b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -82,6 +82,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add x2golistmounts script to X2go server extensions. * Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions and x2goserver-printing. + * Add x2gofeature man page. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index 59855f0..81c9245 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -34,11 +34,5 @@ test -d $X2GO_SHARE_PATH/x2gofeature.d && { done } -# check for X2go server core features -case "$X2GO_FEATURE" in - - "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;; - *) echo "not available"; exit -1;; - -esac - +echo "not available" +exit 0 diff --git a/x2goserver/share/x2gofeature.d/.placeholder b/x2goserver/share/x2gofeature.d/.placeholder deleted file mode 100644 index 2f72cde..0000000 --- a/x2goserver/share/x2gofeature.d/.placeholder +++ /dev/null @@ -1 +0,0 @@ -# do not remove this file, it's a placeholder \ No newline at end of file diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver/share/x2gofeature.d/x2goserver.features similarity index 95% copy from x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features copy to x2goserver/share/x2gofeature.d/x2goserver.features index 879e71b..eebdf2b 100755 --- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -29,7 +29,7 @@ X2GO_FEATURE=$1 # check for X2go server core features case "$X2GO_FEATURE" in - "X2GO_LIST_MOUNTS") echo "ok"; exit 0;; + "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;; *) exit -1;; esac 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).