This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 05a4f8e Run x2gothinclient_shell and x2gothinclient_upgrade with LANG=C. new ac382b9 minidesktop: Add WindowList applet to MATE panel. new 3021715 On $HOME creation, copy x2gothinclient-minidesktop.desktop into ~/Desktop. new 5b60f6f rebase with previous new ef99058 Provide init script for x2gothinclient-minidesktop to handle maintenance tasks if TCE is in MiniDesktop mode. new 37d473d rebase with .desktop file commit new 767bcbc rebase with init script commit new 30fc5f2 rename bin:package x2gothinclient-minidesktop-mate to x2gothinclient-minidesktop The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 +++++- debian/control | 10 +++++++--- debian/x2gothinclient-minidesktop-mate.install | 4 ---- debian/x2gothinclient-minidesktop.init | 1 + debian/x2gothinclient-minidesktop.install | 5 +++++ ...ostinst => x2gothinclient-minidesktop.postinst} | 0 ....desktop => x2gothinclient-minidesktop.desktop} | 2 +- .../init/x2gothinclient-minidesktop.init | 10 ++-------- .../x2gothinclient-minidesktop-mate.layout | 7 +++++++ .../share/etc/x2gothinclient_init | 1 + 10 files changed, 29 insertions(+), 17 deletions(-) delete mode 100644 debian/x2gothinclient-minidesktop-mate.install create mode 120000 debian/x2gothinclient-minidesktop.init create mode 100644 debian/x2gothinclient-minidesktop.install rename debian/{x2gothinclient-minidesktop-mate.postinst => x2gothinclient-minidesktop.postinst} (100%) rename x2gothinclient-minidesktop/autostart/{x2goclient.desktop => x2gothinclient-minidesktop.desktop} (89%) copy x2gothinclient-chroot/init/x2gothinclient-chroot.init => x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init (63%) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 5b60f6fd4ad49b5421ef35b900b83edb0fea8a53 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 22 17:34:34 2014 +0200 rebase with previous --- .../autostart/x2gothinclient-minidesktop.desktop | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop b/x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop new file mode 100644 index 0000000..7a1071c --- /dev/null +++ b/x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=X2Go Client +Exec=/etc/x2go/x2gothinclient_start +Icon=x2goclient +StartupWMClass=x2goclient +X-Window-Icon=x2goclient +X-HildonDesk-ShowInToolbar=true +X-Osso-Type=application/x-executable +Terminal=false +Categories=Qt;KDE;Network; +Keywords=Terminal,Client,Remote,Desktop,Published,Applications,Session,Profile; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit ac382b91bd86ef8bafa0d7e4cb4f3c258a6cc2a3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 22 17:31:40 2014 +0200 minidesktop: Add WindowList applet to MATE panel. --- debian/changelog | 1 + .../x2gothinclient-minidesktop-mate.layout | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 73520cf..66f8381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low - New TCE component: x2gothinclient-minidesktop-mate. Instead of using X2Go Client as login manager, we launch a minimal MATE desktop and connect to X2Go sessions from there. + - x2gothinclient-minidesktop: Add WindowList applet to MATE panel. - Add COPYING file. - Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf. diff --git a/x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout b/x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout index 802b3a5..4670789 100644 --- a/x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout +++ b/x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout @@ -51,6 +51,13 @@ toplevel-id=bottom position=60 locked=true +[Object window-list] +object-type=applet +applet-iid=WnckletFactory::WindowListApplet +toplevel-id=bottom +position=70 +locked=true + [Object notification-area] object-type=applet applet-iid=NotificationAreaAppletFactory::NotificationArea -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit ef99058907d0c9f287ce95172fce7c75854c5ac3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 22 17:36:15 2014 +0200 Provide init script for x2gothinclient-minidesktop to handle maintenance tasks if TCE is in MiniDesktop mode. --- debian/changelog | 2 ++ .../init/x2gothinclient-minidesktop.init | 29 ++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/debian/changelog b/debian/changelog index f7c03d2..3e0f5bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low connect to X2Go sessions from there. - x2gothinclient-minidesktop: Add WindowList applet to MATE panel. - On $HOME creation, copy x2gothinclient-minidesktop.desktop into ~/Desktop. + - Provide init script for x2gothinclient-minidesktop to handle maintenance + tasks if TCE is in MiniDesktop mode. - Add COPYING file. - Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf. diff --git a/x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init b/x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init new file mode 100644 index 0000000..9d33698 --- /dev/null +++ b/x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init @@ -0,0 +1,29 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: x2gothinclient-minidesktop +# Required-Start: $local_fs x2gothinclient-chroot +# Required-Stop: +# Default-Start: S +# Default-Stop: +# X-Start-Before: nfs-common alsa-utils +# Short-Description: +# Description: Prepare X2Go TCE tmpfs directories for usage +### END INIT INFO + +case "$1" in + start|"") + # prep tmpfs subfolders for nfs-common + exit 0 + ;; + restart|reload|force-reload) + echo "Error: argument '$1' not supported" >&2 + exit 3 + ;; + stop) + # No-op + ;; + *) + echo "Usage: x2gothinclient-chroot start" >&2 + exit 3 + ;; +esac -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 37d473d4e61034766bbfff858652737b57cb06de Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 22 17:36:32 2014 +0200 rebase with .desktop file commit --- .../autostart/x2goclient.desktop | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/x2gothinclient-minidesktop/autostart/x2goclient.desktop b/x2gothinclient-minidesktop/autostart/x2goclient.desktop deleted file mode 100644 index fbb396d..0000000 --- a/x2gothinclient-minidesktop/autostart/x2goclient.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=X2Go Client -Exec=x2goclient -Icon=x2goclient -StartupWMClass=x2goclient -X-Window-Icon=x2goclient -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -Terminal=false -Categories=Qt;KDE;Network; -Keywords=Terminal,Client,Remote,Desktop,Published,Applications,Session,Profile; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 767bcbca0a39bf0c77848cf6a6d6a4ec91a878bc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 22 17:37:01 2014 +0200 rebase with init script commit --- debian/x2gothinclient-minidesktop.init | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/x2gothinclient-minidesktop.init b/debian/x2gothinclient-minidesktop.init new file mode 120000 index 0000000..dc6cec1 --- /dev/null +++ b/debian/x2gothinclient-minidesktop.init @@ -0,0 +1 @@ +../x2gothinclient-minidesktop/init/x2gothinclient-minidesktop.init \ No newline at end of file -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 3021715fee42e8d0b56e0fcf993bba8ce4635fa8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 22 17:34:14 2014 +0200 On $HOME creation, copy x2gothinclient-minidesktop.desktop into ~/Desktop. --- debian/changelog | 1 + .../share/etc/x2gothinclient_init | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 66f8381..f7c03d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low X2Go Client as login manager, we launch a minimal MATE desktop and connect to X2Go sessions from there. - x2gothinclient-minidesktop: Add WindowList applet to MATE panel. + - On $HOME creation, copy x2gothinclient-minidesktop.desktop into ~/Desktop. - Add COPYING file. - Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf. diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient_init index 2aae04d..b0609ea 100755 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_init +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_init @@ -24,6 +24,7 @@ mkdir -p ~x2gothinclient mkdir -p ~x2gothinclient/.x2goclient test -e /etc/x2go/x2gothinclient_sessions && cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions test -e /etc/x2go/freerdp/known_hosts && mkdir -p ~x2gothinclient/.freerdp && cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts +test -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop && mkdir -p ~x2gothinclient/Desktop && cp /etc/xdg/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ mkdir -p ~x2gothinclient/.kde mkdir -p ~x2gothinclient/.kde/socket-`hostname` mkdir -p ~x2gothinclient/mounts -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 30fc5f2351122f48f2a57d185f5c0b0c317a5d5f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 22 17:40:05 2014 +0200 rename bin:package x2gothinclient-minidesktop-mate to x2gothinclient-minidesktop --- debian/changelog | 2 +- debian/control | 10 +++++++--- debian/x2gothinclient-minidesktop-mate.install | 4 ---- debian/x2gothinclient-minidesktop.install | 5 +++++ ...ostinst => x2gothinclient-minidesktop.postinst} | 0 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e0f5bd..e2d7a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low - Stop advertising GNOME in default session profile. Switching to MATE. - Use type=auto for automatic keyboard detection as default in example session profiles. - - New TCE component: x2gothinclient-minidesktop-mate. Instead of using + - New TCE component: x2gothinclient-minidesktop. Instead of using X2Go Client as login manager, we launch a minimal MATE desktop and connect to X2Go sessions from there. - x2gothinclient-minidesktop: Add WindowList applet to MATE panel. diff --git a/debian/control b/debian/control index f6b801f..0b502ce 100644 --- a/debian/control +++ b/debian/control @@ -92,7 +92,7 @@ Description: Install X2Go Thin Client chroot (meta-package) This meta-package installs all X2Go TCE dependencies. This package is used in the X2Go Thin Client's chroot. -Package: x2gothinclient-minidesktop-mate +Package: x2gothinclient-minidesktop Architecture: all Depends: ${misc:Depends}, @@ -105,6 +105,10 @@ Depends: mate-settings-daemon-pulse, iceweasel, libglib2.0-bin, +Breaks: + x2gothinclient-minidesktop-mate (<= 1.0.1.3-0x2go2), +Replaces: + x2gothinclient-minidesktop-mate (<= 1.0.1.3-0x2go2), Description: Minimal desktop for X2Go Thin Client chroot (based on MATE) X2Go is a server based computing environment with - session resuming @@ -115,8 +119,8 @@ Description: Minimal desktop for X2Go Thin Client chroot (based on MATE) - audio support - authentication by smartcard and USB stick . - x2gothinclient-minidesktop-mate: - -------------------------------- + x2gothinclient-minidesktop: + --------------------------- This meta-package provides a minimal desktop (based on MATE) as the TCE's workspace area. From there you can launch X2Go Sessions, but you also have a set of basic applications that run on the thinclient diff --git a/debian/x2gothinclient-minidesktop-mate.install b/debian/x2gothinclient-minidesktop-mate.install deleted file mode 100644 index 9eba321..0000000 --- a/debian/x2gothinclient-minidesktop-mate.install +++ /dev/null @@ -1,4 +0,0 @@ -x2gothinclient-minidesktop/seeds/preseed_nodm usr/share/x2gothinclient/minidesktop/ -x2gothinclient-minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/ -x2gothinclient-minidesktop/mate-panel-layouts/* usr/share/mate-panel/layouts/ -x2gothinclient-minidesktop/background/*.svg usr/share/images/ \ No newline at end of file diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install new file mode 100644 index 0000000..79c5825 --- /dev/null +++ b/debian/x2gothinclient-minidesktop.install @@ -0,0 +1,5 @@ +x2gothinclient-minidesktop/seeds/preseed_nodm usr/share/x2gothinclient/minidesktop/ +x2gothinclient-minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/ +x2gothinclient-minidesktop/mate-panel-layout/* usr/share/mate-panel/layouts/ +x2gothinclient-minidesktop/background/*.svg usr/share/images/ +x2gothinclient-minidesktop/autostart/x2gothinclient-minidesktop.desktop etc/xdg/autostart/ \ No newline at end of file diff --git a/debian/x2gothinclient-minidesktop-mate.postinst b/debian/x2gothinclient-minidesktop.postinst similarity index 100% rename from debian/x2gothinclient-minidesktop-mate.postinst rename to debian/x2gothinclient-minidesktop.postinst -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org