This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 64da89c Add COPYING file. new 8f34827 Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf. new 441467a Use resolv.conf file from host system when running x2gothinclient_upgrade. new 9dd1429 debian/control: Add D (x2gothinclient-minidesktop-mate): libglib2.0-bin. new e510a7f Tweak MATE minidesktop via GScheme overrides. new b65df41 move file to subfolder new 28880e9 Add XDG autostart .desktop file for X2Go Client. The 6 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 | 5 + debian/control | 1 + debian/x2gothinclient-minidesktop-mate.install | 5 +- ...st => x2gothinclient-minidesktop-mate.postinst} | 22 +-- .../autostart/x2goclient.desktop | 13 ++ .../background/x2gotce-minidesktop-background.svg | 158 ++++++++++++++++++++ .../x2gothinclient-minidesktop-mate.layout | 68 +++++++++ ...2gothinclient-minidesktop-mate.gschema.override | 16 ++ .../{ => seeds}/preseed_nodm | 0 x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- .../sbin/x2gothinclient_upgrade | 5 + 11 files changed, 278 insertions(+), 17 deletions(-) copy debian/{x2gothinclient.preinst => x2gothinclient-minidesktop-mate.postinst} (57%) create mode 100644 x2gothinclient-minidesktop/autostart/x2goclient.desktop create mode 100644 x2gothinclient-minidesktop/background/x2gotce-minidesktop-background.svg create mode 100644 x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout create mode 100644 x2gothinclient-minidesktop/schema-overrides/20_x2gothinclient-minidesktop-mate.gschema.override rename x2gothinclient-minidesktop/{ => seeds}/preseed_nodm (100%) -- 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 e510a7f11613b8768b0edc229aa65cb7fdda50ec Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 5 16:49:23 2014 +0200 Tweak MATE minidesktop via GScheme overrides. --- debian/changelog | 1 + debian/x2gothinclient-minidesktop-mate.install | 5 +- debian/x2gothinclient-minidesktop-mate.postinst | 40 +++++ .../background/x2gotce-minidesktop-background.svg | 158 ++++++++++++++++++++ .../x2gothinclient-minidesktop-mate.layout | 68 +++++++++ ...2gothinclient-minidesktop-mate.gschema.override | 16 ++ 6 files changed, 287 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77dc243..295ee4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low - Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf. - Use resolv.conf file from host system when running x2gothinclient_upgrade. + - Tweak MATE minidesktop via GScheme overrides. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2014 12:03:00 +0100 diff --git a/debian/x2gothinclient-minidesktop-mate.install b/debian/x2gothinclient-minidesktop-mate.install index c4e8bb3..9eba321 100644 --- a/debian/x2gothinclient-minidesktop-mate.install +++ b/debian/x2gothinclient-minidesktop-mate.install @@ -1 +1,4 @@ -x2gothinclient-minidesktop/preseed_nodm usr/share/x2gothinclient/minidesktop/ +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-mate.postinst b/debian/x2gothinclient-minidesktop-mate.postinst new file mode 100755 index 0000000..cbd1ac9 --- /dev/null +++ b/debian/x2gothinclient-minidesktop-mate.postinst @@ -0,0 +1,40 @@ +#!/bin/sh +# postinst script for x2gothinclient-minidesktop-mate +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +THIS_PACKAGE=x2gothinclient-minidesktop-mate + +case "$1" in + configure) + glib-compile-schemas /usr/share/glib-2.0/schemas/ + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/x2gothinclient-minidesktop/background/x2gotce-minidesktop-background.svg b/x2gothinclient-minidesktop/background/x2gotce-minidesktop-background.svg new file mode 100644 index 0000000..e3c6580 --- /dev/null +++ b/x2gothinclient-minidesktop/background/x2gotce-minidesktop-background.svg @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="361.04999" + height="271.92001" + viewBox="0 0 361.244 270.933" + id="svg2" + xml:space="preserve" + inkscape:version="0.47 r22583" + sodipodi:docname="bg-anim.svg"><metadata + id="metadata30"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1598" + inkscape:window-height="879" + id="namedview28" + showgrid="false" + inkscape:zoom="2" + inkscape:cx="132.20018" + inkscape:cy="132.38275" + inkscape:window-x="0" + inkscape:window-y="19" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <defs + id="defs4"><inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 135.96001 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="361.04999 : 135.96001 : 1" + inkscape:persp3d-origin="180.52499 : 90.640004 : 1" + id="perspective32" /><linearGradient + id="linearGradient2802"><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop2804" /><stop + style="stop-color:#ffffff;stop-opacity:0" + offset="1" + id="stop2806" /></linearGradient><linearGradient + id="linearGradient2852"><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop2854" /><stop + style="stop-color:#6699ff;stop-opacity:0" + offset="1" + id="stop2856" /></linearGradient><linearGradient + id="linearGradient2844"><stop + style="stop-color:#deeaed;stop-opacity:1" + offset="0" + id="stop2846" /><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="1" + id="stop2848" /></linearGradient><linearGradient + id="linearGradient1948"><stop + style="stop-color:#b2856b;stop-opacity:0.4235808;" + offset="0" + id="stop1950" /><stop + style="stop-color:#6699ff;stop-opacity:0" + offset="1" + id="stop1952" /></linearGradient> + <style + type="text/css" + id="style6" /> + <linearGradient + x1="202.494" + y1="135.464" + x2="207.00999" + y2="135.464" + id="id0" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#000000;stop-opacity:1" + offset="0" + id="stop9" /> + <stop + style="stop-color:#6e707f;stop-opacity:1" + offset="1" + id="stop11" /> + </linearGradient> + + + + + + + + + + <linearGradient + x1="202.494" + y1="135.464" + x2="207.00999" + y2="135.464" + id="linearGradient1942" + xlink:href="#id0" + gradientUnits="userSpaceOnUse" /><linearGradient + x1="107.24445" + y1="268.11078" + x2="107.64762" + y2="207.717" + id="linearGradient1954" + xlink:href="#linearGradient1948" + gradientUnits="userSpaceOnUse" /><linearGradient + x1="278.59366" + y1="-49.590809" + x2="133.85397" + y2="120.54888" + id="linearGradient2808" + xlink:href="#linearGradient2802" + gradientUnits="userSpaceOnUse" /></defs> + + + <rect + style="fill:#800000;fill-opacity:1" + id="hintergrund" + height="270.92899" + width="361.23801" + y="0.00456294" + x="-361.23801" + class="fil0" + transform="scale(-1,1)"> + <animateColor + attributeName="fill" + attributeType="XML" + from="#000000" + to="#246ed8" + begin="0s" + dur="4s" + fill="freeze" + id="animateColor24" /> + </rect> + + + <path + d="M 162.557,0.0045 L 0,0.0045 L 0,57.8027 C 0,146.6071 334.145,182.1287 334.145,270.9327 L 334.145,270.9327 C 334.145,182.1283 162.557,88.8087 162.557,0.0037 L 162.557,0.0045 z " + style="fill:url(#linearGradient2808);fill-opacity:1" + id="path19" /> + + +</svg> \ No newline at end of file diff --git a/x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout b/x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout new file mode 100644 index 0000000..802b3a5 --- /dev/null +++ b/x2gothinclient-minidesktop/mate-panel-layout/x2gothinclient-minidesktop-mate.layout @@ -0,0 +1,68 @@ +[Toplevel bottom] +expand=true +orientation=bottom +size=24 + +[Object menu] +object-type=menu +toplevel-id=bottom +position=0 +locked=true + +[Object shutdown] +object-type=action +action-type=shutdown +toplevel-id=bottom +position=10 +locked=true + +[Object logout] +object-type=action +action-type=logout +toplevel-id=bottom +position=20 +locked=true + +[Object workspace-switcher] +object-type=applet +applet-iid=WnckletFactory::WorkspaceSwitcherApplet +toplevel-id=bottom +position=30 +locked=true + +[Object show-desktop] +object-type=applet +applet-iid=WnckletFactory::ShowDesktopApplet +toplevel-id=bottom +position=40 +locked=true + +[Object web-browser] +object-type=launcher +launcher-location=/usr/share/applications/x-www-browser.desktop +toplevel-id=bottom +position=50 +locked=true + +[Object file-manager] +object-type=launcher +launcher-location=/usr/share/applications/caja.desktop +toplevel-id=bottom +position=60 +locked=true + +[Object notification-area] +object-type=applet +applet-iid=NotificationAreaAppletFactory::NotificationArea +toplevel-id=bottom +position=10 +panel-right-stick=true +locked=true + +[Object clock] +object-type=applet +applet-iid=ClockAppletFactory::ClockApplet +toplevel-id=bottom +position=0 +panel-right-stick=true +locked=true diff --git a/x2gothinclient-minidesktop/schema-overrides/20_x2gothinclient-minidesktop-mate.gschema.override b/x2gothinclient-minidesktop/schema-overrides/20_x2gothinclient-minidesktop-mate.gschema.override new file mode 100644 index 0000000..e46552b --- /dev/null +++ b/x2gothinclient-minidesktop/schema-overrides/20_x2gothinclient-minidesktop-mate.gschema.override @@ -0,0 +1,16 @@ +[org.mate.background] +picture-filename='/usr/share/images/x2gotce-minidesktop-background.svg' + +[org.mate.panel] +default-layout="x2gothinclient-minidesktop-mate" + +[org.mate.interface] +icon-theme='Nuvola' +gtk-theme='Clearlooks' + +[org.mate.Marco.general] +theme='Nuvola' + +[org.mate.caja.preferences] +always-use-browser=true +click-policy='single' -- 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 441467aee30ddcb651a7ed8fe3237ddc060491db Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 5 16:43:47 2014 +0200 Use resolv.conf file from host system when running x2gothinclient_upgrade. --- debian/changelog | 1 + .../sbin/x2gothinclient_upgrade | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6cd3a22..77dc243 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low - Add COPYING file. - Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf. + - Use resolv.conf file from host system when running x2gothinclient_upgrade. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2014 12:03:00 +0100 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index d35972a..a580eb8 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -97,8 +97,13 @@ mount | grep "$TC_CHROOT/proc" >/dev/null || mount -tproc proc "$TC_CHROOT/proc" 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 +test -e "$TC_CHROOT/etc/resolv.conf" && 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" + chroot "$TC_CHROOT" /x2go_tce_upgrade.sh +test -f "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" && mv "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" "$TC_CHROOT/etc/resolv.conf" + 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 -- 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 9dd142990fbbbaa6a14e91f1d8f53c64b95358e0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 5 16:45:27 2014 +0200 debian/control: Add D (x2gothinclient-minidesktop-mate): libglib2.0-bin. --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index a16993b..f6b801f 100644 --- a/debian/control +++ b/debian/control @@ -104,6 +104,7 @@ Depends: mate-media-pulse, mate-settings-daemon-pulse, iceweasel, + libglib2.0-bin, Description: Minimal desktop for X2Go Thin Client chroot (based on MATE) X2Go is a server based computing environment with - session resuming -- 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 8f34827eb49baf5bd30764ff7d962078c09bfb58 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 5 16:41:35 2014 +0200 Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf. --- debian/changelog | 2 ++ x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fd087d3..6cd3a22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ 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. - Add COPYING file. + - Avoid error message in x2gothinclient_shell if the chroot does not have + a file-or-symlink /etc/resolv.conf. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2014 12:03:00 +0100 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 15dc478..5e2a2fa 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -96,7 +96,7 @@ 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 -e "$TC_CHROOT/etc/resolv.conf" && 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" chroot "$TC_CHROOT" /x2go_tce_shell.sh -- 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 b65df41495869fac47387f6dc1ca4591b22d5b07 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 5 16:49:54 2014 +0200 move file to subfolder --- .../{ => seeds}/preseed_nodm | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/x2gothinclient-minidesktop/preseed_nodm b/x2gothinclient-minidesktop/seeds/preseed_nodm similarity index 100% rename from x2gothinclient-minidesktop/preseed_nodm rename to x2gothinclient-minidesktop/seeds/preseed_nodm -- 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 28880e90845e6a5b84cd9b20e91332451238f73f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 5 16:50:48 2014 +0200 Add XDG autostart .desktop file for X2Go Client. --- debian/changelog | 1 + .../autostart/x2goclient.desktop | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 295ee4a..73b7887 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low a file-or-symlink /etc/resolv.conf. - Use resolv.conf file from host system when running x2gothinclient_upgrade. - Tweak MATE minidesktop via GScheme overrides. + - Add XDG autostart .desktop file for X2Go Client. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2014 12:03:00 +0100 diff --git a/x2gothinclient-minidesktop/autostart/x2goclient.desktop b/x2gothinclient-minidesktop/autostart/x2goclient.desktop new file mode 100644 index 0000000..fbb396d --- /dev/null +++ b/x2gothinclient-minidesktop/autostart/x2goclient.desktop @@ -0,0 +1,13 @@ +[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
-
git-admin＠x2go.org