[X2go-Commits] x2gognomebindings.git - build-main (branch) updated: 2.0.1.4-5-g9a1a9c0

[X2Go dev team]

The branch, build-main has been updated
       via  9a1a9c0e19c9cc7667b8900506533a7129fe9ece (commit)
       via  ba01ce756648010e0bd518067c94654e55693e24 (commit)
       via  94db97f8857d766f41f511b43726cb88439120e6 (commit)
       via  0bb58902760aec107e45c8b7981ac14e07d7715f (commit)
       via  ae15cf9ba1b6f589bb18fa4a517532ced574d6c0 (commit)
      from  29f9bd2fa9019212350ccb9e0dc0e8660a6d89f9 (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 9a1a9c0e19c9cc7667b8900506533a7129fe9ece
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Apr 15 18:30:48 2012 +0200

    release 2.0.1.5

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

Summary of changes:
 VERSION.x2gognomebindings                          |    2 +-
 debian/changelog                                   |   10 ++++++++
 debian/control                                     |    3 +-
 debian/x2gognomebindings.install                   |    1 +
 .../pre-runcommand.d/005_GNOME-monitors-xml-ignore |   24 +++++++------------
 5 files changed, 23 insertions(+), 17 deletions(-)
 copy share/x2go/x2gofeature.d/x2goserver-gnomebindings.features => lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore (55%)

The diff of changes is:
diff --git a/VERSION.x2gognomebindings b/VERSION.x2gognomebindings
index f9cca37..d17ac2c 100644
--- a/VERSION.x2gognomebindings
+++ b/VERSION.x2gognomebindings
@@ -1 +1 @@
-2.0.1.4
+2.0.1.5
diff --git a/debian/changelog b/debian/changelog
index f36622a..7de45c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+x2gognomebindings (2.0.1.5-0~x2go1) unstable; urgency=low
+
+  * New upstream version (2.0.1.5):
+    - Let GNOME sessions started via X2Go ignore GNOME's monitor settings
+      in ~/.config/monitors.xml.
+  * Depend on x2goserver (>=3.1.0.2). Earlier versions have a bug in
+    x2goruncommand that let's execution of X2Go server extensions fail.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 15 Apr 2012 18:30:12 +0200
+
 x2gognomebindings (2.0.1.4-0~x2go1) unstable; urgency=low
 
   * New upstream version (2.0.1.4):
diff --git a/debian/control b/debian/control
index 9ed0e3b..64b78f9 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,8 @@ Package: x2gognomebindings
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- x2goserver (>=3.0.99.6-0~),
+ x2goserver (>=3.1.0.2-0~),
+ x2goserver-extensions,
  zenity,
  gnome-menus,
  gnome-colors-common
diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install
index f07eb37..9a644df 100644
--- a/debian/x2gognomebindings.install
+++ b/debian/x2gognomebindings.install
@@ -7,4 +7,5 @@ VERSION.x2gognomebindings               usr/share/x2go/versions/
 #extension/libnautilus-x2goumount.la     usr/lib/nautilus/extensions-2.0/
 #extension/libnautilus-x2goumount.so     usr/lib/nautilus/extensions-2.0/
 share/*                                 usr/share/
+lib/*                                   usr/lib/
 xdg-menus/*                             etc/xdg/menus/
\ No newline at end of file
diff --git a/share/x2go/x2gofeature.d/x2goserver-gnomebindings.features b/lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore
similarity index 55%
copy from share/x2go/x2gofeature.d/x2goserver-gnomebindings.features
copy to lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore
index fb25030..c8d416a 100755
--- a/share/x2go/x2gofeature.d/x2goserver-gnomebindings.features
+++ b/lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2012 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,20 +17,14 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# Copyright (C) 2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2012  Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
-X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
+X2GO_SESSION=$1
 
-$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-
-X2GO_FEATURE=$1
-
-# check for X2go server core features
-case "$X2GO_FEATURE" in
-
-    "X2GO_GNOMEBINDINGS") echo "ok"; exit 0;;
-    *) exit -1;;
-
-esac
+# GNOME's monitors.xml breaks full screen mode of X2Go/NX
+if echo $X2GO_SESSION | egrep "$USER-[[:digit:]]{2,}-[[:digit:]]+_stDGNOME_dp.*" >/dev/null; then
+	test -w ~/.config/monitors.xml && mv ~/.config/monitors.xml ~/.config/monitors.xml.disabled-for-X2Go-session-start
+	(sleep 20; test -w ~/.config/monitors.xml.disabled-for-X2Go-session-start && mv ~/.config/monitors.xml.disabled-for-X2Go-session-start ~/.config/monitors.xml;)&
+fi
+exit 0
 


hooks/post-receive
-- 
x2gognomebindings.git (GNOME bindings for X2Go)

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 "x2gognomebindings.git" (GNOME bindings for X2Go).