This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 7d9c68f fix window manager theme name: Murrine -> MurrineRounded new e1b25c0 debian/control: Pull in pinentry-x2go. new f1d34ad launch x2gothinclient_init via nodm, which then launches the Xsession new 71dbdac no file suffix for background image file name The 3 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/control | 2 ++ management/share/etc/x2gothinclient_init | 7 +++++++ .../19_x2gothinclient-minidesktop.gschema.override | 2 +- minidesktop/seeds/preseed_nodm | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) -- 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 e1b25c0671a074cc3449c2884b75966aeb7ed0f8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 26 15:45:17 2014 +0200 debian/control: Pull in pinentry-x2go. --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 7e7c48a..0d207af 100644 --- a/debian/control +++ b/debian/control @@ -114,6 +114,7 @@ Depends: iceweasel, libglib2.0-bin, x2goclient (>= 4.0.1.2-0~), + pinentry-x2go, xauth, xinit, x2gothinclient-common (>= ${source:Version}), @@ -170,6 +171,7 @@ Depends: ${misc:Depends}, psmisc, x2goclient (>= 4.0.1.2-0~), + pinentry-x2go, xauth, xinit, locales, -- 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 f1d34ad19a82a2a1f159689447ec0efd0b8b079a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 26 15:45:57 2014 +0200 launch x2gothinclient_init via nodm, which then launches the Xsession --- management/share/etc/x2gothinclient_init | 7 +++++++ minidesktop/seeds/preseed_nodm | 1 + 2 files changed, 8 insertions(+) diff --git a/management/share/etc/x2gothinclient_init b/management/share/etc/x2gothinclient_init index 3f922ca..1bbd6c9 100755 --- a/management/share/etc/x2gothinclient_init +++ b/management/share/etc/x2gothinclient_init @@ -21,6 +21,9 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. if [ -z "$X2GO_HANDLE_DAEMON" ]; then + if [ -d ~x2gothinclient ]; then + rm -Rf ~x2gothinclient + fi mkdir -p ~x2gothinclient mkdir -p ~x2gothinclient/.x2goclient if [ -e /etc/x2go/x2gothinclient_sessions ]; then @@ -44,3 +47,7 @@ if [ -z "$X2GO_HANDLE_DAEMON" ]; then chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf chmod go-rwx ~x2gothinclient -Rf fi + +if [ -e /etc/x2go/x2gothinclient-minidesktop_start ]; then + STARTUP=mate-session /etc/X11/Xsession +fi diff --git a/minidesktop/seeds/preseed_nodm b/minidesktop/seeds/preseed_nodm index 8bd287a..13194e6 100755 --- a/minidesktop/seeds/preseed_nodm +++ b/minidesktop/seeds/preseed_nodm @@ -33,6 +33,7 @@ do_preseed() { do_preseed nodm nodm/enabled boolean true do_preseed nodm nodm/user string x2gothinclient do_preseed nodm nodm/first_vt 5 +do_preseed nodm nodm/xsession /etc/x2go/x2gothinclient_init echo "Silently running dpkg-reconfigure on package \"nodm\" ... " dpkg -l nodm 1>/dev/null 2>/dev/null && { -- 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 71dbdacdf408b478d9925590624fc98fc8da9bb3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 26 15:49:10 2014 +0200 no file suffix for background image file name --- .../19_x2gothinclient-minidesktop.gschema.override | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minidesktop/schema-overrides/19_x2gothinclient-minidesktop.gschema.override b/minidesktop/schema-overrides/19_x2gothinclient-minidesktop.gschema.override index 8ff754a..8106ec3 100644 --- a/minidesktop/schema-overrides/19_x2gothinclient-minidesktop.gschema.override +++ b/minidesktop/schema-overrides/19_x2gothinclient-minidesktop.gschema.override @@ -1,5 +1,5 @@ [org.mate.background] -picture-filename='/usr/share/images/x2gothinclient-minidesktop_background.svg' +picture-filename='/usr/share/images/x2gothinclient-minidesktop_background' [org.mate.panel] default-layout="x2gothinclient-minidesktop" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org