[X2go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99.6-6-g1c87d10

[X2go dev team]

The branch, build-main has been updated
       via  1c87d105f5607c6980219cd005de1bd1fed584a9 (commit)
       via  71b0dad76b60b87ea92bde1f6c18a4e19967bd9c (commit)
       via  55bef4636e37d6211c01254295cd6065b419fe36 (commit)
       via  add936413c185eeee07d97bbbde731628cb0f152 (commit)
       via  3472dd0d3d822d586bd8fdd630d5bb0c4e0269d0 (commit)
       via  837f96c7c74020be48c16799decba42e3c0efa1e (commit)
      from  322d387aa0bc77f31f1f0a255551ec756a4ff58f (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 1c87d105f5607c6980219cd005de1bd1fed584a9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 26 13:06:29 2011 +0200

    release 3.0.99.7

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    9 +++++++++
 x2goserver-compat/VERSION.x2goserver-compat        |    2 +-
 .../VERSION.x2goserver-extensions                  |    2 +-
 .../bin/x2goserver-run-extensions                  |    2 +-
 x2goserver-printing/VERSION.x2goserver-printing    |    2 +-
 x2goserver/VERSION.x2goserver                      |    2 +-
 .../bin/x2golistmounts                             |    0
 x2goserver/bin/x2gomountdirs                       |    2 +-
 .../man/man8/x2golistmounts.8                      |    0
 9 files changed, 15 insertions(+), 6 deletions(-)
 rename {x2goserver-extensions => x2goserver}/bin/x2golistmounts (100%)
 rename {x2goserver-extensions => x2goserver}/man/man8/x2golistmounts.8 (100%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4dd9782..2f4e1f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+x2goserver (3.0.99.7-0~x2go1) unstable; urgency=low
+
+  * New upstream version (3.0.99.7):
+    - Move x2golistmounts script from x2goserver-extensions to x2goserver
+      core.
+    - X2go server extensions: fix regular expression when scanning modality dirs.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 26 Oct 2011 13:04:54 +0200
+
 x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low
 
   [ Mike Gabriel ]
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat
index 36a9e31..c89e6f8 100644
--- a/x2goserver-compat/VERSION.x2goserver-compat
+++ b/x2goserver-compat/VERSION.x2goserver-compat
@@ -1 +1 @@
-3.0.99.6
\ No newline at end of file
+3.0.99.7
\ No newline at end of file
diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions
index 36a9e31..c89e6f8 100644
--- a/x2goserver-extensions/VERSION.x2goserver-extensions
+++ b/x2goserver-extensions/VERSION.x2goserver-extensions
@@ -1 +1 @@
-3.0.99.6
\ No newline at end of file
+3.0.99.7
\ No newline at end of file
diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions
index 968167c..3a640a2 100755
--- a/x2goserver-extensions/bin/x2goserver-run-extensions
+++ b/x2goserver-extensions/bin/x2goserver-run-extensions
@@ -31,7 +31,7 @@ X2GO_SESSION=$1
 X2GO_MODALITY=$2
 
 # scan extensions and execute them
-find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "^[0-9]{3}_[:alnum:]+" | sort | while read x2go_extension; do
+find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do
 	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION"
 	$x2go_extension $X2GO_SESSION &>/dev/null && {
 		$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully"
diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing
index 36a9e31..c89e6f8 100644
--- a/x2goserver-printing/VERSION.x2goserver-printing
+++ b/x2goserver-printing/VERSION.x2goserver-printing
@@ -1 +1 @@
-3.0.99.6
\ No newline at end of file
+3.0.99.7
\ No newline at end of file
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver
index 36a9e31..c89e6f8 100644
--- a/x2goserver/VERSION.x2goserver
+++ b/x2goserver/VERSION.x2goserver
@@ -1 +1 @@
-3.0.99.6
\ No newline at end of file
+3.0.99.7
\ No newline at end of file
diff --git a/x2goserver-extensions/bin/x2golistmounts b/x2goserver/bin/x2golistmounts
similarity index 100%
rename from x2goserver-extensions/bin/x2golistmounts
rename to x2goserver/bin/x2golistmounts
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 7f926df..7f65d07 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -262,7 +262,7 @@ for (my $i=0;$i<@dirs;$i++)
 					$useplasmoid=1;
 				}
 			}
-			if (! $printspool && ! $mimeboxspool && ! $useplasmoid)
+			if (! $printspool && ! $mimeboxspool && ! $useplasmoid )
 			{
 				my $fname="$ENV{'HOME'}/Desktop";
 				my $current_desktop = "";
diff --git a/x2goserver-extensions/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8
similarity index 100%
rename from x2goserver-extensions/man/man8/x2golistmounts.8
rename to x2goserver/man/man8/x2golistmounts.8


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).