The branch, master has been updated discards b8774a3a8f2af738b53bb62f26466a931e983217 (commit) discards 3dd9651fdad6742994b4bab2e9ae29bcf8ff9f43 (commit) discards e8581d73ba1c426a85aaf24e17070f3e73b28e7c (commit) via 3f13cd0a6466012d297d5772ae79a54355c59691 (commit) via f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (b8774a3a8f2af738b53bb62f26466a931e983217) \ N -- N -- N (3f13cd0a6466012d297d5772ae79a54355c59691) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 3f13cd0a6466012d297d5772ae79a54355c59691 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 11 21:45:54 2013 +0200 Revert "Continue development..." This reverts commit f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da. commit f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 19 23:39:19 2013 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 14 -------------- x2gothinclient/sbin/x2gothinclientd | 1 - x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +- x2gousbmount/x2gousbmount | 2 +- 4 files changed, 2 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0d09f7b..5f97dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,3 @@ -x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low - - [ Mike Gabriel ] - * New upstream version (1.1.0.1): - - Switch to VT-7 on TC shutdown. - - Syntax fix in x2gousbmount script. - - [ Arnold Krille ] - * New upstream version (1.1.0.1): - - Extend x2gothinclient_shell to run anything given as arguments and - fall back to $TC_SHELL when nothing is given. (Fixes: #301). - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 17 Aug 2013 00:35:31 +0200 - x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 9f502da..0fac6b4 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -101,7 +101,6 @@ elsif ($pid == 0 ) # when used with plymouth, make sure we stay on the correct terminal system("killall Xorg"); system("shutdown -h now"); - system("chvt 7"); } # test if XServer is running, if not launch it... if ( check_x() ==0 ) diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index ba4ec21..42f4f5d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -82,7 +82,7 @@ export X2GO_HANDLE_DAEMONS=false mount /root -${*:-/bin/$TC_SHELL} +/bin/$TC_SHELL umount /root diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount index 7bf7b5a..0a5123b 100755 --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -21,7 +21,7 @@ use strict; use File::Path::Expand; -sub check_x2gothinclientd { +check_x2gothinclientd() { my $x=`ps ax | grep x2gothinclient`; if ( $x=~m/thinclientd/ ) { 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).