x2goserver.git - build-main (branch) updated: 3.1.1.6 - x2go-commits

7 Nov 2012

The branch, build-main has been updated
       via  623a4649daca7f1489b3441f44f24f5f58db2cfa (commit)
       via  3328841f3bd32a01c722fa87bc2fa46e69366de4 (commit)
       via  66574504720a2b2b4c3e096ef92945a676515e23 (commit)
      from  66f150790fc68cc50eade2e070876d04adf2e851 (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                                   |    7 +++++++
 x2goserver-compat/VERSION.x2goserver-compat        |    2 +-
 .../VERSION.x2goserver-extensions                  |    2 +-
 .../VERSION.x2goserver-fmbindings                  |    2 +-
 x2goserver-printing/VERSION.x2goserver-printing    |    2 +-
 x2goserver-pyhoca/VERSION.x2goserver-pyhoca        |    2 +-
 x2goserver-xsession/VERSION.x2goserver-xsession    |    2 +-
 x2goserver/VERSION.x2goserver                      |    2 +-
 x2goserver/bin/x2gomountdirs                       |    3 +--
 9 files changed, 15 insertions(+), 9 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 0cae7bf..6055676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x2goserver (3.1.1.6-0~x2go1) unstable; urgency=low
+
+  * Bugfix release (3.1.1.6):
+    - Fix for non-well-tested x2gomountdirs script.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 07 Nov 2012 20:57:54 +0100
+
 x2goserver (3.1.1.5-0~x2go1) unstable; urgency=low
 
   [ Stéphane Graber ]
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat
index 787e085..861a59a 100644
--- a/x2goserver-compat/VERSION.x2goserver-compat
+++ b/x2goserver-compat/VERSION.x2goserver-compat
@@ -1 +1 @@
-3.1.1.5
\ No newline at end of file
+3.1.1.6
\ No newline at end of file
diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions
index 787e085..861a59a 100644
--- a/x2goserver-extensions/VERSION.x2goserver-extensions
+++ b/x2goserver-extensions/VERSION.x2goserver-extensions
@@ -1 +1 @@
-3.1.1.5
\ No newline at end of file
+3.1.1.6
\ No newline at end of file
diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
index 787e085..861a59a 100644
--- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
+++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
@@ -1 +1 @@
-3.1.1.5
\ No newline at end of file
+3.1.1.6
\ No newline at end of file
diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing
index 787e085..861a59a 100644
--- a/x2goserver-printing/VERSION.x2goserver-printing
+++ b/x2goserver-printing/VERSION.x2goserver-printing
@@ -1 +1 @@
-3.1.1.5
\ No newline at end of file
+3.1.1.6
\ No newline at end of file
diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
index 787e085..861a59a 100644
--- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
+++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
@@ -1 +1 @@
-3.1.1.5
\ No newline at end of file
+3.1.1.6
\ No newline at end of file
diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession
index 787e085..861a59a 100644
--- a/x2goserver-xsession/VERSION.x2goserver-xsession
+++ b/x2goserver-xsession/VERSION.x2goserver-xsession
@@ -1 +1 @@
-3.1.1.5
\ No newline at end of file
+3.1.1.6
\ No newline at end of file
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver
index 787e085..861a59a 100644
--- a/x2goserver/VERSION.x2goserver
+++ b/x2goserver/VERSION.x2goserver
@@ -1 +1 @@
-3.1.1.5
\ No newline at end of file
+3.1.1.6
\ No newline at end of file
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 8d18b92..457a1d3 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -34,7 +34,7 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
 
 syslog('info', "x2gomountdirs has been called with options: @ARGV");
 
-sub source {
+sub source_environment {
     my $name = shift;
 
     open my $fh, "<", $name
@@ -48,7 +48,6 @@ sub source {
             next;
         }
         my ($k, $v) = split /=/, $line, 2;
-        if (
         $v =~ s/^(['"])(.*)\1/$2/; #' fix highlighter
         $v =~ s/\$([a-zA-Z]\w*)/$ENV{$1}/g;
         $v =~ s/`(.*?)`/`$1`/ge; #dangerous


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

    