[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.1.0.0-1-ge8581d7
X2Go dev team
git-admin at x2go.org
Fri Nov 22 23:53:09 CET 2013
The branch, build-main has been updated
discards f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da (commit)
via e8581d73ba1c426a85aaf24e17070f3e73b28e7c (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 (f15d4e8fc0dda3ffb2126155d7aced2f1f5e30da)
\
N -- N -- N (e8581d73ba1c426a85aaf24e17070f3e73b28e7c)
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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
debian/changelog | 7 ++++---
x2gothinclient/sbin/x2gothinclientd | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/VERSION b/VERSION
index 238afc2..a6bbdb5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0.1
+1.1.0.0
diff --git a/debian/changelog b/debian/changelog
index b02a143..756b260 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low
+x2gothinclient (1.1.0.0-0~x2go2) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (1.1.0.1):
+ - Switch to VT-7 on TC shutdown.
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 19 Jul 2013 23:38:57 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 17 Aug 2013 00:35:31 +0200
x2gothinclient (1.1.0.0-0~x2go1) unstable; urgency=low
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index 0fac6b4..9f502da 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -101,6 +101,7 @@ 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 )
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).
More information about the x2go-commits
mailing list