x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-193-gf437ecd
by git-admin＠x2go.org 23 Jul '13

23 Jul '13

The branch, master has been updated via f437ecd5be93ca4f03285c21ce1c01c229582af0 (commit) from 65169c9d65b117802e50631be0bbd719163d969e (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 f437ecd5be93ca4f03285c21ce1c01c229582af0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 23 23:05:57 2013 +0200 Make X2Go Server aware of the MATE desktop environment. Conflicts (resolved by Mike Gabriel): x2goserver/bin/x2goruncommand ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gomountdirs | 4 ++++ x2goserver/bin/x2goruncommand | 6 +++++- x2goserver/bin/x2goumount-session | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0c5ede7..2dfb491 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ x2goserver (4.0.1.4-0~x2go1) UNRELEASED; urgency=low * New upstream versino (4.0.1.4): - Multiply query USED_DISPLAYS and USED_PORTS in x2gostartagent to minimize race conditions in cases where many clients launch session simultaneously. + - Make X2Go Server aware of the MATE desktop environment. -- Mike Gabriel <mike.gabriel(a)das-netzwertkeam.de> Fri, 19 Jul 2013 17:53:11 +0200 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index b86fe1a..3152fb2 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -285,6 +285,10 @@ for (my $i=0;$i<@dirs;$i++) { $current_desktop="-gnome"; } + elsif (($session =~ m/_stDMATE_dp/) && system("x2gofeature X2GO_MATEBINDINGS >/dev/null") == 0) + { + $current_desktop="-mate"; + } elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2bcd8e0..e10a0ac 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -71,7 +71,7 @@ if [ -e "/etc/lsb-release" ]; then source /etc/lsb-release fi -# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) +# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY, MATE) # NOTES on GNOME startup behaviour in different distributions # =========================================================== @@ -125,6 +125,8 @@ elif ([ "$cmd" == "CINNAMON" ] || [ "$cmd" == "cinnamon" ]); then export DESKTOP_SESSION="cinnamon2d" args=" --session=$DESKTOP_SESSION" +elif [ "$cmd" == "MATE" ]; then + cmd=="/usr/bin/mate-session" elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then @@ -177,6 +179,8 @@ if [ "$cmd" == "TERMINAL" ]; then cmd="/usr/bin/konsole" # KDE4 konsole behaves differently from other terminals IMEXIT="false" + elif [ -e "/usr/bin/mate-terminal" ]; then + cmd="/usr/bin/mate-terminal" elif [ -e "/usr/bin/gnome-terminal" ]; then cmd="/usr/bin/gnome-terminal" elif [ -e "/usr/bin/lxterminal" ]; then diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index da2ddb9..a77f856 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -81,7 +81,7 @@ close(F); my $use_zenity=0; -if ($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +if (($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") || ($ENV{'MATE_DESKTOP_SESSION_ID'} ne "")) { $use_zenity=1; } @@ -179,6 +179,10 @@ break: { $current_desktop="-gnome"; } + elsif (($session =~ m/_stDMATE_dp/) && system("x2gofeature X2GO_MATEBINDINGS >/dev/null") == 0) + { + $current_desktop="-mate"; + } elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; 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

x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-109-g6cbe83c
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 6cbe83c867d60bae52823c9a784c515064337a6e (commit) from 97b104e02b2c1d3886740e0450da2a922bcb8519 (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: .../sbin/x2gothinclient_create | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 82b5584..b19a9ac 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -158,10 +158,10 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install syslinux locales -y [ \$? -eq 0 ] && dpkg-reconfigure locales [ \$? -eq 0 ] && apt-get install linux-image-486 -y -[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486.tmp -[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp -[ \$? -eq 0 ] && mv /initrd.img /initrd.img.486.tmp -[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -s \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp +[ \$? -eq 0 ] && test -e /vmlinuz && mv /vmlinuz /vmlinuz.486.tmp || true +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp +[ \$? -eq 0 ] && test -e /vmlinuz && mv /initrd.img /initrd.img.486.tmp || true +[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp [ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y [ \$? -eq 0 ] && apt-get install patch -y @@ -192,8 +192,8 @@ export X2GO_HANDLE_DAEMONS=false # tweak plymouth [ \$? -eq 0 ] && apt-get install plymouth plymouth-themes-all -y [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release -[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf -[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf +[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true +[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh 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 - wheezy-tce (branch) updated: 1.1.0.0
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 37470492cb86f3dd411f468c4a333840795776f3 (commit) from b41ad6fdfa247c77d79cc5a6b4fa85675f8eb43d (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 +- debian/changelog | 8 ++++---- x2gocdmanager/man/x2gocdmanager.8 | 2 +- x2gocdmanager/man/x2goejectcd.1 | 2 +- x2gosmartcardrules/man/x2gognupgccid.8 | 2 +- x2gothinclient/man/x2gothinclientd.8 | 2 +- .../man/x2gothinclient_cleanup.8 | 2 +- .../man/x2gothinclient_create.8 | 2 +- .../man/x2gothinclient_preptftpboot.8 | 2 +- .../man/x2gothinclient_shell.8 | 2 +- .../man/x2gothinclient_update.8 | 2 +- .../man/x2gothinclient_upgrade.8 | 2 +- x2gousbmount/man/x2gousbmount.8 | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 4d4f436..a6bbdb5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.9 +1.1.0.0 diff --git a/debian/changelog b/debian/changelog index 1660819..5f97dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low +x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] - * New upstream version (1.0.99.1): + * New upstream version (1.1.0.0): - When X2Go TCE has plymouth installed, make sure pressing the halt button does not change to the wrong tty. - Truncate echo output lines to less than 80 chars. @@ -105,11 +105,11 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low manager. [ Oleksandr Shneyder ] - * New upstream version (1.0.99.1): + * New upstream version (1.1.0.0): - Use expand_file from File::Path::Expand to detect full path of ~x2gothinclient/.halt. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 19 Jul 2013 23:31:10 +0200 x2gothinclient (1.0.1.8-0~x2go1) unstable; urgency=low diff --git a/x2gocdmanager/man/x2gocdmanager.8 b/x2gocdmanager/man/x2gocdmanager.8 index ccbcb8d..b3d0a15 100644 --- a/x2gocdmanager/man/x2gocdmanager.8 +++ b/x2gocdmanager/man/x2gocdmanager.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocdmanager 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gocdmanager 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gocdmanager \- CD/DVD Management Daemon running on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gocdmanager/man/x2goejectcd.1 b/x2gocdmanager/man/x2goejectcd.1 index db534bf..71e10d4 100644 --- a/x2gocdmanager/man/x2goejectcd.1 +++ b/x2gocdmanager/man/x2goejectcd.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goejectcd 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2goejectcd 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2goejectcd \- CD/DVD bay eject tool for X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gosmartcardrules/man/x2gognupgccid.8 b/x2gosmartcardrules/man/x2gognupgccid.8 index 01e0f6b..6f419de 100644 --- a/x2gosmartcardrules/man/x2gognupgccid.8 +++ b/x2gosmartcardrules/man/x2gognupgccid.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gognupgccid 8 "16 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gognupgccid 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gognupgccid \- udev Script handling GnuPG smart card readers on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gothinclient/man/x2gothinclientd.8 b/x2gothinclient/man/x2gothinclientd.8 index 2fc2317..3daebca 100644 --- a/x2gothinclient/man/x2gothinclientd.8 +++ b/x2gothinclient/man/x2gothinclientd.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclientd 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclientd 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclientd \- Session Control Daemon running on X2Go Thin Clients. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 index fdec84e..7c998eb 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_cleanup 8 "15 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_cleanup 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclient_cleanup \- Removes the X2Go Thin Client environment from the X2Go PXE server. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_create.8 b/x2gothinclientmanagement/man/x2gothinclient_create.8 index b046fcd..77b3eec 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_create.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_create.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_create 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_create 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclient_create \- Creates X2Go Thin Client chroot Environment. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 index 255803e..a50050c 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_preptftpboot 8 "14 June 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_preptftpboot 8 "July 2013" "Version 1.1.0.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered via tftpd) on X2Go PXE Server. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_shell.8 b/x2gothinclientmanagement/man/x2gothinclient_shell.8 index f98fefe..8eaba6b 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_shell.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_shell.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_shell 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_shell 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclient_shell \- Opens a shell within the X2Go Thin Client chroot Environment. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_update.8 b/x2gothinclientmanagement/man/x2gothinclient_update.8 index 6328e65..38a5859 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_update.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_update.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_update 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_update 8 "July 2013" "Version 1.1.0.x" "X2go Thin Client Environment" .SH NAME x2gothinclient_update \- Updates the X2Go Thin Client configuration. .SH SYNOPSIS diff --git a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 index 2caf9a2..aa14cf3 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_upgrade 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gothinclient_upgrade 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gothinclient_upgrade \- Upgrade the X2Go Thin Client's software. .SH SYNOPSIS diff --git a/x2gousbmount/man/x2gousbmount.8 b/x2gousbmount/man/x2gousbmount.8 index ede1cfe..f053f00 100644 --- a/x2gousbmount/man/x2gousbmount.8 +++ b/x2gousbmount/man/x2gousbmount.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gousbmount 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" +.TH x2gousbmount 8 "July 2013" "Version 1.1.0.x" "X2Go Thin Client Environment" .SH NAME x2gousbmount \- udev Script handling USB Flash Drives on X2Go Thin Clients. .SH SYNOPSIS 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 - wheezy-tce (branch) updated: 1.0.1.8-117-gb41ad6f
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via b41ad6fdfa247c77d79cc5a6b4fa85675f8eb43d (commit) from 7ee07a96063a3266bd79ce109924a88c8eaa4ab5 (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 | 1 + .../etc/x2gothinclient_settings | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6cc8c51..1660819 100644 --- a/debian/changelog +++ b/debian/changelog @@ -70,6 +70,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - TCE creation: fix installation path of FreeRDP's known_hosts file. - TCE creation: install the TCE from the nightly builds while this project is not yet released. (Fixes: #251). + - TCE creation: default to wheezy for creating new TCE environments. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index b071ce9..d7f942c 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -37,9 +37,9 @@ TC_SHELL="bash" TC_DEBMIRROR_URL="http://ftp.debian.org/debian" # Distro codename to use... -#TC_DISTRO_CODENAME="wheezy" +TC_DISTRO_CODENAME="wheezy" # or use older Debian squeeze... -TC_DISTRO_CODENAME="squeeze" +#TC_DISTRO_CODENAME="squeeze" # Retrieve X2Go packages from this URL ### FIXME: once we release this project, we have to remove the heuler area from the deburl below!!!! ### 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 - wheezy-tce (branch) updated: 1.0.1.8-115-g561847d
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 561847d996f48a482bb85d98b28f1f282bf56edc (commit) from 021379933907c49a8d49436b735c5459ad5d444a (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 | 3 +++ debian/control | 7 +++---- x2gothinclient/sbin/x2gothinclientd | 1 - .../sbin/x2gothinclient_create | 3 +++ 4 files changed, 9 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 74de118..2494e04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low support). + Add dependency (x2gousbmount, x2gocdmanager): libfile-path-expand-perl. + Bump Standards to 3.9.3 (no changes needed). + + Remove TCE tools (vim, mc, ...) from Recommends: field, install those via + x2gothinclient_create. Add pulseaudio, dbus-x11, policykit-1 to Depends: + field. * /debian/rules: + Fix lintian issue: debian-rules-missing-recommended-target build-arch + Fix lintian issue: debian-rules-missing-recommended-target build-indep diff --git a/debian/control b/debian/control index e7942e8..968d59b 100644 --- a/debian/control +++ b/debian/control @@ -55,6 +55,9 @@ Depends: xauth, xinit, locales, + pulseaudio-x11 | pulseaudio, + dbus-x11, + policykit-1, Recommends: x2gocdmanager, x2gousbmount, @@ -62,10 +65,6 @@ Recommends: gnupg-agent, pinentry-x2go, gpgsm, - vim, - mc, - acpid, - memtest86+, x11-xserver-utils, Suggests: plymouth, diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 9d5afc6..0fac6b4 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -130,7 +130,6 @@ elsif ($pid == 0 ) { system("su - x2gothinclient -c \"DISPLAY=:0 pulseaudio -D -n \\ -L 'module-native-protocol-tcp port=4713' \\ - -L 'module-esound-protocol-tcp port=16001' \\ -L 'module-udev-detect' --exit-idle-time=65535\""); } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 871778d..0e6037c 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -168,6 +168,9 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y +# some extra tools that are useful on the TCE +[ \$? -eq 0 ] && apt-get install vim mc acpid memtest86+ -y + # blacklist kernel modules [ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf [ \$? -eq 0 ] && for mod in $TC_MODULE_BLACKLIST; do echo "blacklist \$mod" >> /etc/modprobe.d/blacklist.conf; done 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 - wheezy-tce (branch) updated: 1.0.1.8-113-g66935e8
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 66935e87846953e87ab2946cf7db8e8a4293fc5a (commit) from 0fedd7f92b0ae52b97e5dee43ea559206610bd02 (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 | 1 + .../sbin/x2gothinclient_create | 2 ++ .../sbin/x2gothinclient_upgrade | 1 + 3 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d993470..16c7126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Fix code that turns absolute symlinks into relative symlink for /vmlinuz and /initrd.img. - Fix shutdown button failures. + - TCE management: Do an apt-get clean after TCE creation/upgrade. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index d2fa78d..faa50ee 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -195,6 +195,8 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true [ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true +[ \$? -eq 0 ] && apt-get clean + EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 16abcc5..d35972a 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -72,6 +72,7 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get update [ \$? -eq 0 ] && apt-get upgrade +[ \$? -eq 0 ] && apt-get clean # check for kernel upgrades for symlink in /vmlinuz /vmlinuz.old /initrd.img /initrd.img.old; do 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 - wheezy-tce (branch) updated: 1.0.1.8-110-g1df5f43
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 1df5f432f223a8816d22a8ee491eaffed020f870 (commit) from 6cbe83c867d60bae52823c9a784c515064337a6e (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 | 2 ++ .../sbin/x2gothinclient_create | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9c65d6d..f3c0639 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Unmount /proc, /sys and /dev/pts before doing x2gothinclient_cleanup. - Add README.qemu that explains how to test the X2Go TCE with qemu. (Fixes: #115). + - Fix code that turns absolute symlinks into relative symlink for /vmlinuz + and /initrd.img. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index b19a9ac..d2fa78d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -158,9 +158,9 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install syslinux locales -y [ \$? -eq 0 ] && dpkg-reconfigure locales [ \$? -eq 0 ] && apt-get install linux-image-486 -y -[ \$? -eq 0 ] && test -e /vmlinuz && mv /vmlinuz /vmlinuz.486.tmp || true +[ \$? -eq 0 ] && test -h /vmlinuz && mv /vmlinuz /vmlinuz.486.tmp || true [ \$? -eq 0 ] && LINK_TARGET=\$(readlink /vmlinuz.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /vmlinuz.486 && rm -f /vmlinuz.486.tmp -[ \$? -eq 0 ] && test -e /vmlinuz && mv /initrd.img /initrd.img.486.tmp || true +[ \$? -eq 0 ] && test -h /initrd.img && mv /initrd.img /initrd.img.486.tmp || true [ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot@boot@') && ln -sf \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp [ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y 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 - wheezy-tce (branch) updated: 1.0.1.8-114-g0213799
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 021379933907c49a8d49436b735c5459ad5d444a (commit) from 66935e87846953e87ab2946cf7db8e8a4293fc5a (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 | 1 + .../sbin/x2gothinclient_create | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 16c7126..74de118 100644 --- a/debian/changelog +++ b/debian/changelog @@ -67,6 +67,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low and /initrd.img. - Fix shutdown button failures. - TCE management: Do an apt-get clean after TCE creation/upgrade. + - TCE creation: fix installation path of FreeRDP's known_hosts file. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index faa50ee..871778d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -69,7 +69,7 @@ test -f $TC_CONFIG/x2gothinclient_sessions || cp $SHAREDIR/etc/x2gothinclient_se test -f $TC_CONFIG/x2goclient-background.svg || cp $SHAREDIR/etc/x2goclient-background.svg $TC_CONFIG mkdir -p $TC_CONFIG/freerdp -test -f $TC_CONFIG/freerdp/known_hosts || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > $TC_CONFIG/known_hosts +test -f $TC_CONFIG/freerdp/known_hosts || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > $TC_CONFIG/freerdp/known_hosts apt-get install debootstrap mkdir -p $TC_CHROOT 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 - wheezy-tce (branch) updated: 1.0.1.8-108-g97b104e
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 97b104e02b2c1d3886740e0450da2a922bcb8519 (commit) from 60828dfaef5985930251df0e1de5c5e8ee868c56 (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: .../sbin/x2gothinclient_cleanup | 2 +- .../sbin/x2gothinclient_create | 8 ++++---- x2gothinclientmanagement/sbin/x2gothinclient_shell | 8 ++++---- .../sbin/x2gothinclient_upgrade | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup index 984b3e2..5157fb6 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup +++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup @@ -55,7 +55,7 @@ read # make sure, all chroot-internal mountpoints are gone... for mountpoint in proc dev/pts sys; do while true; do - cat /proc/mounts | grep "$TC_CHROOT/$mountpoint" >/dev/null && umount "$TC_CHROOT/$mountpoint" || break + cat /proc/mounts | grep "$TC_CHROOT/$mountpoint" >/dev/null && umount "$TC_CHROOT/$mountpoint" || break done done diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index fdaa1fd..82b5584 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -198,10 +198,10 @@ export X2GO_HANDLE_DAEMONS=false EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh -mkdir -p $TC_CHROOT/{proc,dev/pts,sys} -mount -tproc proc $TC_CHROOT/proc || true -mount -tsysfs sys $TC_CHROOT/sys || true -mount -tdevpts devpts $TC_CHROOT/dev/pts || true +mkdir -p "$TC_CHROOT/"{proc,dev/pts,sys} +mount -tproc proc "$TC_CHROOT/proc" || true +mount -tsysfs sys "$TC_CHROOT/sys" || true +mount -tdevpts devpts "$TC_CHROOT/dev/pts" || true chroot $TC_CHROOT /x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 736776e..42f4f5d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -92,10 +92,10 @@ echo EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" -mkdir -p $TC_CHROOT/{proc,dev/pts,sys} -mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true -mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true -mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || true +mkdir -p "$TC_CHROOT/"{proc,dev/pts,sys} +mount | grep "$TC_CHROOT/proc" >/dev/null || mount -tproc proc "$TC_CHROOT/proc" || true +mount | grep "$TC_CHROOT/sys" >/dev/null || mount -tsysfs sys "$TC_CHROOT/sys" || true +mount | grep "$TC_CHROOT/dev/pts" >/dev/null || mount -tdevpts devts "$TC_CHROOT/dev/pts" || true cp "$TC_CHROOT/etc/resolv.conf" "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" test -f /etc/resolv.conf && cp /etc/resolv.conf "$TC_CHROOT/etc/resolv.conf" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index a53c183..16abcc5 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -91,10 +91,10 @@ echo EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" -mkdir -p $TC_CHROOT/{proc,dev/pts,sys} -mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true -mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true -mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || true +mkdir -p "$TC_CHROOT/"{proc,dev/pts,sys} +mount | grep "$TC_CHROOT/proc" >/dev/null || mount -tproc proc "$TC_CHROOT/proc" || true +mount | grep "$TC_CHROOT/sys" >/dev/null || mount -tsysfs sys "$TC_CHROOT/sys" || true +mount | grep "$TC_CHROOT/dev/pts" >/dev/null || mount -tdevpts devts "$TC_CHROOT/dev/pts" || true chroot "$TC_CHROOT" /x2go_tce_upgrade.sh 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 - wheezy-tce (branch) updated: 1.0.1.8-112-g0fedd7f
by git-admin＠x2go.org 22 Jul '13

22 Jul '13

The branch, wheezy-tce has been updated via 0fedd7f92b0ae52b97e5dee43ea559206610bd02 (commit) from 9165ed83157a7708814d5c00fb973311000a5a25 (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 | 1 + x2gothinclient/sbin/x2gothinclientd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f3c0639..d993470 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low (Fixes: #115). - Fix code that turns absolute symlinks into relative symlink for /vmlinuz and /initrd.img. + - Fix shutdown button failures. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index ff3e5b5..9d5afc6 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -136,7 +136,7 @@ elsif ($pid == 0 ) # test if x2goclient is running, if not launch it... if ( !check_client() ) { - qx(su - x2gothinclient -c \"export DISPLAY=:0; /etc/x2go/x2gothinclient_start\"); + qx(su - x2gothinclient -c \"export DISPLAY=:0; /etc/x2go/x2gothinclient_start\ 1>/dev/null 2>/dev/null"); } } } 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits