x2go-commits October 2011

x2go-commits@lists.x2go.org

1 participants
131 discussions

x2gothinclient.git - master (branch) updated: 5ae6b6661a327d11dfb0a86906ba72d0352bb283
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via 5ae6b6661a327d11dfb0a86906ba72d0352bb283 (commit) via 32a9d8c786a5bafc1e3f496936a7b25d16750de2 (commit) from cd4dad8cdd8ab429e8f6376f44f162e32dde001e (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 5ae6b6661a327d11dfb0a86906ba72d0352bb283 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 12:20:44 2011 +0200 changelog update commit 32a9d8c786a5bafc1e3f496936a7b25d16750de2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 12:20:34 2011 +0200 version increment ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 636ed6a..ba6c0fc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.2 \ No newline at end of file +1.0.1.3 diff --git a/debian/changelog b/debian/changelog index 2579109..344f9b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ x2gothinclient (1.0.1.3-0~x2go1.1) unstable; urgency=low * Remove ssh (=openssh-server) dependency for x2gothinclient package. * Add memtest86+ to x2gothinclient's Recommends: section. * Add midnight commander to Recommends: of x2gothinclient. + * x2gothinshutdown: conflicts x2gocdmanager<=1.0.1.2. [ Coco ] Improvements for upstream version (1.0.1.3): hooks/post-receive -- x2gothinclient.git (X2go Thin Client Environment) 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 "x2gothinclient.git" (X2go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: cd4dad8cdd8ab429e8f6376f44f162e32dde001e
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via cd4dad8cdd8ab429e8f6376f44f162e32dde001e (commit) from 493179488b6b7a05cfb246dd89e7554ec00ebd53 (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 cd4dad8cdd8ab429e8f6376f44f162e32dde001e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 12:17:31 2011 +0200 release 1.0.1.3, rework changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 101 +++++++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 50 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fc7c4c1..2579109 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,61 +1,62 @@ -x2gothinclient (1.0.1.3-0~x2go1.1) UNRELEASED; urgency=low +x2gothinclient (1.0.1.3-0~x2go1.1) unstable; urgency=low [ Mike Gabriel ] - [Mike Gabriel] - * Split up x2gocdmanager package into x2gocdmanager and x2gothinshutdown - package - * Fix USB mounting, CD mounting, - * Improve code layout (tab stops, inline comments) - * Add HTTP_PROXY and FTP_PROXY support to x2gothinclientmanagement (APT - package download) - * Fix for proxy code, env variables are $http_proxy and $ftp_proxy. - * Add example files/symlinks for tftpboot environment. - * Add syslinux boot splash with X2go flavour. - * Remove ssh (=openssh-server) dependency for x2gothinclient package. + New upstream version (1.0.1.3): + - Split up x2gocdmanager package into x2gocdmanager and x2gothinshutdown + package + - Fix USB mounting, CD mounting, + - Improve code layout (tab stops, inline comments) + - Add HTTP_PROXY and FTP_PROXY support to x2gothinclientmanagement (APT + package download) + - Add example files/symlinks for tftpboot environment. + - Add syslinux boot splash with X2go flavour. + - Install 486 and 686 kernels in TCE chroot. + - Move PXE tftpboot examples to x2gothinclient/share/tftpboot. + - Improval of syslinux boot screen. + - Add x2gothinclient_preptftpboot script. + - Add man page for x2gothinclient_preptftpboot. + - Do not run management script if there is a problem with the X2go TCE + chroot. + - Sanity checks: X2go TCE management script have to run as root. + - Add HTTPS_PROXY support. + - Add x2gothinclient_cleanup script. + - Add man page for x2gothinclient_cleanup. + - Run x2gothinclient_init from x2gothinclientd init script. + - Fix udev rules path in x2gosmartcardrules, improval of udev script, plus man page. + - Fix udev rules path in x2gousbmount. + - Add comment that names possible boot profiles to tftp config template. + - Add kernel module blacklisting for x2gothinclient_create. + - Tweak mtab diversion on X2go Thin Client to avoid error messages. + - Add some more PXE/TFTP info at end of x2gothinclient_pretftpboot script. + - Disable service restarts in chroot. + - Add a ,,hit <RETURN> before TCE creation. + - Add tmpfs mount for /var/lib/dbus. + - Reduce x2goclient CPU load from ~100% to ~0-1%. + - Boot TCE kernel with nomodeset boot option to avoid gCard incompatibilities + (Fb vs. Xorg). + - Move kernel/initrd symlinks after install rather than copying. + - Add detection of kernel upgrades to x2gothinclient_upgrade script. + - Adapt chroot file created by x2gothinclient_upgrade, escaping $-signs. + - Use --no-session-edit option when starting x2goclient on TCE. + - Delay thinshutdown button appearance for 4+6 seconds on X server + (re)start (that is: 10s on tce start or X server restart and 4s after session + logout). + - Add post-run instructions of x2gothinclient_preptftpboot to its man page. + * Add acpid to x2gothinclient's Recommends: section. - * Install 486 and 686 kernels in TCE chroot. - * Add memtest86+ to x2gothinclient's Recommends: section. - * Move PXE tftpboot examples to x2gothinclient/share/tftpboot. - * Improval of syslinux boot screen. - * Add x2gothinclient_preptftpboot script. - * Add man page for x2gothinclient_preptftpboot. - * Do not run management script if there is a problem with the X2go TCE chroot. - * X2go TCE management script have to run as root. - * Add https_proxy env variable support. - * Add x2gothinclient_cleanup script. - * Add man page for x2gothinclient_cleanup. - * Run x2gothinclient_init from x2gothinclientd init script. - * Fix udev rules path in x2gosmartcardrules, improval of udev script, plus man page. - * Fix udev rules path in x2gousbmount. - * Add comment that names possible boot profiles to tftp config template. + * Remove ssh (=openssh-server) dependency for x2gothinclient package. + * Add memtest86+ to x2gothinclient's Recommends: section. * Add midnight commander to Recommends: of x2gothinclient. - * Add kernel module blacklisting for x2gothinclient_create. - * Tweak mtab diversion on X2go Thin Client to avoid error messages. - * Add some more PXE/TFTP info at end of x2gothinclient_pretftpboot script. - * Disabled service restarts in chroot. - * Add a ,,hit <RETURN> before TCE creation. - * Add tmpfs mount for /var/lib/dbus. - * More variable ($) escaping in x2gothinclient_* scripts. Fixes start-stop-daemon - enable/disable code. - * Reduce x2goclient CPU load from ~100% to ~0-1%. - * Boot TCE kernel with nomodeset boot option to avoid gCard incompatibilities - (Fb vs. Xorg). - * Move kernel/initrd symlinks after install rather than copying. - * Add detection of kernel upgrades to x2gothinclient_upgrade script. - * Adapt chroot file created by x2gothinclient_upgrade, escaping $-signs. - * Use --no-session-edit option when starting x2goclient on TCE. - * Delay thinshutdown button appearance for 6 more seconds on X server - (re)start (that is: 10s on tce start or X server restart and 4s after session - logout). - * Add post-run instructions of x2gothinclient_preptftpboot to its man page. - [Coco] - * Replace tmpfs mount on /etc/network/run with symlink /etc/network/run -> /dev/shm. + [ Coco ] + Improvements for upstream version (1.0.1.3): + - Replace tmpfs mount on /etc/network/run with symlink /etc/network/run -> /dev/shm. [ Oleksandr Shneyder ] - * x2gosmartcardrules: support for SCM SCR331-LC1 SmartCard Reader + Improvements for upstream version (1.0.1.3): + - x2gosmartcardrules: support for SCM SCR331-LC1 SmartCard Reader. - -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Wed, 05 Oct 2011 15:05:30 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 12:16:59 +0200 x2gothinclient (1.0.1.2-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gothinclient.git (X2go Thin Client Environment) 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 "x2gothinclient.git" (X2go Thin Client Environment).

1 0

x2goserver.git - build-main (branch) created: 3.0.99.6
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been created at 322d387aa0bc77f31f1f0a255551ec756a4ff58f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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

x2goserver.git - master (branch) updated: 3.0.99-2-335-g322d387
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via 322d387aa0bc77f31f1f0a255551ec756a4ff58f (commit) from c0d6fadd5bcb741e8a625d47881f507ad6e27135 (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 322d387aa0bc77f31f1f0a255551ec756a4ff58f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 12:07:16 2011 +0200 release 3.0.99.6, rework changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 199 +++++++++----------- x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- 4 files changed, 94 insertions(+), 111 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 05f065e..4dd9782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,131 +1,114 @@ -x2goserver (3.0.99.6-0~x2go1.1) UNRELEASED; urgency=low +x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - * Rename x2goumount_session calls to x2goumount-session calls in x2goserver - internal scripts. + * New upstream version (3.0.99.6): + - Rename x2goumount_session calls to x2goumount-session calls in + x2goserver internal scripts. + - Re-arranged script files into /bin and /lib directories. + - Tab'ified all script files, proper indentation, coding style. + - Fix for x2gomountdirs, now also usernames containing blanks can use + local folder sharing. + - Provide C wrapper for setgid call of x2gosqlitewrapper.pl. Remove + dependency from perlsuid. + - Store SQLite db in /var/lib/x2go to comply to latest FHS. + - Add x2gobasepath script to reliably detect x2goserver install path. + - Add man page for x2gobasepath. + - Remove Debianisms from INSTALL howto. + - Add chromium-browser as possible WWWBROWSER to x2goruncommand. + - Add lxterminal as possible TERMINAL to x2goruncommand. + - Add LibreOffice.org as possible OFFICE application to x2goruncommand. + - Fix for TERMINAL command execution if konsole (KDE4) is installed on the + server (closes upstream issue #87). + - Silence x2golistsessions on missing session.log files. + - Add x2goprint user creation information to INSTALL howto. + - Add sanity checks to x2goprint, script can only be run as root. + - Fix x2goprint, add syslogging, add inline comments. + - Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf + with only parameter ,,loglevel''. + - Initialize Syslog module for all Perl scripts in x2goserver package. + - Add debugging support for almost all DB functions in x2godbwrapper.pm, fix + for Syslog module initialization in all Perl scripts. + - Add info loglevel messages for all scripts in bin dir. + - Add notice messages for start, suspend, resume, terminate, mountdirs + actions. + - Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a + package. This has to be done by the scripts that use x2godbwrapper.pm. + - Add info loglevel messages for x2goserver-extensions scripts. + - Use usermapping for SSHFS mount points. + - Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out. + - Rename example user and group for session limits in x2goserver.conf so that + people do not get the idea to put users in x2gouser group. + - Add real error message if client fails to resume/suspend/terminate + a session. + - Present an ISO-8601 compliant datetime string in session lists + rendered by x2golistsessions (and similar) command(s). + - Silence knotify SIGHUP signals in case that no knotify is running in the + X2go session. + - Fix x2goumount-session for individual paths (folder type: disk), + ToDo: folder type CDROM and removable media. + - Let db_insertmount create a proper return value (success vs. failed). + - If resuming or suspending of a session fails, mark the session as + finished (because the session's x2goagent is very probably dead). + Do not write an error to stderr if x2goterminate-session fails (i.e. if + x2goagent is dead). + - Identified x2goumount script (x2goserver-compat) as a necessary + component of x2gognomebindings and moved it there (with new name: + x2goumount-session-gnome). + - Add x2golistmounts script to X2go server extensions. + - Add x2gofeature script and x2gofeature.d subscripts. + - Add x2gofeature man page. + - Move x2goversion script into x2goserver core. + - 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. + - Change of Desktop icons for shared folders. This change is needed for + parallel installation of x2gognomebindings and x2golxdebindings. + - Terminate x2godesktopsharing cleanly for current session on + x2goterminate-session or when x2goruncommand is about to exit. + - Resume/suspend x2godesktopsharing during x2goresume-session, + x2gosuspend-session. + - Provide pluggable X2go extension system for main X2go server + functions. + - Provide man page for x2goserver-run-extensions that explains the new plug-in + mechanism of x2goserver. + + + * React to bug #627990, prefer man2html-base over man2html. - * Re-arranged script files in /bin and /lib directories, this is - still compensated by dh_install and dh_link and needs more work. - * Tab'ified all script files, proper indentation, coding style. - * Fix for x2gomountdirs, now also usernames containing blanks can use - local folder sharing. - * Provide C wrapper for setuid call of x2gosqlitewrapper.pl. Remove dependency - from perlsuid. + * Do not depend on package perlsuid anymore. * Use source format 3.0 (native). * Fix of Debian clean rules, fix of Makefile's clean rules. * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead ofB Conflicts). - * Switch to setgid instead of setuid for SQLite wrapper. * Tab'ified postinst/postrm scripts. - * Store SQLite db in /var/lib/x2go to comply to latest FHS. - * Tab'ified (forgotten) scripts in /usr/sbin. - * Tab'ified (forgotten) init script. - * Tab'ified (forgotten) scripts in x2goserver-extensions package. * Install internal x2goserver scripts to /usr/lib/x2go, make sure scripts in /usr/bin find these scripts. - * Add x2gobasepath script to reliably detect x2goserver install path. - * Add man page for x2gobasepath. - * Remove Debianisms from INSTALL howto. - * Add chromium-browser as possible WWWBROWSER to x2goruncommand. - * Add lxterminal as possible TERMINAL to x2goruncommand. - * Add LibreOffice.org as possible OFFICE application to x2goruncommand. - * Fix for TERMINAL command execution if konsole (KDE4) is installed on the - server (closes upstream issue #87). - * Silence x2golistsessions on missing session.log files. - * Create x2goprint user/group on package installation, add same info to - INSTALL howto. - * Add sanity checks to x2goprint, script can only be run as root. - * Fix x2goprint, add syslogging, add inline comments. - * Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf - with only parameter ,,loglevel''. - * Change x2gologlevel script into a Perl module (and a script that calls it). - Using x2gologlevel function in x2goprint to set loglevel mask. - * Initialize Syslog module for all Perl scripts in x2goserver package. - * Add debugging support for almost all DB functions in x2godbwrapper.pm, fix - for Syslog module initialization in all Perl scripts. - * Add info loglevel messages for all scripts in bin dir. - * Fix for x2godbwrapper.pm: we can't open/close the syslog socket in a - package. This has to be done by the scripts that use x2godbwrapper.pm. - * Add info loglevel messages for x2goserver-extensions scripts. - * Add debug messages to x2gomountdirs script. - * Use usermapping for SSHFS mount points. - * Add notice messages for start, suspend, resume, terminate, mountdirs - actions. - * Cleanup of man page area, thanks to Ivan Kabaivanov for pointing that out. - * Rename example user and group for session limits in x2goserver.conf so that - people do not get the idea to put users in x2gouser group. - * Makefile and man page area fix for x2goserver-extensions. * x2goserver.postinst: fix home path updates if new home path already exists - * Add real error message if client fails to resume/suspend/terminate - a session. - * SQLite DB backend: Fix typo in date format template. - * Present an ISO-8601 compliant datetime string in session lists - rendered by x2golistsessions (and similar) command(s). - * Silence knotify SIGHUP signals in case that no knotify is running in the - X2go session. - * Fix x2goumount-session for individual paths (folder type: disk), - ToDo: folder type CDROM and removable media. - * Let db_insertmount create a proper return value (success vs. failed). - * Improvement of man pages. - * Add return value information of X2go commands to man pages. - * If resuming or suspending of a session fails, mark the session has - finished (because the session's x2goagent is very probably dead). - Do not write an error to stderr if x2goterminate-session fails (i.e. if - x2goagent is dead). - * Man page update for x2gosession-terminate, x2gosession-resume. - * Split up x2goprint script + man page + adduser x2goprint as separate - package x2goserver-printing. - * Add man page for x2gobasepath and man page draft for x2gosessionlimit. - * Identified x2goumount script (x2goserver-compat) as a necessary component - of x2gognomebindings and moved it there (with new name: - x2goumount-session-gnome). - * Add x2golistmounts script to X2go server extensions. - * Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions - and x2goserver-printing. - * Add x2gofeature man page. - * Move x2goversion into x2goserver core package. - * 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. - * Change of Desktop icons for shared folders. This change is needed for - parallel installation of x2gognomebindings and x2golxdebindings. - * Only remove server-side session directory if x2goruncommand has not - failed. - * Syntax fix in x2golistsessions_sql, hopefully fixes broken - x2gocleansessions. - * Terminate x2godesktopsharing for current session on x2goterminate-session - or when x2goruncommand is about to exit. - * Resume/suspend x2godesktopsharing during x2goresume-session, - x2gosuspend-session. - * Provide pluggable X2go extension system for main X2go server - functions. - * Adapt to renaming of x2godesktopsharing scripts. - * Provide man page for x2goserver-run-extensions that explains the new plug-in - mechanism of x2goserver. - * X2go server extensions have to completely quiet, diverting stdout/stderr to - /dev/null. - * Fix for session dir cleanup, x2gologlevel returns int value, not string. + * Provide separate package x2goserver-printing: x2goprint script + man page + + adduser x2goprint. [ Moritz Strübe ] - * Make digits at the beginning of X2go server extension scripts a must, not a - suggestion. + * Improvements for new upstream version (3.0.99.6): + - Make digits at the beginning of X2go server extension scripts a must, not a + suggestion. [ Ivan Kabaivanov ] - * Makefile fix around man page installation in x2goserver-compat package. - * Makefile fix around man page installation in x2goserver-extensions package. - * Proof-reading code, fixing typos. + * Improvements for new upstream version (3.0.99.6): + - Many Makefile fixes around man page installation. + - Proof-reading code, fixing typos. [ Martin Oehler ] - * Removes old debug code fragment, fixes x2golistsessions parsing. + * Fixes for new upstream version (3.0.99.6): + - Removes old debug code fragment, fixes x2golistsessions parsing. [ Oleksandr Shneyder ] - * remove session directory after 10 sec delay to let x2goclient check cmdoutput file + * Improvements for new upstream version (3.0.99.6): + - Remove session directory after 10 sec delay to let x2goclient check + cmdoutput file. - -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Wed, 05 Oct 2011 14:25:12 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:44:59 +0200 x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 34936c7..36a9e31 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.0.99.5 \ No newline at end of file +3.0.99.6 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 34936c7..36a9e31 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.0.99.5 \ No newline at end of file +3.0.99.6 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 34936c7..36a9e31 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.0.99.5 \ No newline at end of file +3.0.99.6 \ No newline at end of file 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

x2golxdebindings.git - master (branch) updated: d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce (commit) from 7929f975dae6b0430a1f0804eedfeee402023262 (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: VERSION.x2golxdebindings | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION.x2golxdebindings b/VERSION.x2golxdebindings index 0839c1f..8e3158a 100644 --- a/VERSION.x2golxdebindings +++ b/VERSION.x2golxdebindings @@ -1 +1 @@ -1.0.1.0 +1.0.1.1 hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2go).

1 0

x2golxdebindings.git - build-main (branch) updated: d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been updated via d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce (commit) from 7929f975dae6b0430a1f0804eedfeee402023262 (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 d79df479360ecfbb3fc2d58dc6f8d6d0382ed0ce Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 11:41:45 2011 +0200 version increment (forgotten) ----------------------------------------------------------------------- Summary of changes: VERSION.x2golxdebindings | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION.x2golxdebindings b/VERSION.x2golxdebindings index 0839c1f..8e3158a 100644 --- a/VERSION.x2golxdebindings +++ b/VERSION.x2golxdebindings @@ -1 +1 @@ -1.0.1.0 +1.0.1.1 hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2go).

1 0

x2golxdebindings.git - build-main (branch) updated: 1.0.1.1
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been updated via 7929f975dae6b0430a1f0804eedfeee402023262 (commit) via d1bb1c99ae77b194b5ccb5d909c1aa17919a1730 (commit) via a288449b5dd0282d1080e1f5bafab45058891f63 (commit) via 4e5bbc5aa5a76de780ee7b4329f2a3b2405eb055 (commit) from 4d9c2a5660b0a9292af92ee06897b2f5606e0191 (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 | 15 ++++++++++----- debian/control | 4 ++-- share/mime/packages/sshfs-x2go-lxde.xml | 6 +++--- 3 files changed, 15 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5ac8866..168fbaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,17 @@ -x2golxdebindings (1.0.1.0-0~x2go1) UNRELEASED; urgency=low +x2golxdebindings (1.0.1.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - * Imported original tarball version to X2go Git. + * New upstream version (1.0.1.1): + - Add icon symlinks for sshfs/LXDE MIME types. + - Use desktop icon names that contain the name of the + desktop session. + * Imported original tarball version (v1.0.1) to X2go Git. * Adds Debian/Ubuntu packaging (/debian folder). - * Add icon symlinks for sshfs/LXDE MIME types. * Depend on destop-file-utils. + * Depend on x2goserver (>=3.0.99.6). [ Milan Knížek ] - * Fix for wrong/test MIME type in x2gopcmanfm.desktop. + * New upstream version (1.0.1.1): + - Fix for wrong/test MIME type in x2gopcmanfm.desktop. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 15 Sep 2011 14:04:27 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:35:28 +0200 diff --git a/debian/control b/debian/control index ea84f81..513787c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Package: x2golxdebindings Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, - x2goserver, + x2goserver (>=3.0.99.6-0~), lxde-icon-theme, desktop-file-utils Description: LXDE bindings for X2go @@ -25,5 +25,5 @@ Description: LXDE bindings for X2go - audio support - authentication by smartcard and USB stick . - x2golxdebindings contains LXDE mimetype information for X2go's + x2golxdebindings contains LXDE MIME type information for X2go's local folder sharing. diff --git a/share/mime/packages/sshfs-x2go-lxde.xml b/share/mime/packages/sshfs-x2go-lxde.xml index 2a1476a..b2f4979 100644 --- a/share/mime/packages/sshfs-x2go-lxde.xml +++ b/share/mime/packages/sshfs-x2go-lxde.xml @@ -3,16 +3,16 @@ <mime-type type="application/sshfscdrom-x2go-lxde"> <comment>SSHFS CDROM</comment> <comment xml:lang="de">SSHFS CDROM</comment> - <glob pattern="*(sshfs-cdrom)"/> + <glob pattern="* (sshfs-cdrom-lxde)"/> </mime-type> <mime-type type="application/sshfsdisk-x2go-lxde"> <comment>SSHFS Disk</comment> <comment xml:lang="de">SSHFS Freigabe</comment> - <glob pattern="*(sshfs-disk)"/> + <glob pattern="* (sshfs-disk-lxde)"/> </mime-type> <mime-type type="application/sshfsremovable-x2go-lxde"> <comment>SSHFS Removable</comment> <comment xml:lang="de">SSHFS Gerät</comment> - <glob pattern="*(sshfs-removable)"/> + <glob pattern="* (sshfs-removable-lxde)"/> </mime-type> </mime-info> hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2go).

1 0

x2golxdebindings.git - master (branch) updated: 7929f975dae6b0430a1f0804eedfeee402023262
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via 7929f975dae6b0430a1f0804eedfeee402023262 (commit) from d1bb1c99ae77b194b5ccb5d909c1aa17919a1730 (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 7929f975dae6b0430a1f0804eedfeee402023262 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 11:38:08 2011 +0200 release 1.0.1.1, rework changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5c70681..168fbaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,17 @@ -x2golxdebindings (1.0.1.0-0~x2go1) UNRELEASED; urgency=low +x2golxdebindings (1.0.1.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - * Imported original tarball version to X2go Git. + * New upstream version (1.0.1.1): + - Add icon symlinks for sshfs/LXDE MIME types. + - Use desktop icon names that contain the name of the + desktop session. + * Imported original tarball version (v1.0.1) to X2go Git. * Adds Debian/Ubuntu packaging (/debian folder). - * Add icon symlinks for sshfs/LXDE MIME types. * Depend on destop-file-utils. - * Depend on x2goserver (>=3.0.99.6) and use desktop - icon names that contain the name of the desktop session. + * Depend on x2goserver (>=3.0.99.6). [ Milan Knížek ] - * Fix for wrong/test MIME type in x2gopcmanfm.desktop. + * New upstream version (1.0.1.1): + - Fix for wrong/test MIME type in x2gopcmanfm.desktop. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 15 Sep 2011 14:04:27 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:35:28 +0200 hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2go).

1 0

x2gognomebindings.git - build-main (branch) updated: 2.0.1.3
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, build-main has been updated via 8227f81ad06cfafd26de1fded85d355c1fefd110 (commit) via 87e635cc4e85e3eedee6b1dcbfc6cd85ba341bff (commit) via 7b3fe1e047ea49a18ec2ff8d68a828e80d5009ea (commit) via 50b5f49c02b336c3688b15641dd1a3232e2819a4 (commit) via 66c2defe1fec986c61ded31ba52e27bb6afbde6f (commit) via 59aca05b576ddf2e39ee68868d46a309d08dd2e8 (commit) via c696ecfde992559bde498140e79e4e57e36fe685 (commit) via 05cbc6bb0f576863a72cfbd0e6ffa6601e29890c (commit) via bd30c195b3b7dea414453908ebabf8a73c2ba48e (commit) via 8e182c47b6cd57587588f06e1bcfa00f11c29434 (commit) via 7576438990bbd9a19f5f51f9f0e4832492c9fe21 (commit) via 7dbcdf39f5d1199a4328782da6f15c0924c6cab6 (commit) via 9c89f8877e3a3f588b5aadf852c3412dc7e1f2c5 (commit) via 4d1dd7669b485d2da70cc847141b71206aac866f (commit) via b36385ad0b603cc5199e8b0e02bbab314764456d (commit) via b183ea694b44fe6577d8e84932ed67c301de47a9 (commit) via 9060986c69e16edd264718e6ae98af5b193300f5 (commit) via 9e2853604775816189c4be5d15314608539bfb8e (commit) via ab59153091cec9e90460ca9e4d2a9809839e08a6 (commit) via 429ccc31f02d8ce8e4f96b675e9755851864fe08 (commit) via cdd1cc7e08d3d2529df4b3a74517eb0bba8b58d1 (commit) via a37b43eed649c8ad1efa3d818c8c487e83fce408 (commit) via fbe08a140b91675624e8375c1679dffc58769bb0 (commit) via 2d64da9939a9261dca99d739a545896fac7fb0ac (commit) via eca466be460f30cb34ce7f440e64f92c642fc2cb (commit) via 54c5ddc3d01c520c0ee11c9f9a199a48d2d44f9d (commit) via b5a044d42a0828ad7711ff4ce22e02d1618e9005 (commit) via a244b778b899bbc484122c29c53ef899f6b62fbc (commit) via 3ee21b93af37ac7f65ed67117f5372d345025da0 (commit) via 910c5d8aca61ec68967fa8130bba0c0a3147da15 (commit) via d02b0dd7418bbdef56b29008f111899ed91fde3e (commit) from 506a0ec485312b5f7892cf159cfe96fd4838d6a7 (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: VERSION | 2 +- VERSION.x2gognomebindings | 1 + bin/x2gonautilus | 29 ++++++++ bin/x2gosuspend-session-gnome | 23 ++++++ bin/x2goumount-session-gnome | 62 +++++++++++++++++ debian/changelog | 32 +++++++++- debian/control | 37 ++++++----- debian/copyright | 34 +++++----- debian/dirs | 3 - debian/docs | 2 - debian/rules | 64 +++--------------- debian/source/format | 1 + debian/x2gognomebindings.dirs | 5 ++ debian/x2gognomebindings.docs | 3 + debian/x2gognomebindings.install | 10 +++ debian/x2gognomebindings.lintian-overrides | 3 + debian/x2gognomebindings.manpages | 2 + debian/{postinst => x2gognomebindings.postinst} | 0 debian/{postrm => x2gognomebindings.postrm} | 0 debian/{prerm => x2gognomebindings.prerm} | 0 extension/nautilus-x2goumount.c | 10 ++- man/man8/x2gonautilus.8 | 22 ++++++ man/man8/x2gosuspend-session-gnome.8 | 23 ++++++ man/man8/x2goumount-session-gnome.8 | 23 ++++++ sbin/update-gnome-menu-x2go | 72 ++++++++++++++++++++ share/applications/x2gonautilus.desktop | 3 +- share/applications/x2gosuspend.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 - .../packages/{sshfs.xml => sshfs-x2go-gnome.xml} | 12 ++-- suspend/x2gosuspend-session-gnome | 3 - updatemenu/gnome-settingsx2go.menu | 19 ----- updatemenu/update-gnome-menu-x2go | 51 -------------- x2gonautilus/x2gonautilus | 8 -- xdg-menus/gnome-settings-x2go.menu | 13 ++++ 39 files changed, 389 insertions(+), 191 deletions(-) mode change 100644 => 120000 VERSION create mode 100644 VERSION.x2gognomebindings create mode 100755 bin/x2gonautilus create mode 100755 bin/x2gosuspend-session-gnome create mode 100755 bin/x2goumount-session-gnome delete mode 100644 debian/dirs delete mode 100644 debian/docs create mode 100644 debian/source/format create mode 100644 debian/x2gognomebindings.dirs create mode 100644 debian/x2gognomebindings.docs create mode 100644 debian/x2gognomebindings.install create mode 100644 debian/x2gognomebindings.lintian-overrides create mode 100644 debian/x2gognomebindings.manpages rename debian/{postinst => x2gognomebindings.postinst} (100%) mode change 100644 => 100755 rename debian/{postrm => x2gognomebindings.postrm} (100%) mode change 100644 => 100755 rename debian/{prerm => x2gognomebindings.prerm} (100%) mode change 100644 => 100755 create mode 100644 man/man8/x2gonautilus.8 create mode 100644 man/man8/x2gosuspend-session-gnome.8 create mode 100644 man/man8/x2goumount-session-gnome.8 create mode 100755 sbin/update-gnome-menu-x2go 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 rename share/mime/packages/{sshfs.xml => sshfs-x2go-gnome.xml} (58%) delete mode 100755 suspend/x2gosuspend-session-gnome delete mode 100644 updatemenu/gnome-settingsx2go.menu delete mode 100755 updatemenu/update-gnome-menu-x2go delete mode 100755 x2gonautilus/x2gonautilus create mode 100644 xdg-menus/gnome-settings-x2go.menu The diff of changes is: diff --git a/VERSION b/VERSION deleted file mode 100644 index 4dd0c8d..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.0.1.1 \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 120000 index 0000000..b2d03ec --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +VERSION.x2gognomebindings \ No newline at end of file diff --git a/VERSION.x2gognomebindings b/VERSION.x2gognomebindings new file mode 100644 index 0000000..f7e7717 --- /dev/null +++ b/VERSION.x2gognomebindings @@ -0,0 +1 @@ +2.0.1.3 diff --git a/bin/x2gonautilus b/bin/x2gonautilus new file mode 100755 index 0000000..13c5fc3 --- /dev/null +++ b/bin/x2gonautilus @@ -0,0 +1,29 @@ +#!/usr/bin/perl + +# Copyright (C) 2007-2011 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; + +my $fname=shift; +open(F,"<$fname") or die "can't open $fname"; +my $dir=<F>; +close(F); +system( "nautilus $dir" ); diff --git a/bin/x2gosuspend-session-gnome b/bin/x2gosuspend-session-gnome new file mode 100755 index 0000000..10ae9b6 --- /dev/null +++ b/bin/x2gosuspend-session-gnome @@ -0,0 +1,23 @@ +#!/bin/bash + +# Copyright (C) 2007-2011 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +x2gosuspend-session $X2GO_SESSION diff --git a/bin/x2goumount-session-gnome b/bin/x2goumount-session-gnome new file mode 100755 index 0000000..7133d07 --- /dev/null +++ b/bin/x2goumount-session-gnome @@ -0,0 +1,62 @@ +#!/usr/bin/perl + +# Copyright (C) 2007-2011 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $fname=join(" ", @ARGV); +open(F,"<$fname") or die "can't open $fname"; +my $dir=<F>; +my $session=<F>; +close(F); + +$session=~s/\n//; + +chomp($dir); +my $uname=$ENV{'USER'}; + +my $use_zenity=0; + +if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +{ + $use_zenity=1; +} + +if(system( "fusermount -u $dir" ) == 0) +{ + unlink($fname); + db_deletemount( $session, $dir); + rmdir ($dir); +} +else +{ + if($use_zenity == 0) + { + system("kdialog --error \"Can't umount:\n $dir\"&"); + } + else + { + system("zenity --error --text \"Can't umount:\n $dir\"&"); + } +} diff --git a/debian/changelog b/debian/changelog index 523d8cd..8a9f072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +x2gognomebindings (2.0.1.3-0~x2go1) unstable; urgency=low + + * New upstream version (2.0.1.3): + - Move ,,x2goumount'' script into source project as ,,x2goumount-session-gnome''. + - Move x2gosuspend-session-gnome to /bin folder within source project. + - Add man pages 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. + - Rename sshfs.xml to sshfs-x2go-gnome.xml. + - Use desktop icon names that contain the name of the desktop session. + - Allow blanks in desktop icon names. + - Provide more GNOME'ish way to derive icon path name from GNOME object + URI. + - Let x2goumount-session-gnome be able to handle icons with blanks in + their name. + * Add gnome-menus as dependency. + * Now fully use debhelper for packaging. Fixed lintian issues. + * Use source format 3.0 (native). + * Add linitian-overrides an man pages to package. + * Depend on x2goserver (>=3.0.99.6). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:30:51 +0200 + +x2gognomebindings (2.0.1.2-0~x2go1) unstable; urgency=low + + * Adds x2goversion support + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 29 May 2011 22:36:34 +0200 + x2gognomebindings (2.0.1.1-0~x2go1) unstable; urgency=low * Changed upstream version numbering scheme @@ -6,7 +36,7 @@ x2gognomebindings (2.0.1.1-0~x2go1) unstable; urgency=low x2gognomebindings (2.0.1-1) unstable; urgency=low - * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + * Initial release. -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 27 Aug 2008 15:28:36 +0200 diff --git a/debian/control b/debian/control index 6b208c5..9ed0e3b 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,10 @@ Source: x2gognomebindings Section: gnome Priority: extra Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Uploaders: + Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: autotools-dev, - debhelper (>= 7), + debhelper (>= 7.0.50~), gnome-pkg-tools, intltool, libglade2-dev (>= 2.4), @@ -13,24 +15,27 @@ Build-Depends: autotools-dev, libgtk2.0-dev (>= 2.4), libnautilus-extension-dev (>= 2.14), pkg-config -Standards-Version: 3.7.3 -Homepage: http://obviously-nice.de/ +Standards-Version: 3.9.2 +Homepage: http://code.x2go.org/releases/source/x2gognomebindings +Vcs-Git: git://code.x2go.org/x2gognomebindings.git +Vcs-Browser: http://code.x2go.org/gitweb?p=x2gognomebindings.git;a=summary Package: x2gognomebindings Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - x2goserver, - zenity -Description: Description: x2gognomebindings (GNOME mimetypes for x2go) - x2go is a serverbased computing environment with - - session resuming - - low bandwith support - - LDAP support - - client side mass storage mounting support - - audio/arts support - - authentification by smartcard and usb-stick - - KDE control-center modules for administration - - KDE based tools for just in time messaging and client surveillance + x2goserver (>=3.0.99.6-0~), + zenity, + gnome-menus, + gnome-colors-common +Description: Description: x2gognomebindings (GNOME mimetypes for X2go) + X2go is a server based computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick . - x2gognomebindings contains mimetype information for x2go. + x2gognomebindings contains MIME type information for X2go if used with + GNOME desktops. diff --git a/debian/copyright b/debian/copyright index 151f0b4..f93bbbe 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,22 +5,22 @@ It was downloaded from www.obviously-nice.de Upstream Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -Copyright (C) 2007 obviously nice - http://www.obviouslynice.de - -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 -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the -Free Software Foundation, Inc., -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +Copyright (C) 2007-2011 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 +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the +Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Copyright (C) 2007 Oleksandr Shneyder oleksandr.shneyder(a)obviously-nice.de @@ -31,8 +31,6 @@ heinz-m.graesing(a)obviously-nice.de On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. - - The Debian packaging is (C) 2007, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and is licensed under the GPL, see above. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index e4bd112..0000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/sbin -etc/xdg/menus \ No newline at end of file diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 50bd824..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -NEWS -README diff --git a/debian/rules b/debian/rules index cf73a3c..c4d4f8f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,59 +1,13 @@ #!/usr/bin/make -f -config.status: configure - dh_testdir - cp -v /usr/share/misc/config.sub config.sub - cp -v /usr/share/misc/config.guess config.guess - ./configure $(CROSS) --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" +%: + dh $@ -build: build-stamp -build-stamp: config.status - dh_testdir - $(MAKE) - touch $@ +override_dh_auto_configure: + cp /usr/share/misc/config.sub . + cp /usr/share/misc/config.guess . + dh_auto_configure -clean: - dh_testdir - dh_testroot - rm -f build-stamp - -[ ! -f po/Makefile ] || $(MAKE) -C po distclean - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean config.sub config.guess - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) DESTDIR=$(CURDIR)/debian/x2gognomebindings install - $(MAKE) -C po DESTDIR=$(CURDIR)/debian/x2gognomebindings install - install x2gonautilus/x2gonautilus $(CURDIR)/debian/x2gognomebindings/usr/bin/ - install suspend/x2gosuspend-session-gnome $(CURDIR)/debian/x2gognomebindings/usr/bin/ - install updatemenu/update-gnome-menu-x2go $(CURDIR)/debian/x2gognomebindings/usr/sbin/ - cp -ar share $(CURDIR)/debian/x2gognomebindings/usr/ - cp updatemenu/gnome-settingsx2go.menu $(CURDIR)/debian/x2gognomebindings/etc/xdg/menus - -binary-indep: build install -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_install: + make -C po DESTDIR=../debian/x2gognomebindings install + dh_auto_install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/x2gognomebindings.dirs b/debian/x2gognomebindings.dirs new file mode 100644 index 0000000..183c74f --- /dev/null +++ b/debian/x2gognomebindings.dirs @@ -0,0 +1,5 @@ +usr/bin +usr/sbin +etc/xdg/menus +usr/share/x2go +usr/share/x2go/versions diff --git a/debian/x2gognomebindings.docs b/debian/x2gognomebindings.docs new file mode 100644 index 0000000..bcb3587 --- /dev/null +++ b/debian/x2gognomebindings.docs @@ -0,0 +1,3 @@ +NEWS +README +debian/copyright diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install new file mode 100644 index 0000000..f07eb37 --- /dev/null +++ b/debian/x2gognomebindings.install @@ -0,0 +1,10 @@ +bin/x2gosuspend-session-gnome usr/bin/ +bin/x2goumount-session-gnome usr/bin/ +bin/x2gonautilus usr/bin/ +sbin/update-gnome-menu-x2go usr/sbin/ +VERSION.x2gognomebindings usr/share/x2go/versions/ +# Installed into DESTDIR by Makefile +#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/debian/x2gognomebindings.lintian-overrides b/debian/x2gognomebindings.lintian-overrides new file mode 100644 index 0000000..ad92f39 --- /dev/null +++ b/debian/x2gognomebindings.lintian-overrides @@ -0,0 +1,3 @@ +x2gognomebindings: postinst-has-useless-call-to-ldconfig +x2gognomebindings: postrm-has-useless-call-to-ldconfig +x2gognomebindings: pkg-has-shlibs-control-file-but-no-actual-shared-libs diff --git a/debian/x2gognomebindings.manpages b/debian/x2gognomebindings.manpages new file mode 100644 index 0000000..06e118b --- /dev/null +++ b/debian/x2gognomebindings.manpages @@ -0,0 +1,2 @@ +man/man8/*.8 + diff --git a/debian/postinst b/debian/x2gognomebindings.postinst old mode 100644 new mode 100755 similarity index 100% rename from debian/postinst rename to debian/x2gognomebindings.postinst diff --git a/debian/postrm b/debian/x2gognomebindings.postrm old mode 100644 new mode 100755 similarity index 100% rename from debian/postrm rename to debian/x2gognomebindings.postrm diff --git a/debian/prerm b/debian/x2gognomebindings.prerm old mode 100644 new mode 100755 similarity index 100% rename from debian/prerm rename to debian/x2gognomebindings.prerm diff --git a/extension/nautilus-x2goumount.c b/extension/nautilus-x2goumount.c index 80f33ed..081abbe 100644 --- a/extension/nautilus-x2goumount.c +++ b/extension/nautilus-x2goumount.c @@ -47,11 +47,13 @@ static void nautilus_x2goumount_execute (NautilusMenuItem *item) GList *files; files = (GList*)g_object_get_data (G_OBJECT (item), "files"); gchar* uri = nautilus_file_info_get_uri ((NautilusFileInfo *)files->data); - char* cmd=malloc(strlen(uri)+strlen("x2goumount")); - strcpy(cmd,"x2goumount "); - strcat(cmd, uri+7); + gchar *file_path = g_filename_from_uri (uri, NULL, NULL); + char* cmd=malloc(strlen(file_path)+strlen("x2goumount-session-gnome")); + strcpy(cmd,"x2goumount-session-gnome "); + strcat(cmd, file_path); g_spawn_command_line_async (cmd, NULL); - g_free (uri); + g_free (uri); + g_free (file_path); } static const gchar* get_verified_icon_name (const gchar* icon_name) 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/man/man8/x2gosuspend-session-gnome.8 b/man/man8/x2gosuspend-session-gnome.8 new file mode 100644 index 0000000..749b7a9 --- /dev/null +++ b/man/man8/x2gosuspend-session-gnome.8 @@ -0,0 +1,23 @@ +'\" -*- 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 x2gosuspend-session-gnome 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2gosuspend-session-gnome \- X2go GNOME Binding for X2go Server: Suspend X2go Sessions from GNOME Menu +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosuspend-session-gnome <session_id> + +.SH DESCRIPTION +\fBx2gosuspend-gnome-session\fR is a component of the X2go GNOME bindings and a simple wrapper around the X2go Server +script ,,x2gosuspend-session''--with the potentials to be customized for X2go on GNOME desktops. +.PP +.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/man/man8/x2goumount-session-gnome.8 b/man/man8/x2goumount-session-gnome.8 new file mode 100644 index 0000000..f8d50ea --- /dev/null +++ b/man/man8/x2goumount-session-gnome.8 @@ -0,0 +1,23 @@ +'\" -*- 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 x2goumount-session-gnome 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2goumount-session-gnome \- X2go GNOME Binding for X2go Server: Unmount shared folder via Nautilus +.SH SYNOPSIS +'nh +.fi +.ad l +x2goumount-session-gnome <arg1> <arg2> ... + +.SH DESCRIPTION +\fBx2goumount-session-gnome\fR is a component of the X2go GNOME bindings. It is run if a user selects the ,,Unmount'' +action in the right-click context menu on X2go shared folder icons on the GNOME desktop. +.PP +.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/sbin/update-gnome-menu-x2go b/sbin/update-gnome-menu-x2go new file mode 100755 index 0000000..9d4de0f --- /dev/null +++ b/sbin/update-gnome-menu-x2go @@ -0,0 +1,72 @@ +#!/usr/bin/perl + +# Copyright (C) 2007-2011 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; + +my $mode=shift; +if( $mode eq "--help" ) +{ + print "Usage: $0 [--remove]\n"; + print " Add or remove \"Suspend X2Go session\" button to gnome-settings menu \n"; + exit; +} +my $menu; +if ( -e "/etc/xdg/menus/gnome-settings.menu" ) +{ + $menu="/etc/xdg/menus/gnome-settings.menu"; +} +elsif ( -e "/etc/xdg/menus/settings.menu" ) +{ + $menu="/etc/xdg/menus/settings.menu"; +} +else +{ + die "Settings menu not found in /etc/xdg/menus"; +} + +my $menustr="<MergeFile>/etc/xdg/menus/gnome-settings-x2go.menu</MergeFile>\n"; + +open(FILE,"<$menu"); +my @ln=<FILE>; +close(FILE); +my $text=join("",@ln); + +if( $mode eq "--remove" ) +{ + if($text =~ m/$menustr/) + { + $text =~ s/\n$menustr//; + open(FILE,">$menu"); + print FILE $text; + close(FILE); + } +} +else +{ + if(! ($text =~ m/$menustr/)) + { + $text =~ s/<\/Layout>/<\/Layout>\n$menustr/; + open(FILE,">$menu"); + print FILE $text; + close(FILE); + } +} \ No newline at end of file diff --git a/share/applications/x2gonautilus.desktop b/share/applications/x2gonautilus.desktop index e0ad6fc..c653e6d 100644 --- a/share/applications/x2gonautilus.desktop +++ b/share/applications/x2gonautilus.desktop @@ -1,9 +1,10 @@ [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 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; 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-x2go-gnome.xml similarity index 58% rename from share/mime/packages/sshfs.xml rename to share/mime/packages/sshfs-x2go-gnome.xml index fe04e48..506101e 100644 --- a/share/mime/packages/sshfs.xml +++ b/share/mime/packages/sshfs-x2go-gnome.xml @@ -1,18 +1,18 @@ <?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)"/> + <glob pattern="* (sshfs-cdrom-gnome)"/> </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)"/> + <glob pattern="* (sshfs-disk-gnome)"/> </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)"/> + <glob pattern="* (sshfs-removable-gnome)"/> </mime-type> </mime-info> diff --git a/suspend/x2gosuspend-session-gnome b/suspend/x2gosuspend-session-gnome deleted file mode 100755 index df57978..0000000 --- a/suspend/x2gosuspend-session-gnome +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -x2gosuspend-session $X2GO_SESSION diff --git a/updatemenu/gnome-settingsx2go.menu b/updatemenu/gnome-settingsx2go.menu deleted file mode 100644 index 93923d2..0000000 --- a/updatemenu/gnome-settingsx2go.menu +++ /dev/null @@ -1,19 +0,0 @@ -<!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> - - - - \ No newline at end of file diff --git a/updatemenu/update-gnome-menu-x2go b/updatemenu/update-gnome-menu-x2go deleted file mode 100755 index d9e1619..0000000 --- a/updatemenu/update-gnome-menu-x2go +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/perl -use strict; - -my $mode=shift; -if( $mode eq "--help" ) -{ - print "Usage: $0 [--remove]\n"; - print " Add or remove \"Suspend X2Go session\" button to gnome-settings menu \n"; - exit; -} -my $menu; -if ( -e "/etc/xdg/menus/gnome-settings.menu" ) -{ - $menu="/etc/xdg/menus/gnome-settings.menu"; -} -elsif ( -e "/etc/xdg/menus/settings.menu" ) -{ - $menu="/etc/xdg/menus/settings.menu"; -} -else -{ - die "Settings menu not found in /etc/xdg/menus"; -} - -my $menustr="<MergeFile>/etc/xdg/menus/gnome-settingsx2go.menu</MergeFile>\n"; - -open(FILE,"<$menu"); -my @ln=<FILE>; -close(FILE); -my $text=join("",@ln); - -if( $mode eq "--remove" ) -{ - if($text =~ m/$menustr/) - { - $text =~ s/\n$menustr//; - open(FILE,">$menu"); - print FILE $text; - close(FILE); - } -} -else -{ - if(! ($text =~ m/$menustr/)) - { - $text =~ s/<\/Layout>/<\/Layout>\n$menustr/; - open(FILE,">$menu"); - print FILE $text; - close(FILE); - } -} \ No newline at end of file diff --git a/x2gonautilus/x2gonautilus b/x2gonautilus/x2gonautilus deleted file mode 100755 index 48f3c9e..0000000 --- a/x2gonautilus/x2gonautilus +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/perl -use strict; - -my $fname=shift; -open(F,"<$fname") or die "can't open $fname"; -my $dir=<F>; -close(F); -system( "nautilus $dir" ); 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-31-g8227f81
by git-admin＠x2go.org 12 Oct '11

12 Oct '11

The branch, master has been updated via 8227f81ad06cfafd26de1fded85d355c1fefd110 (commit) via 87e635cc4e85e3eedee6b1dcbfc6cd85ba341bff (commit) from 7b3fe1e047ea49a18ec2ff8d68a828e80d5009ea (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 8227f81ad06cfafd26de1fded85d355c1fefd110 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 11:31:33 2011 +0200 release 2.0.1.3, rework changelog commit 87e635cc4e85e3eedee6b1dcbfc6cd85ba341bff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 12 11:28:17 2011 +0200 version increment ----------------------------------------------------------------------- Summary of changes: VERSION.x2gognomebindings | 2 +- debian/changelog | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/VERSION.x2gognomebindings b/VERSION.x2gognomebindings index 7c831aa..f7e7717 100644 --- a/VERSION.x2gognomebindings +++ b/VERSION.x2gognomebindings @@ -1 +1 @@ -2.0.1.2 +2.0.1.3 diff --git a/debian/changelog b/debian/changelog index 13950a3..8a9f072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low +x2gognomebindings (2.0.1.3-0~x2go1) unstable; urgency=low * New upstream version (2.0.1.3): - - 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. + - Move ,,x2goumount'' script into source project as ,,x2goumount-session-gnome''. + - Move x2gosuspend-session-gnome to /bin folder within source project. + - Add man pages 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. @@ -15,14 +15,12 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low - Let x2goumount-session-gnome be able to handle icons with blanks in their name. * 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). + * Now fully use debhelper for packaging. Fixed lintian issues. * Use source format 3.0 (native). * Add linitian-overrides an man pages to package. * Depend on x2goserver (>=3.0.99.6). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 24 Sep 2011 03:06:58 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 11:30:51 +0200 x2gognomebindings (2.0.1.2-0~x2go1) unstable; urgency=low 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

← Newer
1
...
5
6
7
8
9
10
11
...
14
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits October 2011