x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.7-5-gcdeb38f
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, release/0.1.1.x has been updated via cdeb38f6ada3cdc38b5095e76993b6773b2a340b (commit) from fa6659cc58faadf3f92a36b89bf19ec7668c253f (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 cdeb38f6ada3cdc38b5095e76993b6773b2a340b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:09:42 2011 +0200 remove code duplications ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 07b9b33..c623214 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1180,9 +1180,6 @@ class X2goSession(object): if self.is_alive(): if self.has_terminal_session(): - # unshare mounted folders - self.unshare_all_local_folders() - if self.terminal_session.suspend(): self.running = False @@ -1222,9 +1219,6 @@ class X2goSession(object): if self.is_alive(): if self.has_terminal_session(): - # unmount shared folders - self.unshare_all_local_folders() - if self.terminal_session.terminate(): self.running = False self.suspended = False hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-55-g8f5a27d
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 8f5a27d8a245ca0f5e149c879f83cb086a5f22c5 (commit) from 523dce8535c36b7f6063446c2c84e2e71e3fc315 (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 8f5a27d8a245ca0f5e149c879f83cb086a5f22c5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:09:42 2011 +0200 remove code duplications ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index b868ad8..7b77d0d 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1180,9 +1180,6 @@ class X2goSession(object): if self.is_alive(): if self.has_terminal_session(): - # unshare mounted folders - self.unshare_all_local_folders() - if self.terminal_session.suspend(): self.running = False @@ -1222,9 +1219,6 @@ class X2goSession(object): if self.is_alive(): if self.has_terminal_session(): - # unmount shared folders - self.unshare_all_local_folders() - if self.terminal_session.terminate(): self.running = False self.suspended = False hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-54-g523dce8
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 523dce8535c36b7f6063446c2c84e2e71e3fc315 (commit) from 152e901ae69f36aa583b8b2d50509e3a9bed0c74 (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 523dce8535c36b7f6063446c2c84e2e71e3fc315 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:01:50 2011 +0200 Unshare local folders during session cleanup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/session.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d5d1e54..b7b89a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (0.1.1.8), bugfix release for 0.1.1.x series: - Bugfix for: Test for existence of remote home directory on connect. + - Unshare local folders during session cleanup. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 diff --git a/x2go/session.py b/x2go/session.py index aff19c1..b868ad8 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1515,8 +1515,14 @@ class X2goSession(object): Clean up X2go session. """ + # release terminal session's proxy if self.has_terminal_session(): self.terminal_session.release_proxy() + + # unmount shared folders + self.unshare_all_local_folders() + + # destroy terminal session if self.has_terminal_session(): self.terminal_session.__del__() self.terminal_session = None hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.7-4-gfa6659c
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, release/0.1.1.x has been updated via fa6659cc58faadf3f92a36b89bf19ec7668c253f (commit) from 9ad6a08f4cb48427f72ac0b5b72bb21291e824d2 (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 fa6659cc58faadf3f92a36b89bf19ec7668c253f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:01:50 2011 +0200 Unshare local folders during session cleanup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/session.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4d4fc98..62718c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (0.1.1.8), bugfix release for 0.1.1.x series: - Bugfix for: Test for existence of remote home directory on connect. + - Unshare local folders during session cleanup. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 diff --git a/x2go/session.py b/x2go/session.py index ed1e8b5..07b9b33 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1515,8 +1515,14 @@ class X2goSession(object): Clean up X2go session. """ + # release terminal session's proxy if self.has_terminal_session(): self.terminal_session.release_proxy() + + # unmount shared folders + self.unshare_all_local_folders() + + # destroy terminal session if self.has_terminal_session(): self.terminal_session.__del__() self.terminal_session = None hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-305-gb8c2618
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via b8c2618c8f1efaf4ea3aa320538577c7481a54af (commit) via 059350c3ab42affeae78e7b14042838f46b69acd (commit) via b24531392088b16364a4e3730630f16dcdc0ec2f (commit) from f0c85abd21ffd6354044fee40a4ecc6e0a3fdec9 (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 b8c2618c8f1efaf4ea3aa320538577c7481a54af Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 20:56:38 2011 +0200 Clean session dir ~/.x2go/C-<session_id> after session terminates, if not running in debug mode. commit 059350c3ab42affeae78e7b14042838f46b69acd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 03:30:54 2011 +0200 Pass extra argument $USER to client-mode x2godesktopsharing, requires x2godesktopsharing (>=3.0.1.3) for it to work. commit b24531392088b16364a4e3730630f16dcdc0ec2f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 03:28:47 2011 +0200 log message improvement ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 4 ++++ x2goserver/bin/x2gostartagent | 6 +++--- x2goserver/bin/x2goterminate-session | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8890f61..f284e08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -87,6 +87,10 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Makefile update for including x2gofeature scripts into installation, minor fixes to x2goserver core package Makefile. * Add debug output around shadow session startup (in x2gostartagent). + * Pass extra argument $USER to client-mode x2godesktopsharing, requires + x2godesktopsharing (>=3.0.1.3) for it to work. + * Clean session dir ~/.x2go/C-<session_id> after session terminates, if not + running in debug mode. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 7e8db47..345ad33 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -128,3 +128,7 @@ kill -TERM $X2GO_AGENT_PID $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null export HOSTNAME x2goumount-session $X2GO_SESSION + +if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ]; then + rm -Rf $HOME/.x2go/C-$X2GO_SESSION +fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 765268a..2759865 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -53,9 +53,9 @@ if [ "$X2GO_STYPE" == "S" ]; then if [ "$SHADOW_USER" != "$USER" ]; then - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user $USER requests desktop sharing from user $SHADOW_USER on display $SHADOW_DISPLAY" - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@" - OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@` + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''" + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@ $USER" + OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@ $USER` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT" if [ "$OUTPUT" == "DENY" ]; then echo "ACCESS DENIED" 1>&2 diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index bcd1f9f..5b1cd23 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -48,3 +48,7 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { export HOSTNAME x2goumount-session $SESSION_NAME + +if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ]; then + rm -Rf $HOME/.x2go/C-$SESSION_NAME +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).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.1-22-g8e182c4
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 8e182c47b6cd57587588f06e1bcfa00f11c29434 (commit) via 7576438990bbd9a19f5f51f9f0e4832492c9fe21 (commit) from 7dbcdf39f5d1199a4328782da6f15c0924c6cab6 (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 8e182c47b6cd57587588f06e1bcfa00f11c29434 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 20:38:51 2011 +0200 Define unique MIME name spaces for X2go SSHFS GNOME icons. commit 7576438990bbd9a19f5f51f9f0e4832492c9fe21 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 20:38:16 2011 +0200 forgot to add x2gonautilus man page ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 3 +- man/man8/x2gonautilus.8 | 22 ++++++++++++++++++++ share/applications/x2gonautilus.desktop | 2 +- ...nome-mime-application-sshfscdrom-x2go-gnome.svg | 1 + .../gnome-mime-application-sshfscdrom.svg | 1 - ...gnome-mime-application-sshfsdisk-x2go-gnome.svg | 1 + .../mimetypes/gnome-mime-application-sshfsdisk.svg | 1 - ...-mime-application-sshfsremovable-x2go-gnome.svg | 1 + .../gnome-mime-application-sshfsremovable.svg | 1 - share/mime/packages/sshfs.xml | 6 ++-- 11 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 man/man8/x2gonautilus.8 create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b5d21e1..2a3e170 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low - Add man apges for x2goumount-session-gnome, x2gosuspend-session-gnome. - Add simple man page for x2gonautilus. - Place x2go-suspend.desktop icon in GNOME Network submenu. + - Define unique MIME name spaces for X2go SSHFS GNOME icons. * Add gnome-menus as dependency. * Now fully use debhelper for packaging. Reduced linitian issues nearly completely (still open: old-format-menu-file diff --git a/debian/control b/debian/control index 51e8346..6f55d7d 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, x2goserver, zenity, - gnome-menus + gnome-menus, + gnome-colors-common Description: Description: x2gognomebindings (GNOME mimetypes for X2go) X2go is a server based computing environment with - session resuming diff --git a/man/man8/x2gonautilus.8 b/man/man8/x2gonautilus.8 new file mode 100644 index 0000000..d99667f --- /dev/null +++ b/man/man8/x2gonautilus.8 @@ -0,0 +1,22 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gonautilus 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2gonautilus \- X2go GNOME Wrapper for Browsing X2go Shared Folders with Nautilus +.SH SYNOPSIS +'nh +.fi +.ad l +x2gonautilus <path> + +.SH DESCRIPTION +\fBx2gonautilus\fR is a component of the X2go GNOME bindings and a simple wrapper GNOME's Nautilus +file browser for X2go-base shared folders. +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/share/applications/x2gonautilus.desktop b/share/applications/x2gonautilus.desktop index 4b9f090..c653e6d 100644 --- a/share/applications/x2gonautilus.desktop +++ b/share/applications/x2gonautilus.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Name=x2gonautilus -MimeType=application/sshfsdisk;application/sshfscdrom;application/sshfsremovable +MimeType=application/sshfsdisk-x2go-gnome;application/sshfscdrom-x2go-gnome;application/sshfsremovable-x2go-gnome Exec=x2gonautilus %f Type=Application Terminal=false diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg new file mode 120000 index 0000000..20f78dd --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg deleted file mode 120000 index 92dbac8..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg new file mode 120000 index 0000000..3a2e8f9 --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg deleted file mode 120000 index 388c35e..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg new file mode 120000 index 0000000..7ca88a1 --- /dev/null +++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg @@ -0,0 +1 @@ +/usr/share/icons/gnome-colors-common/scalable/devices/drive-removable-media.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg deleted file mode 120000 index ab47d4e..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome/scalable/devices/drive-removable-media.svg \ No newline at end of file diff --git a/share/mime/packages/sshfs.xml b/share/mime/packages/sshfs.xml index fe04e48..5c8b19e 100644 --- a/share/mime/packages/sshfs.xml +++ b/share/mime/packages/sshfs.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/sshfscdrom"> + <mime-type type="application/sshfscdrom-x2go-gnome"> <comment>SSHFS CDROM</comment> <comment xml:lang="de">SSHFS CDROM</comment> <glob pattern="*(sshfs-cdrom)"/> </mime-type> - <mime-type type="application/sshfsdisk"> + <mime-type type="application/sshfsdisk-x2go-gnome"> <comment>SSHFS Disk</comment> <comment xml:lang="de">SSHFS Freigabe</comment> <glob pattern="*(sshfs-disk)"/> </mime-type> - <mime-type type="application/sshfsremovable"> + <mime-type type="application/sshfsremovable-x2go-gnome"> <comment>SSHFS Removable</comment> <comment xml:lang="de">SSHFS Gerät</comment> <glob pattern="*(sshfs-removable)"/> hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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" (X2go bindings for GNOME).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.1-20-g7dbcdf3
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 7dbcdf39f5d1199a4328782da6f15c0924c6cab6 (commit) via 9c89f8877e3a3f588b5aadf852c3412dc7e1f2c5 (commit) from 4d1dd7669b485d2da70cc847141b71206aac866f (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 7dbcdf39f5d1199a4328782da6f15c0924c6cab6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 18:42:50 2011 +0200 Place x2go-suspend.desktop icon in GNOME Network submenu. commit 9c89f8877e3a3f588b5aadf852c3412dc7e1f2c5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 18:42:14 2011 +0200 changelog fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- share/applications/x2gonautilus.desktop | 1 + share/applications/x2gosuspend.desktop | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ad4b5d3..b5d21e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,13 +4,14 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low - Move ,,x2goumount'' script into package as ,,x2goumount-session-gnome''. - Move x2gosuspend-session-gnome to /bin folder within package. - Add man apges for x2goumount-session-gnome, x2gosuspend-session-gnome. + - Add simple man page for x2gonautilus. + - Place x2go-suspend.desktop icon in GNOME Network submenu. * Add gnome-menus as dependency. * Now fully use debhelper for packaging. Reduced linitian issues nearly completely (still open: old-format-menu-file /usr/share/menu/x2gognomebindings). * Use source format 3.0 (native). * Add linitian-overrides an man pages to package. - * Add simple man page for x2gonautilus. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 24 Sep 2011 03:06:58 +0200 diff --git a/share/applications/x2gonautilus.desktop b/share/applications/x2gonautilus.desktop index e0ad6fc..4b9f090 100644 --- a/share/applications/x2gonautilus.desktop +++ b/share/applications/x2gonautilus.desktop @@ -7,3 +7,4 @@ Type=Application Terminal=false NoDisplay=true Icon=file-manager + diff --git a/share/applications/x2gosuspend.desktop b/share/applications/x2gosuspend.desktop index e6c22c1..65745e8 100644 --- a/share/applications/x2gosuspend.desktop +++ b/share/applications/x2gosuspend.desktop @@ -6,3 +6,5 @@ Icon=exit Exec=x2gosuspend-session-gnome Terminal=false Type=Application +Categories=GNOME;GTK;Network +OnlyShowIn=GNOME; hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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" (X2go bindings for GNOME).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.1-18-g4d1dd76
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 4d1dd7669b485d2da70cc847141b71206aac866f (commit) from b36385ad0b603cc5199e8b0e02bbab314764456d (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 4d1dd7669b485d2da70cc847141b71206aac866f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 17:53:30 2011 +0200 Add simple man page for x2gonautilus. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e6d78f8..ad4b5d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low /usr/share/menu/x2gognomebindings). * Use source format 3.0 (native). * Add linitian-overrides an man pages to package. + * Add simple man page for x2gonautilus. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 24 Sep 2011 03:06:58 +0200 hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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" (X2go bindings for GNOME).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.1-17-gb36385a
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via b36385ad0b603cc5199e8b0e02bbab314764456d (commit) from b183ea694b44fe6577d8e84932ed67c301de47a9 (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 b36385ad0b603cc5199e8b0e02bbab314764456d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 17:50:32 2011 +0200 re-added x2gosuspend xdg-menu item (now that I have understood the mechanism...) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 - debian/x2gognomebindings.install | 1 + sbin/update-gnome-menu-x2go | 2 +- xdg-menus/gnome-settings-x2go.menu | 13 +++++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 xdg-menus/gnome-settings-x2go.menu The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c72984a..e6d78f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,6 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low * Now fully use debhelper for packaging. Reduced linitian issues nearly completely (still open: old-format-menu-file /usr/share/menu/x2gognomebindings). - * Remove XDG menu item, not needed for GNOME specific package. * Use source format 3.0 (native). * Add linitian-overrides an man pages to package. diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install index 5b17624..f07eb37 100644 --- a/debian/x2gognomebindings.install +++ b/debian/x2gognomebindings.install @@ -7,3 +7,4 @@ 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/ +xdg-menus/* etc/xdg/menus/ \ No newline at end of file diff --git a/sbin/update-gnome-menu-x2go b/sbin/update-gnome-menu-x2go index cecf4ba..9d4de0f 100755 --- a/sbin/update-gnome-menu-x2go +++ b/sbin/update-gnome-menu-x2go @@ -43,7 +43,7 @@ else die "Settings menu not found in /etc/xdg/menus"; } -my $menustr="<MergeFile>/etc/xdg/menus/gnome-settingsx2go.menu</MergeFile>\n"; +my $menustr="<MergeFile>/etc/xdg/menus/gnome-settings-x2go.menu</MergeFile>\n"; open(FILE,"<$menu"); my @ln=<FILE>; diff --git a/xdg-menus/gnome-settings-x2go.menu b/xdg-menus/gnome-settings-x2go.menu new file mode 100644 index 0000000..0f7207c --- /dev/null +++ b/xdg-menus/gnome-settings-x2go.menu @@ -0,0 +1,13 @@ +<!DOCTYPE Menu PUBLIC '-//freedesktop//DTD Menu 1.0//EN' 'http://standards.freedesktop.org/menu-spec/menu-1.0.dtd'> +<Menu> + <Name>Desktop</Name> + <Include> + <Filename>x2gosuspend.desktop</Filename> + </Include> + <Layout> + <Merge type="menus"/> + <Separator/> + <Filename>x2gosuspend.desktop</Filename> + <Merge type="files"/> + </Layout> +</Menu> hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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" (X2go bindings for GNOME).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.1-16-gb183ea6
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via b183ea694b44fe6577d8e84932ed67c301de47a9 (commit) from 9060986c69e16edd264718e6ae98af5b193300f5 (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 b183ea694b44fe6577d8e84932ed67c301de47a9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 15:44:32 2011 +0200 newline at EOF fix ----------------------------------------------------------------------- Summary of changes: debian/x2gognomebindings.manpages | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2gognomebindings.manpages b/debian/x2gognomebindings.manpages index 0c3ecee..06e118b 100644 --- a/debian/x2gognomebindings.manpages +++ b/debian/x2gognomebindings.manpages @@ -1 +1,2 @@ -man/man8/*.8 \ No newline at end of file +man/man8/*.8 + hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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" (X2go bindings for GNOME).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits